From 6c167c45b1059150631362a647864ee0ca900a91 Mon Sep 17 00:00:00 2001 From: Victor Leikehman Date: Wed, 4 Aug 2004 14:30:46 +0000 Subject: * libgfortran.h (array_t, size0) New declarations. * m4/ifunction.m4, m4/transpose.m4, intrinsics/cshift0.c: Allocate space if return value descriptor has NULL in its data field, and initialize bounds and stride. * intrinsics/size.c (array_t, size0): Declarations moved to libgfortran.h. * generated/*.c: Regenerate. From-SVN: r85558 --- libgfortran/intrinsics/cshift0.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'libgfortran/intrinsics/cshift0.c') diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c index 5a2c8ca..dd96ddf 100644 --- a/libgfortran/intrinsics/cshift0.c +++ b/libgfortran/intrinsics/cshift0.c @@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA. */ sizeof(int) < sizeof (index_type). */ static void -__cshift0 (const gfc_array_char * ret, const gfc_array_char * array, +__cshift0 (gfc_array_char * ret, const gfc_array_char * array, int shift, int which) { /* r.* indicates the return array. */ @@ -69,6 +69,25 @@ __cshift0 (const gfc_array_char * ret, const gfc_array_char * array, soffset = size; len = 0; + if (ret->data == NULL) + { + int i; + + ret->data = internal_malloc (size * size0 ((array_t *)array)); + ret->base = 0; + ret->dtype = array->dtype; + for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) + { + ret->dim[i].lbound = 0; + ret->dim[i].ubound = array->dim[i].ubound - array->dim[i].lbound; + + if (i == 0) + ret->dim[i].stride = 1; + else + ret->dim[i].stride = (ret->dim[i-1].ubound + 1) * ret->dim[i-1].stride; + } + } + for (dim = 0; dim < GFC_DESCRIPTOR_RANK (array); dim++) { if (dim == which) @@ -153,7 +172,7 @@ __cshift0 (const gfc_array_char * ret, const gfc_array_char * array, void -__cshift0_4 (const gfc_array_char * ret, const gfc_array_char * array, +__cshift0_4 (gfc_array_char * ret, const gfc_array_char * array, const GFC_INTEGER_4 * pshift, const GFC_INTEGER_4 * pdim) { __cshift0 (ret, array, *pshift, pdim ? *pdim : 1); @@ -161,7 +180,7 @@ __cshift0_4 (const gfc_array_char * ret, const gfc_array_char * array, void -__cshift0_8 (const gfc_array_char * ret, const gfc_array_char * array, +__cshift0_8 (gfc_array_char * ret, const gfc_array_char * array, const GFC_INTEGER_8 * pshift, const GFC_INTEGER_8 * pdim) { __cshift0 (ret, array, *pshift, pdim ? *pdim : 1); -- cgit v1.1