diff options
Diffstat (limited to 'libgfortran/m4/iforeach.m4')
| -rw-r--r-- | libgfortran/m4/iforeach.m4 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4 index 14e501c67fe..86d43506c6a 100644 --- a/libgfortran/m4/iforeach.m4 +++ b/libgfortran/m4/iforeach.m4 @@ -1,6 +1,6 @@ dnl Support macro file for intrinsic functions. dnl Contains the generic sections of the array functions. -dnl This file is part of the GNU Fortran 95 Runtime Library (libgfortran) +dnl This file is part of the GNU Fortran Runtime Library (libgfortran) dnl Distributed under the GNU GPL with exception. See COPYING for details. define(START_FOREACH_FUNCTION, ` @@ -25,12 +25,12 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, if (rank <= 0) runtime_error ("Rank of array needs to be > 0"); - if (retarray->data == NULL) + if (retarray->base_addr == NULL) { GFC_DIMENSION_SET(retarray->dim[0], 0, rank-1, 1); retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1; retarray->offset = 0; - retarray->data = internal_malloc_size (sizeof (rtype_name) * rank); + retarray->base_addr = internal_malloc_size (sizeof (rtype_name) * rank); } else { @@ -40,7 +40,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); - dest = retarray->data; + dest = retarray->base_addr; for (n = 0; n < rank; n++) { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n); @@ -55,7 +55,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, } } - base = array->data; + base = array->base_addr; /* Initialize the return value. */ for (n = 0; n < rank; n++) @@ -128,12 +128,12 @@ void if (rank <= 0) runtime_error ("Rank of array needs to be > 0"); - if (retarray->data == NULL) + if (retarray->base_addr == NULL) { GFC_DIMENSION_SET(retarray->dim[0], 0, rank - 1, 1); retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1; retarray->offset = 0; - retarray->data = internal_malloc_size (sizeof (rtype_name) * rank); + retarray->base_addr = internal_malloc_size (sizeof (rtype_name) * rank); } else { @@ -149,7 +149,7 @@ void mask_kind = GFC_DESCRIPTOR_SIZE (mask); - mbase = mask->data; + mbase = mask->base_addr; if (mask_kind == 1 || mask_kind == 2 || mask_kind == 4 || mask_kind == 8 #ifdef HAVE_GFC_LOGICAL_16 @@ -161,7 +161,7 @@ void runtime_error ("Funny sized logical array"); dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); - dest = retarray->data; + dest = retarray->base_addr; for (n = 0; n < rank; n++) { sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n); @@ -177,7 +177,7 @@ void } } - base = array->data; + base = array->base_addr; /* Initialize the return value. */ for (n = 0; n < rank; n++) @@ -259,12 +259,12 @@ void if (rank <= 0) runtime_error ("Rank of array needs to be > 0"); - if (retarray->data == NULL) + if (retarray->base_addr == NULL) { GFC_DIMENSION_SET(retarray->dim[0], 0, rank-1, 1); retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1; retarray->offset = 0; - retarray->data = internal_malloc_size (sizeof (rtype_name) * rank); + retarray->base_addr = internal_malloc_size (sizeof (rtype_name) * rank); } else if (unlikely (compile_options.bounds_check)) { @@ -273,7 +273,7 @@ void } dstride = GFC_DESCRIPTOR_STRIDE(retarray,0); - dest = retarray->data; + dest = retarray->base_addr; for (n = 0; n<rank; n++) dest[n * dstride] = $1 ; }')dnl |