From efd4dc1a157182d3f95dc00e65f90e1610ae5c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Schl=C3=BCter?= Date: Fri, 8 Jul 2005 00:08:06 +0200 Subject: libgfortran.h (GFC_ARRAY_DESCRIPTOR): Replace 'type *base' by 'size_t offset'. * libgfortran.h (GFC_ARRAY_DESCRIPTOR): Replace 'type *base' by 'size_t offset'. * intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,intrinsics/pack_generic.c, intrinsics/reshape_generic.c, intrinsics/spread_generic.c, intrinsics/transpose_generic.c, intrinsics/unpack_generic, m4/cshift1.m4, m4/eoshift1.m4, m4/eoshift3.m4, m4/iforeach.m4, m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/reshape.m4, m4,transpose.m4: Set renamed field 'offset' to zero instead of 'base'. * generated/all_l4.c, generated/all_l8.c, generated/any_l4.c, generated/any_l8.c, generated/count_4_l4.c, generated/count_4_l8.c, generated/count_8_l4.c, generated/count_8_l8.c, generated/chift1_4.c, generated/cshift1_8.c, generated/eoshift1_4.c, generated/eoshift1_8.c, generated/eoshift3_4.c, generated/eoshift3_8.c, generated/matmul_c4.c, generated/matmul_c8.c, generated/matmul_i4.c, matmul_i8.c, generated/matmul_l4.c, generated/matmul_l8.c, generated/matmul_r4.c, generated/matmul_r8.c, generated/maxloc0_4_i4.c, generated/maxloc0_4_i8.c, generated/maxloc0_4_r4.c, generated/maxloc0_4_r8.c, generated/maxloc0_8_i4.c, generated/maxloc0_8_i8.c, generated/maxloc0_8_r4.c, generated/maxloc0_8_r8.c, generated/maxloc1_4_i4.c, generated/maxloc1_4_i8.c, generated/maxloc1_4_r4.c, generated/maxloc1_4_r8.c, generated/maxloc1_8_i4.c, generated/maxloc1_8_i8.c, generated/maxloc1_8_r4.c, generated/maxloc1_8_r8.c, generated/maxval_i4.c, generated/maxval_i8.c, generated/maxval_r4.c, generated/maxval_r8.c, generated/minloc0_4_i4.c, generated/minloc0_4_i8.c, generated/minloc0_4_r4.c, generated/minloc0_4_r8.c, generated/minloc0_8_i4.c, generated/minloc0_8_i8.c, generated/minloc0_8_r4.c, generated/minloc0_8_r8.c, generated/minloc1_4_i4.c, generated/minloc1_4_i8.c, generated/minloc1_4_r4.c, generated/minloc1_4_r8.c, generated/minloc1_8_i4.c, generated/minloc1_8_i8.c, generated/minloc1_8_r4.c, generated/minloc1_8_r8.c, generated/minval_i4.c, generated/minval_i8.c, generated/minval_r4.c, generated/minval_r8.c, generated/product_c4.c, generated/product_c8.c, generated/product_i4.c, generated/product_i8.c, generated/product_r4.c, generated/product_r8.c, generated/reshape_c4.c, generated/reshape_c8.c, generated/reshape_i4.c, generated/reshape_i8.c, generated/sum_c4.c, generated/sum_c8.c, generated/sum_i4.c, generated/sum_i8.c, generated/sum_r4.c, generated/sum_r8.c, generated/transpose_c4.c, generated/transpose_c8.c, generated/transpose_i4.c, generated/transpose_i8.c: Regenerate: From-SVN: r101739 --- libgfortran/intrinsics/cshift0.c | 2 +- libgfortran/intrinsics/eoshift0.c | 2 +- libgfortran/intrinsics/eoshift2.c | 2 +- libgfortran/intrinsics/pack_generic.c | 6 +++--- libgfortran/intrinsics/reshape_generic.c | 2 +- libgfortran/intrinsics/spread_generic.c | 2 +- libgfortran/intrinsics/transpose_generic.c | 2 +- libgfortran/intrinsics/unpack_generic.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libgfortran/intrinsics') diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c index 61fd901..499991b 100644 --- a/libgfortran/intrinsics/cshift0.c +++ b/libgfortran/intrinsics/cshift0.c @@ -148,7 +148,7 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, int i; ret->data = internal_malloc_size (size * size0 ((array_t *)array)); - ret->base = 0; + ret->offset = 0; ret->dtype = array->dtype; for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) { diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c index 6152e9f..0ab1d34 100644 --- a/libgfortran/intrinsics/eoshift0.c +++ b/libgfortran/intrinsics/eoshift0.c @@ -80,7 +80,7 @@ eoshift0 (gfc_array_char * ret, const gfc_array_char * array, int i; ret->data = internal_malloc_size (size * size0 ((array_t *)array)); - ret->base = 0; + ret->offset = 0; ret->dtype = array->dtype; for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) { diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c index 4e2b41b..1580bc2 100644 --- a/libgfortran/intrinsics/eoshift2.c +++ b/libgfortran/intrinsics/eoshift2.c @@ -81,7 +81,7 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array, int i; ret->data = internal_malloc_size (size * size0 ((array_t *)array)); - ret->base = 0; + ret->offset = 0; ret->dtype = array->dtype; for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) { diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c index 06298bb..00c55a8 100644 --- a/libgfortran/intrinsics/pack_generic.c +++ b/libgfortran/intrinsics/pack_generic.c @@ -201,7 +201,7 @@ pack (gfc_array_char *ret, const gfc_array_char *array, ret->dim[0].stride = 1; ret->data = internal_malloc_size (size * total); - ret->base = 0; + ret->offset = 0; if (total == 0) /* In this case, nothing remains to be done. */ @@ -342,7 +342,7 @@ pack_s (gfc_array_char *ret, const gfc_array_char *array, ret->dim[0].ubound = -1; ret->dim[0].stride = 1; ret->data = internal_malloc_size (0); - ret->base = 0; + ret->offset = 0; return; } @@ -354,7 +354,7 @@ pack_s (gfc_array_char *ret, const gfc_array_char *array, ret->dim[0].stride = 1; ret->data = internal_malloc_size (size * total); - ret->base = 0; + ret->offset = 0; } rstride0 = ret->dim[0].stride * size; diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c index 75db5ea..265bfb9 100644 --- a/libgfortran/intrinsics/reshape_generic.c +++ b/libgfortran/intrinsics/reshape_generic.c @@ -100,7 +100,7 @@ reshape (parray *ret, parray *source, shape_type *shape, ret->dim[n].stride = rs; rs *= rex; } - ret->base = 0; + ret->offset = 0; ret->data = internal_malloc_size ( rs * size ); ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim; } diff --git a/libgfortran/intrinsics/spread_generic.c b/libgfortran/intrinsics/spread_generic.c index 0115287..f1035b0 100644 --- a/libgfortran/intrinsics/spread_generic.c +++ b/libgfortran/intrinsics/spread_generic.c @@ -105,7 +105,7 @@ spread (gfc_array_char *ret, const gfc_array_char *source, dim++; } } - ret->base = 0; + ret->offset = 0; ret->data = internal_malloc_size (rs * size); } else diff --git a/libgfortran/intrinsics/transpose_generic.c b/libgfortran/intrinsics/transpose_generic.c index 201e3e1..fd26e60 100644 --- a/libgfortran/intrinsics/transpose_generic.c +++ b/libgfortran/intrinsics/transpose_generic.c @@ -69,7 +69,7 @@ transpose (gfc_array_char *ret, gfc_array_char *source) ret->dim[1].stride = ret->dim[0].ubound+1; ret->data = internal_malloc_size (size * size0 ((array_t*)ret)); - ret->base = 0; + ret->offset = 0; } sxstride = source->dim[0].stride * size; diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c index d8e1230..929e1c3 100644 --- a/libgfortran/intrinsics/unpack_generic.c +++ b/libgfortran/intrinsics/unpack_generic.c @@ -87,7 +87,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector, mstride[n] = mask->dim[n].stride; rs *= extent[n]; } - ret->base = 0; + ret->offset = 0; ret->data = internal_malloc_size (rs * size); } else -- cgit v1.1