diff options
Diffstat (limited to 'libgfortran/generated/matmul_c4.c')
| -rw-r--r-- | libgfortran/generated/matmul_c4.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c index b5b0ecb83ec..5192e0822c2 100644 --- a/libgfortran/generated/matmul_c4.c +++ b/libgfortran/generated/matmul_c4.c @@ -106,21 +106,22 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, if (GFC_DESCRIPTOR_RANK (a) == 1) { GFC_DIMENSION_SET(retarray->dim[0], 0, - GFC_DESCRIPTOR_EXTENT(b,1) - 1, 1); + GFC_DESCRIPTOR_EXTENT(b,1), sizeof (GFC_COMPLEX_4)); } else if (GFC_DESCRIPTOR_RANK (b) == 1) { GFC_DIMENSION_SET(retarray->dim[0], 0, - GFC_DESCRIPTOR_EXTENT(a,0) - 1, 1); + GFC_DESCRIPTOR_EXTENT(a,0), sizeof (GFC_COMPLEX_4)); } else { GFC_DIMENSION_SET(retarray->dim[0], 0, - GFC_DESCRIPTOR_EXTENT(a,0) - 1, 1); + GFC_DESCRIPTOR_EXTENT(a,0), sizeof (GFC_COMPLEX_4)); GFC_DIMENSION_SET(retarray->dim[1], 0, - GFC_DESCRIPTOR_EXTENT(b,1) - 1, - GFC_DESCRIPTOR_EXTENT(retarray,0)); + GFC_DESCRIPTOR_EXTENT(b,1), + GFC_DESCRIPTOR_EXTENT(retarray,0) + * sizeof (GFC_COMPLEX_4)); } retarray->base_addr @@ -175,19 +176,19 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, /* One-dimensional result may be addressed in the code below either as a row or a column matrix. We want both cases to work. */ - rxstride = rystride = GFC_DESCRIPTOR_STRIDE(retarray,0); + rxstride = rystride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(retarray,0); } else { - rxstride = GFC_DESCRIPTOR_STRIDE(retarray,0); - rystride = GFC_DESCRIPTOR_STRIDE(retarray,1); + rxstride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(retarray,0); + rystride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(retarray,1); } if (GFC_DESCRIPTOR_RANK (a) == 1) { /* Treat it as a a row matrix A[1,count]. */ - axstride = GFC_DESCRIPTOR_STRIDE(a,0); + axstride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(a,0); aystride = 1; xcount = 1; @@ -195,8 +196,8 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, } else { - axstride = GFC_DESCRIPTOR_STRIDE(a,0); - aystride = GFC_DESCRIPTOR_STRIDE(a,1); + axstride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(a,0); + aystride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(a,1); count = GFC_DESCRIPTOR_EXTENT(a,1); xcount = GFC_DESCRIPTOR_EXTENT(a,0); @@ -211,7 +212,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, if (GFC_DESCRIPTOR_RANK (b) == 1) { /* Treat it as a column matrix B[count,1] */ - bxstride = GFC_DESCRIPTOR_STRIDE(b,0); + bxstride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(b,0); /* bystride should never be used for 1-dimensional b. in case it is we want it to cause a segfault, rather than @@ -221,8 +222,8 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, } else { - bxstride = GFC_DESCRIPTOR_STRIDE(b,0); - bystride = GFC_DESCRIPTOR_STRIDE(b,1); + bxstride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(b,0); + bystride = GFC_DESCRIPTOR_STRIDE_TYPEKNOWN(b,1); ycount = GFC_DESCRIPTOR_EXTENT(b,1); } |