https://gcc.gnu.org/g:c2062525ae01b1be319fa3003dbdbe150ff9d1c9
commit c2062525ae01b1be319fa3003dbdbe150ff9d1c9 Author: Mikael Morin <[email protected]> Date: Sun Nov 8 16:25:52 2026 +0100 Mise à jour fichiers générés Diff: --- libgfortran/generated/reshape_c10.c | 16 +++++++--------- libgfortran/generated/reshape_c16.c | 16 +++++++--------- libgfortran/generated/reshape_c17.c | 16 +++++++--------- libgfortran/generated/reshape_c4.c | 16 +++++++--------- libgfortran/generated/reshape_c8.c | 16 +++++++--------- libgfortran/generated/reshape_i16.c | 16 +++++++--------- libgfortran/generated/reshape_i4.c | 16 +++++++--------- libgfortran/generated/reshape_i8.c | 16 +++++++--------- libgfortran/generated/reshape_r10.c | 16 +++++++--------- libgfortran/generated/reshape_r16.c | 16 +++++++--------- libgfortran/generated/reshape_r17.c | 16 +++++++--------- libgfortran/generated/reshape_r4.c | 16 +++++++--------- libgfortran/generated/reshape_r8.c | 16 +++++++--------- libgfortran/generated/unpack_c10.c | 1 + libgfortran/generated/unpack_c16.c | 1 + libgfortran/generated/unpack_c17.c | 1 + libgfortran/generated/unpack_c4.c | 1 + libgfortran/generated/unpack_c8.c | 1 + libgfortran/generated/unpack_i1.c | 1 + libgfortran/generated/unpack_i16.c | 1 + libgfortran/generated/unpack_i2.c | 1 + libgfortran/generated/unpack_i4.c | 1 + libgfortran/generated/unpack_i8.c | 1 + libgfortran/generated/unpack_r10.c | 1 + libgfortran/generated/unpack_r16.c | 1 + libgfortran/generated/unpack_r17.c | 1 + libgfortran/generated/unpack_r4.c | 1 + libgfortran/generated/unpack_r8.c | 1 + 28 files changed, 106 insertions(+), 117 deletions(-) diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c index 28356bc3b49f..6a92792de3f9 100644 --- a/libgfortran/generated/reshape_c10.c +++ b/libgfortran/generated/reshape_c10.c @@ -117,6 +117,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_COMPLEX_10)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_COMPLEX_10); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_c10 (gfc_array_c10 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_COMPLEX_10); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_COMPLEX_10); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_c10 (gfc_array_c10 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_COMPLEX_10); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_c10 (gfc_array_c10 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_COMPLEX_10); - ssize *= sizeof (GFC_COMPLEX_10); - psize *= sizeof (GFC_COMPLEX_10); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c index 77ef20313d86..d546f7c4f335 100644 --- a/libgfortran/generated/reshape_c16.c +++ b/libgfortran/generated/reshape_c16.c @@ -117,6 +117,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_COMPLEX_16)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_COMPLEX_16); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_c16 (gfc_array_c16 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_COMPLEX_16); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_COMPLEX_16); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_c16 (gfc_array_c16 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_COMPLEX_16); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_c16 (gfc_array_c16 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_COMPLEX_16); - ssize *= sizeof (GFC_COMPLEX_16); - psize *= sizeof (GFC_COMPLEX_16); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_c17.c b/libgfortran/generated/reshape_c17.c index 549c67c6f905..35d8743d9b6c 100644 --- a/libgfortran/generated/reshape_c17.c +++ b/libgfortran/generated/reshape_c17.c @@ -117,6 +117,7 @@ reshape_c17 (gfc_array_c17 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_COMPLEX_17)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_COMPLEX_17); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_c17 (gfc_array_c17 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_COMPLEX_17); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_c17 (gfc_array_c17 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_COMPLEX_17); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_c17 (gfc_array_c17 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_c17 (gfc_array_c17 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_COMPLEX_17); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_c17 (gfc_array_c17 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_COMPLEX_17); - ssize *= sizeof (GFC_COMPLEX_17); - psize *= sizeof (GFC_COMPLEX_17); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c index dba61a143f76..62b037956cb7 100644 --- a/libgfortran/generated/reshape_c4.c +++ b/libgfortran/generated/reshape_c4.c @@ -117,6 +117,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_COMPLEX_4)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_COMPLEX_4); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_c4 (gfc_array_c4 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_COMPLEX_4); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_COMPLEX_4); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_c4 (gfc_array_c4 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_COMPLEX_4); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_c4 (gfc_array_c4 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_COMPLEX_4); - ssize *= sizeof (GFC_COMPLEX_4); - psize *= sizeof (GFC_COMPLEX_4); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c index c895744d6686..7a1d8e56c576 100644 --- a/libgfortran/generated/reshape_c8.c +++ b/libgfortran/generated/reshape_c8.c @@ -117,6 +117,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_COMPLEX_8)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_COMPLEX_8); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_c8 (gfc_array_c8 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_COMPLEX_8); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_COMPLEX_8); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_c8 (gfc_array_c8 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_COMPLEX_8); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_c8 (gfc_array_c8 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_COMPLEX_8); - ssize *= sizeof (GFC_COMPLEX_8); - psize *= sizeof (GFC_COMPLEX_8); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c index dc67e307494f..dd4016cca391 100644 --- a/libgfortran/generated/reshape_i16.c +++ b/libgfortran/generated/reshape_i16.c @@ -117,6 +117,7 @@ reshape_16 (gfc_array_i16 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_16)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_INTEGER_16); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_16 (gfc_array_i16 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_INTEGER_16); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_16 (gfc_array_i16 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_INTEGER_16); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_16 (gfc_array_i16 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_16 (gfc_array_i16 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_INTEGER_16); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_16 (gfc_array_i16 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_INTEGER_16); - ssize *= sizeof (GFC_INTEGER_16); - psize *= sizeof (GFC_INTEGER_16); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c index 99c3b3499578..db639e17028c 100644 --- a/libgfortran/generated/reshape_i4.c +++ b/libgfortran/generated/reshape_i4.c @@ -117,6 +117,7 @@ reshape_4 (gfc_array_i4 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_4)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_INTEGER_4); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_4 (gfc_array_i4 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_INTEGER_4); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_4 (gfc_array_i4 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_INTEGER_4); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_4 (gfc_array_i4 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_4 (gfc_array_i4 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_INTEGER_4); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_4 (gfc_array_i4 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_INTEGER_4); - ssize *= sizeof (GFC_INTEGER_4); - psize *= sizeof (GFC_INTEGER_4); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index 9d0c3cceda4b..2759e1617b16 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -117,6 +117,7 @@ reshape_8 (gfc_array_i8 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_8)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_INTEGER_8); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_8 (gfc_array_i8 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_INTEGER_8); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_8 (gfc_array_i8 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_INTEGER_8); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_8 (gfc_array_i8 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_8 (gfc_array_i8 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_INTEGER_8); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_8 (gfc_array_i8 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_INTEGER_8); - ssize *= sizeof (GFC_INTEGER_8); - psize *= sizeof (GFC_INTEGER_8); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c index 7cbf8d4ba6a7..4aff14b6cb74 100644 --- a/libgfortran/generated/reshape_r10.c +++ b/libgfortran/generated/reshape_r10.c @@ -117,6 +117,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_REAL_10)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_REAL_10); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_r10 (gfc_array_r10 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_REAL_10); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_REAL_10); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_r10 (gfc_array_r10 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_REAL_10); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_r10 (gfc_array_r10 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_REAL_10); - ssize *= sizeof (GFC_REAL_10); - psize *= sizeof (GFC_REAL_10); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c index 179830263d92..37d0e6cce551 100644 --- a/libgfortran/generated/reshape_r16.c +++ b/libgfortran/generated/reshape_r16.c @@ -117,6 +117,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_REAL_16)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_REAL_16); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_r16 (gfc_array_r16 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_REAL_16); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_REAL_16); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_r16 (gfc_array_r16 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_REAL_16); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_r16 (gfc_array_r16 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_REAL_16); - ssize *= sizeof (GFC_REAL_16); - psize *= sizeof (GFC_REAL_16); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_r17.c b/libgfortran/generated/reshape_r17.c index 78b7c12c9075..d78bb8b90546 100644 --- a/libgfortran/generated/reshape_r17.c +++ b/libgfortran/generated/reshape_r17.c @@ -117,6 +117,7 @@ reshape_r17 (gfc_array_r17 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_REAL_17)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_REAL_17); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_r17 (gfc_array_r17 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_REAL_17); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_r17 (gfc_array_r17 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_REAL_17); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_r17 (gfc_array_r17 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_r17 (gfc_array_r17 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_REAL_17); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_r17 (gfc_array_r17 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_REAL_17); - ssize *= sizeof (GFC_REAL_17); - psize *= sizeof (GFC_REAL_17); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c index b4958cb27053..3cde4db43196 100644 --- a/libgfortran/generated/reshape_r4.c +++ b/libgfortran/generated/reshape_r4.c @@ -117,6 +117,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_REAL_4)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_REAL_4); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_r4 (gfc_array_r4 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_REAL_4); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_REAL_4); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_r4 (gfc_array_r4 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_REAL_4); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_r4 (gfc_array_r4 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_REAL_4); - ssize *= sizeof (GFC_REAL_4); - psize *= sizeof (GFC_REAL_4); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c index f7c32c2799f3..16c5f520941f 100644 --- a/libgfortran/generated/reshape_r8.c +++ b/libgfortran/generated/reshape_r8.c @@ -117,6 +117,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret, ret->base_addr = xmallocarray (alloc_size, sizeof (GFC_REAL_8)); ret->dtype.rank = rdim; + ret->span = sizeof (GFC_REAL_8); } if (shape_empty) @@ -125,12 +126,12 @@ reshape_r8 (gfc_array_r8 * const restrict ret, if (pad) { pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; + psize = sizeof (GFC_REAL_8); pempty = 0; for (index_type n = 0; n < pdim; n++) { pcount[n] = 0; - pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(pad,n); pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); if (pextent[n] <= 0) { @@ -208,7 +209,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret, } } - rsize = 1; + rsize = sizeof (GFC_REAL_8); for (index_type n = 0; n < rdim; n++) { index_type dim; @@ -218,7 +219,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret, dim = n; rcount[n] = 0; - rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(ret,dim); rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); if (rextent[n] < 0) rextent[n] = 0; @@ -240,12 +241,12 @@ reshape_r8 (gfc_array_r8 * const restrict ret, avoids a warning. */ GFC_ASSERT(sdim>0); - ssize = 1; + ssize = sizeof (GFC_REAL_8); sempty = 0; for (index_type n = 0; n < sdim; n++) { scount[n] = 0; - sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(source,n); sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) { @@ -261,9 +262,6 @@ reshape_r8 (gfc_array_r8 * const restrict ret, if (rsize != 0 && ssize != 0 && psize != 0) { - rsize *= sizeof (GFC_REAL_8); - ssize *= sizeof (GFC_REAL_8); - psize *= sizeof (GFC_REAL_8); reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, ssize, pad ? (char *)pad->base_addr : NULL, psize); return; diff --git a/libgfortran/generated/unpack_c10.c b/libgfortran/generated/unpack_c10.c index d6b12fdcef17..9d0180d41617 100644 --- a/libgfortran/generated/unpack_c10.c +++ b/libgfortran/generated/unpack_c10.c @@ -232,6 +232,7 @@ unpack1_c10 (gfc_array_c10 *ret, const gfc_array_c10 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_COMPLEX_10); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_c16.c b/libgfortran/generated/unpack_c16.c index 0b62d126c86f..d3a99cf688dd 100644 --- a/libgfortran/generated/unpack_c16.c +++ b/libgfortran/generated/unpack_c16.c @@ -232,6 +232,7 @@ unpack1_c16 (gfc_array_c16 *ret, const gfc_array_c16 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_COMPLEX_16); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_c17.c b/libgfortran/generated/unpack_c17.c index 9ded9f0d84be..6b311a9a6592 100644 --- a/libgfortran/generated/unpack_c17.c +++ b/libgfortran/generated/unpack_c17.c @@ -232,6 +232,7 @@ unpack1_c17 (gfc_array_c17 *ret, const gfc_array_c17 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_COMPLEX_17); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_c4.c b/libgfortran/generated/unpack_c4.c index c100349c29af..cced05bc66d5 100644 --- a/libgfortran/generated/unpack_c4.c +++ b/libgfortran/generated/unpack_c4.c @@ -232,6 +232,7 @@ unpack1_c4 (gfc_array_c4 *ret, const gfc_array_c4 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_COMPLEX_4); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_c8.c b/libgfortran/generated/unpack_c8.c index a61edf9cb5a5..6b53e75ffea1 100644 --- a/libgfortran/generated/unpack_c8.c +++ b/libgfortran/generated/unpack_c8.c @@ -232,6 +232,7 @@ unpack1_c8 (gfc_array_c8 *ret, const gfc_array_c8 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_COMPLEX_8); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_i1.c b/libgfortran/generated/unpack_i1.c index 17ac3daa2e59..481592a87686 100644 --- a/libgfortran/generated/unpack_i1.c +++ b/libgfortran/generated/unpack_i1.c @@ -232,6 +232,7 @@ unpack1_i1 (gfc_array_i1 *ret, const gfc_array_i1 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_INTEGER_1); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_i16.c b/libgfortran/generated/unpack_i16.c index b045c9d1e565..c1235e6edeb5 100644 --- a/libgfortran/generated/unpack_i16.c +++ b/libgfortran/generated/unpack_i16.c @@ -232,6 +232,7 @@ unpack1_i16 (gfc_array_i16 *ret, const gfc_array_i16 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_INTEGER_16); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_i2.c b/libgfortran/generated/unpack_i2.c index 33e7b521ab73..7ba6c143fd35 100644 --- a/libgfortran/generated/unpack_i2.c +++ b/libgfortran/generated/unpack_i2.c @@ -232,6 +232,7 @@ unpack1_i2 (gfc_array_i2 *ret, const gfc_array_i2 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_INTEGER_2); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_i4.c b/libgfortran/generated/unpack_i4.c index feb1b791df57..cac6cce126f2 100644 --- a/libgfortran/generated/unpack_i4.c +++ b/libgfortran/generated/unpack_i4.c @@ -232,6 +232,7 @@ unpack1_i4 (gfc_array_i4 *ret, const gfc_array_i4 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_INTEGER_4); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_i8.c b/libgfortran/generated/unpack_i8.c index 076dd868997e..1399ac456e18 100644 --- a/libgfortran/generated/unpack_i8.c +++ b/libgfortran/generated/unpack_i8.c @@ -232,6 +232,7 @@ unpack1_i8 (gfc_array_i8 *ret, const gfc_array_i8 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_INTEGER_8); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_r10.c b/libgfortran/generated/unpack_r10.c index 2f40673e8d9d..df4b98f08cfe 100644 --- a/libgfortran/generated/unpack_r10.c +++ b/libgfortran/generated/unpack_r10.c @@ -232,6 +232,7 @@ unpack1_r10 (gfc_array_r10 *ret, const gfc_array_r10 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_REAL_10); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_r16.c b/libgfortran/generated/unpack_r16.c index c2968edb9b3a..368168f43208 100644 --- a/libgfortran/generated/unpack_r16.c +++ b/libgfortran/generated/unpack_r16.c @@ -232,6 +232,7 @@ unpack1_r16 (gfc_array_r16 *ret, const gfc_array_r16 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_REAL_16); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_r17.c b/libgfortran/generated/unpack_r17.c index 64fe7a9ddb9e..d84d03f1f991 100644 --- a/libgfortran/generated/unpack_r17.c +++ b/libgfortran/generated/unpack_r17.c @@ -232,6 +232,7 @@ unpack1_r17 (gfc_array_r17 *ret, const gfc_array_r17 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_REAL_17); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_r4.c b/libgfortran/generated/unpack_r4.c index 3f9c8fa7029c..19587460e0ff 100644 --- a/libgfortran/generated/unpack_r4.c +++ b/libgfortran/generated/unpack_r4.c @@ -232,6 +232,7 @@ unpack1_r4 (gfc_array_r4 *ret, const gfc_array_r4 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_REAL_4); rs = 1; for (n = 0; n < dim; n++) { diff --git a/libgfortran/generated/unpack_r8.c b/libgfortran/generated/unpack_r8.c index b2c682f30594..09818526f3d2 100644 --- a/libgfortran/generated/unpack_r8.c +++ b/libgfortran/generated/unpack_r8.c @@ -232,6 +232,7 @@ unpack1_r8 (gfc_array_r8 *ret, const gfc_array_r8 *vector, /* The front end has signalled that we need to populate the return array descriptor. */ dim = GFC_DESCRIPTOR_RANK (mask); + ret->span = sizeof (GFC_REAL_8); rs = 1; for (n = 0; n < dim; n++) {
