diff options
Diffstat (limited to 'libgfortran/intrinsics')
-rw-r--r-- | libgfortran/intrinsics/random.c | 2 | ||||
-rw-r--r-- | libgfortran/intrinsics/reduce.c | 299 | ||||
-rw-r--r-- | libgfortran/intrinsics/stat.c | 274 |
3 files changed, 450 insertions, 125 deletions
diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c index e0178bf..225eb60 100644 --- a/libgfortran/intrinsics/random.c +++ b/libgfortran/intrinsics/random.c @@ -1215,7 +1215,7 @@ arandom_m8 (gfc_array_m8 *x) } } -#ifdef GFC_HAVE_GFC_UINTEGER_16 +#ifdef HAVE_GFC_UINTEGER_16 /* Fill an unsigned array with random bytes. */ diff --git a/libgfortran/intrinsics/reduce.c b/libgfortran/intrinsics/reduce.c new file mode 100644 index 0000000..256394f --- /dev/null +++ b/libgfortran/intrinsics/reduce.c @@ -0,0 +1,299 @@ +/* Generic implementation of the reduce intrinsic + Copyright (C) 2002-2025 Free Software Foundation, Inc. + Contributed by Paul Thomas <pault@gcc.gnu.org> + +This file is part of the GNU Fortran runtime library (libgfortran). + +Libgfortran is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public +License as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later version. + +Ligbfortran is distributed in the hope that it will be useful, +but WITHOUT ANY WarrayANTY; without even the implied warrayanty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +<http://www.gnu.org/licenses/>. */ + +#include "libgfortran.h" +#include <string.h> +#include <stdio.h> + +typedef GFC_FULL_ARRAY_DESCRIPTOR (GFC_MAX_DIMENSIONS, char) parray; + +extern void reduce (parray *, parray *, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *, gfc_array_l4 *, void *, void *); +export_proto (reduce); + +void +reduce (parray *ret, + parray *array, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *dim, + gfc_array_l4 *mask, + void *identity, + void *ordered __attribute__ ((unused))) +{ + GFC_LOGICAL_4 maskR = 0; + void *array_ptr; + void *buffer_ptr; + void *zero; + void *buffer; + void *res; + index_type ext0, ext1, ext2; + index_type str0, str1, str2; + index_type idx0, idx1, idx2; + index_type dimen, dimen_m1, ldx, ext, str; + bool started; + bool masked = false; + bool dim_present = dim != NULL; + bool mask_present = mask != NULL; + bool identity_present = identity != NULL; + bool scalar_result; + int i, j; + int array_rank = (int)GFC_DESCRIPTOR_RANK (array); + size_t elem_len = GFC_DESCRIPTOR_SIZE (array); + +/* The standard mandates that OPERATION is a pure scalar function such that in + the reduction below: + + *buffer_ptr = OPERATION (*buffer_ptr, array(idx1, idx2, idx3)) + + To make this type agnostic, the front end builds a wrapper, that puts the + assignment within a subroutine and transforms it into a pointer operation: + + operation (buffer_ptr, &array(idx1, idx2, idx3), buffer_ptr) + + The wrapper also detects the presence or not of the second argument. If it + is not present, the wrapper effects *third_arg = *first_arg. + + The only information needed about the type of array is its element size. In + both modes, the wrapper takes care of allocatable components correctly, + which is why the second mode is used to fill the result elements. */ + + if (dim_present) + { + if ((*dim < 1) || (*dim > (GFC_INTEGER_4)array_rank)) + runtime_error ("Mismatch between DIM and the rank of ARRAY in the " + "REDUCE intrinsic (%d/%d)", (int)*dim, array_rank); + dimen = (index_type) *dim; + } + else + dimen = 1; + dimen_m1 = dimen -1; + + /* Set up the shape and strides for the reduction. This is made relatively + painless by the use of pointer arithmetic throughout (except for MASK, + whose type is known. */ + ext0 = ext1 = ext2 = 1; + str0 = str1 = str2 = 1; + + scalar_result = (!dim_present && array_rank > 1) || array_rank == 1; + + j = 0; + for (i = 0; i < array_rank; i++) + { + /* Obtain the shape of the reshaped ARRAY. */ + ext = GFC_DESCRIPTOR_EXTENT (array,i); + str = GFC_DESCRIPTOR_STRIDE (array,i); + + if (masked && (ext != GFC_DESCRIPTOR_EXTENT (mask, i))) + { + int mext = (int)GFC_DESCRIPTOR_EXTENT (mask, i); + runtime_error ("shape mismatch between ARRAY and MASK in the REDUCE " + "intrinsic (%zd/%d)", ext, mext); + } + + if (scalar_result) + { + ext1 *= ext; + continue; + } + else if (i < (int)dimen_m1) + ext0 *= ext; + else if (i == (int)dimen_m1) + ext1 = ext; + else + ext2 *= ext; + + /* The dimensions of the return array. */ + if (i != (int)dimen_m1) + { + str = GFC_DESCRIPTOR_STRIDE (array, j); + GFC_DIMENSION_SET (ret->dim[j], 0, ext - 1, str); + j++; + } + } + + if (!scalar_result) + { + str1 = GFC_DESCRIPTOR_STRIDE (array, dimen_m1); + if (dimen < array_rank) + str2 = GFC_DESCRIPTOR_STRIDE (array, dimen); + else + str2 = 1; + } + + /* Allocate the result data, the result buffer and zero. */ + if (ret->base_addr == NULL) + ret->base_addr = calloc ((size_t)(ext0 * ext2), elem_len); + buffer = calloc (1, elem_len); + zero = calloc (1, elem_len); + + /* Now loop over the first and third dimensions of the reshaped ARRAY. */ + for (idx0 = 0; idx0 < ext0; idx0++) + { + for (idx2 = 0; idx2 < ext2; idx2++) + { + ldx = idx0 * str0 + idx2 * str2; + if (mask_present) + maskR = mask->base_addr[ldx]; + + started = (mask_present && maskR) || !mask_present; + + buffer_ptr = array->base_addr + + (size_t)((idx0 * str0 + idx2 * str2) * elem_len); + + /* Start the iteration over the second dimension of ARRAY. */ + for (idx1 = 1; idx1 < ext1; idx1++) + { + /* If masked, cycle until after first element that is not masked + out. Then set 'started' and cycle so that this becomes the + first element in the reduction. */ + ldx = idx0 * str0 + idx1 * str1 + idx2 * str2; + if (mask_present) + maskR = mask->base_addr[ldx]; + + array_ptr = array->base_addr + + (size_t)((idx0 * str0 + idx1 * str1 + + idx2 * str2) * elem_len); + if (!started) + { + if (mask_present && maskR) + started = true; + buffer_ptr = array_ptr; + continue; + } + + /* Call the operation, if not masked out, with the previous + element or the buffer and current element as arguments. The + result is stored in the buffer and the buffer_ptr set to + point to buffer, instead of the previous array element. */ + if ((mask_present && maskR) || !mask_present) + { + operation (buffer_ptr, array_ptr, buffer); + buffer_ptr = buffer; + } + } + + /* Now the result of the iteration is transferred to the returned + result. If this result element is empty emit an error or, if + available, set to identity. Note that str1 is paired with idx2 + here because the result skips a dimension. */ + res = ret->base_addr + (size_t)((idx0 * str0 + idx2 * str1) * elem_len); + if (started) + { + operation (buffer_ptr, NULL, res); + operation (zero, NULL, buffer); + } + else + { + if (!identity_present) + runtime_error ("Empty column and no IDENTITY in REDUCE " + "intrinsic"); + else + operation (identity, NULL, res); + } + } + } + free (zero); + free (buffer); +} + + +extern void * reduce_scalar (parray *, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *, gfc_array_l4 *, void *, void *); +export_proto (reduce_scalar); + +void * +reduce_scalar (parray *array, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *dim, + gfc_array_l4 *mask, + void *identity, + void *ordered) +{ + parray ret; + ret.base_addr = NULL; + ret.dtype.rank = 0; + reduce (&ret, array, operation, dim, mask, identity, ordered); + return (void *)ret.base_addr; +} + +extern void reduce_c (parray *, gfc_charlen_type, parray *, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *, gfc_array_l4 *, void *, void *, + gfc_charlen_type, gfc_charlen_type); +export_proto (reduce_c); + +void +reduce_c (parray *ret, + gfc_charlen_type ret_strlen __attribute__ ((unused)), + parray *array, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *dim, + gfc_array_l4 *mask, + void *identity, + void *ordered, + gfc_charlen_type array_strlen __attribute__ ((unused)), + gfc_charlen_type identity_strlen __attribute__ ((unused))) +{ + /* The frontend constraints make string length checking redundant. Also, the + scalar symbol is flagged to be allocatable in trans-intrinsic.cc so that + gfc_conv_procedure_call does the necessary allocation/deallocation. */ + reduce (ret, array, operation, dim, mask, identity, ordered); +} + + +extern void reduce_scalar_c (void *, gfc_charlen_type, parray *, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *, gfc_array_l4 *, void *, void *, + gfc_charlen_type, gfc_charlen_type); +export_proto (reduce_scalar_c); + + +void +reduce_scalar_c (void *res, + gfc_charlen_type res_strlen __attribute__ ((unused)), + parray *array, + void (*operation) (void *, void *, void *), + GFC_INTEGER_4 *dim, + gfc_array_l4 *mask, + void *identity, + void *ordered, + gfc_charlen_type array_strlen __attribute__ ((unused)), + gfc_charlen_type identity_strlen __attribute__ ((unused))) +{ + parray ret; + ret.base_addr = NULL; + ret.dtype.rank = 0; + /* The frontend constraints make string length checking redundant. */ + reduce (&ret, array, operation, dim, mask, identity, ordered); + if (res) + { + memcpy (res, ret.base_addr, GFC_DESCRIPTOR_SIZE (array)); + if (ret.base_addr) free (ret.base_addr); + } + else + res = ret.base_addr; +} diff --git a/libgfortran/intrinsics/stat.c b/libgfortran/intrinsics/stat.c index 8d32f22..63a57cd 100644 --- a/libgfortran/intrinsics/stat.c +++ b/libgfortran/intrinsics/stat.c @@ -35,22 +35,22 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifdef HAVE_STAT -/* SUBROUTINE STAT(FILE, SARRAY, STATUS) +/* SUBROUTINE STAT(NAME, VALUES, STATUS) CHARACTER(len=*), INTENT(IN) :: FILE - INTEGER, INTENT(OUT), :: SARRAY(13) + INTEGER, INTENT(OUT), :: VALUES(13) INTEGER, INTENT(OUT), OPTIONAL :: STATUS - FUNCTION STAT(FILE, SARRAY) + FUNCTION STAT(NAME, VALUES) INTEGER STAT CHARACTER(len=*), INTENT(IN) :: FILE - INTEGER, INTENT(OUT), :: SARRAY(13) */ + INTEGER, INTENT(OUT), :: VALUES(13) */ /*extern void stat_i4_sub_0 (char *, gfc_array_i4 *, GFC_INTEGER_4 *, gfc_charlen_type, int); internal_proto(stat_i4_sub_0);*/ static void -stat_i4_sub_0 (char *name, gfc_array_i4 *sarray, GFC_INTEGER_4 *status, +stat_i4_sub_0 (char *name, gfc_array_i4 *values, GFC_INTEGER_4 *status, gfc_charlen_type name_len, int is_lstat __attribute__ ((unused))) { int val; @@ -58,12 +58,12 @@ stat_i4_sub_0 (char *name, gfc_array_i4 *sarray, GFC_INTEGER_4 *status, struct stat sb; /* If the rank of the array is not 1, abort. */ - if (GFC_DESCRIPTOR_RANK (sarray) != 1) - runtime_error ("Array rank of SARRAY is not 1."); + if (GFC_DESCRIPTOR_RANK (values) != 1) + runtime_error ("Array rank of VALUES is not 1."); /* If the array is too small, abort. */ - if (GFC_DESCRIPTOR_EXTENT(sarray,0) < 13) - runtime_error ("Array size of SARRAY is too small."); + if (GFC_DESCRIPTOR_EXTENT(values,0) < 13) + runtime_error ("Array size of VALUES is too small."); /* Make a null terminated copy of the string. */ str = fc_strdup (name, name_len); @@ -80,57 +80,70 @@ stat_i4_sub_0 (char *name, gfc_array_i4 *sarray, GFC_INTEGER_4 *status, if (val == 0) { - index_type stride = GFC_DESCRIPTOR_STRIDE(sarray,0); + index_type stride = GFC_DESCRIPTOR_STRIDE(values,0); + + /* Return -1 for any value overflowing INT32_MAX. */ + for (int i = 0; i < 13; i++) + values->base_addr[i * stride] = -1; /* Device ID */ - sarray->base_addr[0 * stride] = sb.st_dev; + if (sb.st_dev <= INT32_MAX) + values->base_addr[0 * stride] = sb.st_dev; /* Inode number */ - sarray->base_addr[1 * stride] = sb.st_ino; + if (sb.st_ino <= INT32_MAX) + values->base_addr[1 * stride] = sb.st_ino; /* File mode */ - sarray->base_addr[2 * stride] = sb.st_mode; + if (sb.st_mode <= INT32_MAX) + values->base_addr[2 * stride] = sb.st_mode; /* Number of (hard) links */ - sarray->base_addr[3 * stride] = sb.st_nlink; + if (sb.st_nlink <= INT32_MAX) + values->base_addr[3 * stride] = sb.st_nlink; /* Owner's uid */ - sarray->base_addr[4 * stride] = sb.st_uid; + if (sb.st_uid <= INT32_MAX) + values->base_addr[4 * stride] = sb.st_uid; /* Owner's gid */ - sarray->base_addr[5 * stride] = sb.st_gid; + if (sb.st_gid <= INT32_MAX) + values->base_addr[5 * stride] = sb.st_gid; /* ID of device containing directory entry for file (0 if not available) */ #if HAVE_STRUCT_STAT_ST_RDEV - sarray->base_addr[6 * stride] = sb.st_rdev; + if (sb.st_rdev <= INT32_MAX) + values->base_addr[6 * stride] = sb.st_rdev; #else - sarray->base_addr[6 * stride] = 0; + values->base_addr[6 * stride] = 0; #endif /* File size (bytes) */ - sarray->base_addr[7 * stride] = sb.st_size; + if (sb.st_size <= INT32_MAX) + values->base_addr[7 * stride] = sb.st_size; /* Last access time */ - sarray->base_addr[8 * stride] = sb.st_atime; + if (sb.st_atime <= INT32_MAX) + values->base_addr[8 * stride] = sb.st_atime; /* Last modification time */ - sarray->base_addr[9 * stride] = sb.st_mtime; + if (sb.st_mtime <= INT32_MAX) + values->base_addr[9 * stride] = sb.st_mtime; /* Last file status change time */ - sarray->base_addr[10 * stride] = sb.st_ctime; + if (sb.st_ctime <= INT32_MAX) + values->base_addr[10 * stride] = sb.st_ctime; /* Preferred I/O block size (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLKSIZE - sarray->base_addr[11 * stride] = sb.st_blksize; -#else - sarray->base_addr[11 * stride] = -1; + if (sb.st_blksize <= INT32_MAX) + values->base_addr[11 * stride] = sb.st_blksize; #endif /* Number of blocks allocated (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLOCKS - sarray->base_addr[12 * stride] = sb.st_blocks; -#else - sarray->base_addr[12 * stride] = -1; + if (sb.st_blocks <= INT32_MAX) + values->base_addr[12 * stride] = sb.st_blocks; #endif } @@ -144,10 +157,10 @@ extern void stat_i4_sub (char *, gfc_array_i4 *, GFC_INTEGER_4 *, iexport_proto(stat_i4_sub); void -stat_i4_sub (char *name, gfc_array_i4 *sarray, GFC_INTEGER_4 *status, +stat_i4_sub (char *name, gfc_array_i4 *values, GFC_INTEGER_4 *status, gfc_charlen_type name_len) { - stat_i4_sub_0 (name, sarray, status, name_len, 0); + stat_i4_sub_0 (name, values, status, name_len, 0); } iexport(stat_i4_sub); @@ -157,17 +170,17 @@ extern void lstat_i4_sub (char *, gfc_array_i4 *, GFC_INTEGER_4 *, iexport_proto(lstat_i4_sub); void -lstat_i4_sub (char *name, gfc_array_i4 *sarray, GFC_INTEGER_4 *status, +lstat_i4_sub (char *name, gfc_array_i4 *values, GFC_INTEGER_4 *status, gfc_charlen_type name_len) { - stat_i4_sub_0 (name, sarray, status, name_len, 1); + stat_i4_sub_0 (name, values, status, name_len, 1); } iexport(lstat_i4_sub); static void -stat_i8_sub_0 (char *name, gfc_array_i8 *sarray, GFC_INTEGER_8 *status, +stat_i8_sub_0 (char *name, gfc_array_i8 *values, GFC_INTEGER_8 *status, gfc_charlen_type name_len, int is_lstat __attribute__ ((unused))) { int val; @@ -175,12 +188,12 @@ stat_i8_sub_0 (char *name, gfc_array_i8 *sarray, GFC_INTEGER_8 *status, struct stat sb; /* If the rank of the array is not 1, abort. */ - if (GFC_DESCRIPTOR_RANK (sarray) != 1) - runtime_error ("Array rank of SARRAY is not 1."); + if (GFC_DESCRIPTOR_RANK (values) != 1) + runtime_error ("Array rank of VALUES is not 1."); /* If the array is too small, abort. */ - if (GFC_DESCRIPTOR_EXTENT(sarray,0) < 13) - runtime_error ("Array size of SARRAY is too small."); + if (GFC_DESCRIPTOR_EXTENT(values,0) < 13) + runtime_error ("Array size of VALUES is too small."); /* Make a null terminated copy of the string. */ str = fc_strdup (name, name_len); @@ -197,57 +210,57 @@ stat_i8_sub_0 (char *name, gfc_array_i8 *sarray, GFC_INTEGER_8 *status, if (val == 0) { - index_type stride = GFC_DESCRIPTOR_STRIDE(sarray,0); + index_type stride = GFC_DESCRIPTOR_STRIDE(values,0); /* Device ID */ - sarray->base_addr[0] = sb.st_dev; + values->base_addr[0] = sb.st_dev; /* Inode number */ - sarray->base_addr[stride] = sb.st_ino; + values->base_addr[stride] = sb.st_ino; /* File mode */ - sarray->base_addr[2 * stride] = sb.st_mode; + values->base_addr[2 * stride] = sb.st_mode; /* Number of (hard) links */ - sarray->base_addr[3 * stride] = sb.st_nlink; + values->base_addr[3 * stride] = sb.st_nlink; /* Owner's uid */ - sarray->base_addr[4 * stride] = sb.st_uid; + values->base_addr[4 * stride] = sb.st_uid; /* Owner's gid */ - sarray->base_addr[5 * stride] = sb.st_gid; + values->base_addr[5 * stride] = sb.st_gid; /* ID of device containing directory entry for file (0 if not available) */ #if HAVE_STRUCT_STAT_ST_RDEV - sarray->base_addr[6 * stride] = sb.st_rdev; + values->base_addr[6 * stride] = sb.st_rdev; #else - sarray->base_addr[6 * stride] = 0; + values->base_addr[6 * stride] = 0; #endif /* File size (bytes) */ - sarray->base_addr[7 * stride] = sb.st_size; + values->base_addr[7 * stride] = sb.st_size; /* Last access time */ - sarray->base_addr[8 * stride] = sb.st_atime; + values->base_addr[8 * stride] = sb.st_atime; /* Last modification time */ - sarray->base_addr[9 * stride] = sb.st_mtime; + values->base_addr[9 * stride] = sb.st_mtime; /* Last file status change time */ - sarray->base_addr[10 * stride] = sb.st_ctime; + values->base_addr[10 * stride] = sb.st_ctime; /* Preferred I/O block size (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLKSIZE - sarray->base_addr[11 * stride] = sb.st_blksize; + values->base_addr[11 * stride] = sb.st_blksize; #else - sarray->base_addr[11 * stride] = -1; + values->base_addr[11 * stride] = -1; #endif /* Number of blocks allocated (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLOCKS - sarray->base_addr[12 * stride] = sb.st_blocks; + values->base_addr[12 * stride] = sb.st_blocks; #else - sarray->base_addr[12 * stride] = -1; + values->base_addr[12 * stride] = -1; #endif } @@ -261,10 +274,10 @@ extern void stat_i8_sub (char *, gfc_array_i8 *, GFC_INTEGER_8 *, iexport_proto(stat_i8_sub); void -stat_i8_sub (char *name, gfc_array_i8 *sarray, GFC_INTEGER_8 *status, +stat_i8_sub (char *name, gfc_array_i8 *values, GFC_INTEGER_8 *status, gfc_charlen_type name_len) { - stat_i8_sub_0 (name, sarray, status, name_len, 0); + stat_i8_sub_0 (name, values, status, name_len, 0); } iexport(stat_i8_sub); @@ -275,10 +288,10 @@ extern void lstat_i8_sub (char *, gfc_array_i8 *, GFC_INTEGER_8 *, iexport_proto(lstat_i8_sub); void -lstat_i8_sub (char *name, gfc_array_i8 *sarray, GFC_INTEGER_8 *status, +lstat_i8_sub (char *name, gfc_array_i8 *values, GFC_INTEGER_8 *status, gfc_charlen_type name_len) { - stat_i8_sub_0 (name, sarray, status, name_len, 1); + stat_i8_sub_0 (name, values, status, name_len, 1); } iexport(lstat_i8_sub); @@ -288,10 +301,10 @@ extern GFC_INTEGER_4 stat_i4 (char *, gfc_array_i4 *, gfc_charlen_type); export_proto(stat_i4); GFC_INTEGER_4 -stat_i4 (char *name, gfc_array_i4 *sarray, gfc_charlen_type name_len) +stat_i4 (char *name, gfc_array_i4 *values, gfc_charlen_type name_len) { GFC_INTEGER_4 val; - stat_i4_sub (name, sarray, &val, name_len); + stat_i4_sub (name, values, &val, name_len); return val; } @@ -299,32 +312,32 @@ extern GFC_INTEGER_8 stat_i8 (char *, gfc_array_i8 *, gfc_charlen_type); export_proto(stat_i8); GFC_INTEGER_8 -stat_i8 (char *name, gfc_array_i8 *sarray, gfc_charlen_type name_len) +stat_i8 (char *name, gfc_array_i8 *values, gfc_charlen_type name_len) { GFC_INTEGER_8 val; - stat_i8_sub (name, sarray, &val, name_len); + stat_i8_sub (name, values, &val, name_len); return val; } -/* SUBROUTINE LSTAT(FILE, SARRAY, STATUS) +/* SUBROUTINE LSTAT(NAME, VALUES, STATUS) CHARACTER(len=*), INTENT(IN) :: FILE - INTEGER, INTENT(OUT), :: SARRAY(13) + INTEGER, INTENT(OUT), :: VALUES(13) INTEGER, INTENT(OUT), OPTIONAL :: STATUS - FUNCTION LSTAT(FILE, SARRAY) + FUNCTION LSTAT(NAME, VALUES) INTEGER LSTAT CHARACTER(len=*), INTENT(IN) :: FILE - INTEGER, INTENT(OUT), :: SARRAY(13) */ + INTEGER, INTENT(OUT), :: VALUES(13) */ extern GFC_INTEGER_4 lstat_i4 (char *, gfc_array_i4 *, gfc_charlen_type); export_proto(lstat_i4); GFC_INTEGER_4 -lstat_i4 (char *name, gfc_array_i4 *sarray, gfc_charlen_type name_len) +lstat_i4 (char *name, gfc_array_i4 *values, gfc_charlen_type name_len) { GFC_INTEGER_4 val; - lstat_i4_sub (name, sarray, &val, name_len); + lstat_i4_sub (name, values, &val, name_len); return val; } @@ -332,10 +345,10 @@ extern GFC_INTEGER_8 lstat_i8 (char *, gfc_array_i8 *, gfc_charlen_type); export_proto(lstat_i8); GFC_INTEGER_8 -lstat_i8 (char *name, gfc_array_i8 *sarray, gfc_charlen_type name_len) +lstat_i8 (char *name, gfc_array_i8 *values, gfc_charlen_type name_len) { GFC_INTEGER_8 val; - lstat_i8_sub (name, sarray, &val, name_len); + lstat_i8_sub (name, values, &val, name_len); return val; } @@ -344,32 +357,32 @@ lstat_i8 (char *name, gfc_array_i8 *sarray, gfc_charlen_type name_len) #ifdef HAVE_FSTAT -/* SUBROUTINE FSTAT(UNIT, SARRAY, STATUS) +/* SUBROUTINE FSTAT(UNIT, VALUES, STATUS) INTEGER, INTENT(IN) :: UNIT - INTEGER, INTENT(OUT) :: SARRAY(13) + INTEGER, INTENT(OUT) :: VALUES(13) INTEGER, INTENT(OUT), OPTIONAL :: STATUS - FUNCTION FSTAT(UNIT, SARRAY) + FUNCTION FSTAT(UNIT, VALUES) INTEGER FSTAT INTEGER, INTENT(IN) :: UNIT - INTEGER, INTENT(OUT) :: SARRAY(13) */ + INTEGER, INTENT(OUT) :: VALUES(13) */ extern void fstat_i4_sub (GFC_INTEGER_4 *, gfc_array_i4 *, GFC_INTEGER_4 *); iexport_proto(fstat_i4_sub); void -fstat_i4_sub (GFC_INTEGER_4 *unit, gfc_array_i4 *sarray, GFC_INTEGER_4 *status) +fstat_i4_sub (GFC_INTEGER_4 *unit, gfc_array_i4 *values, GFC_INTEGER_4 *status) { int val; struct stat sb; /* If the rank of the array is not 1, abort. */ - if (GFC_DESCRIPTOR_RANK (sarray) != 1) - runtime_error ("Array rank of SARRAY is not 1."); + if (GFC_DESCRIPTOR_RANK (values) != 1) + runtime_error ("Array rank of VALUES is not 1."); /* If the array is too small, abort. */ - if (GFC_DESCRIPTOR_EXTENT(sarray,0) < 13) - runtime_error ("Array size of SARRAY is too small."); + if (GFC_DESCRIPTOR_EXTENT(values,0) < 13) + runtime_error ("Array size of VALUES is too small."); /* Convert Fortran unit number to C file descriptor. */ val = unit_to_fd (*unit); @@ -378,57 +391,70 @@ fstat_i4_sub (GFC_INTEGER_4 *unit, gfc_array_i4 *sarray, GFC_INTEGER_4 *status) if (val == 0) { - index_type stride = GFC_DESCRIPTOR_STRIDE(sarray,0); + index_type stride = GFC_DESCRIPTOR_STRIDE(values,0); + + /* Return -1 for any value overflowing INT32_MAX. */ + for (int i = 0; i < 13; i++) + values->base_addr[i * stride] = -1; /* Device ID */ - sarray->base_addr[0 * stride] = sb.st_dev; + if (sb.st_dev <= INT32_MAX) + values->base_addr[0 * stride] = sb.st_dev; /* Inode number */ - sarray->base_addr[1 * stride] = sb.st_ino; + if (sb.st_ino <= INT32_MAX) + values->base_addr[1 * stride] = sb.st_ino; /* File mode */ - sarray->base_addr[2 * stride] = sb.st_mode; + if (sb.st_mode <= INT32_MAX) + values->base_addr[2 * stride] = sb.st_mode; /* Number of (hard) links */ - sarray->base_addr[3 * stride] = sb.st_nlink; + if (sb.st_nlink <= INT32_MAX) + values->base_addr[3 * stride] = sb.st_nlink; /* Owner's uid */ - sarray->base_addr[4 * stride] = sb.st_uid; + if (sb.st_uid <= INT32_MAX) + values->base_addr[4 * stride] = sb.st_uid; /* Owner's gid */ - sarray->base_addr[5 * stride] = sb.st_gid; + if (sb.st_gid <= INT32_MAX) + values->base_addr[5 * stride] = sb.st_gid; /* ID of device containing directory entry for file (0 if not available) */ #if HAVE_STRUCT_STAT_ST_RDEV - sarray->base_addr[6 * stride] = sb.st_rdev; + if (sb.st_rdev <= INT32_MAX) + values->base_addr[6 * stride] = sb.st_rdev; #else - sarray->base_addr[6 * stride] = 0; + values->base_addr[6 * stride] = 0; #endif /* File size (bytes) */ - sarray->base_addr[7 * stride] = sb.st_size; + if (sb.st_size <= INT32_MAX) + values->base_addr[7 * stride] = sb.st_size; /* Last access time */ - sarray->base_addr[8 * stride] = sb.st_atime; + if (sb.st_atime <= INT32_MAX) + values->base_addr[8 * stride] = sb.st_atime; /* Last modification time */ - sarray->base_addr[9 * stride] = sb.st_mtime; + if (sb.st_mtime <= INT32_MAX) + values->base_addr[9 * stride] = sb.st_mtime; /* Last file status change time */ - sarray->base_addr[10 * stride] = sb.st_ctime; + if (sb.st_ctime <= INT32_MAX) + values->base_addr[10 * stride] = sb.st_ctime; /* Preferred I/O block size (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLKSIZE - sarray->base_addr[11 * stride] = sb.st_blksize; -#else - sarray->base_addr[11 * stride] = -1; + if (sb.st_blksize <= INT32_MAX) + values->base_addr[11 * stride] = sb.st_blksize; #endif /* Number of blocks allocated (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLOCKS - sarray->base_addr[12 * stride] = sb.st_blocks; -#else - sarray->base_addr[12 * stride] = -1; + if (sb.st_blocks <= INT32_MAX) + values->base_addr[12 * stride] = sb.st_blocks; #endif } @@ -441,18 +467,18 @@ extern void fstat_i8_sub (GFC_INTEGER_8 *, gfc_array_i8 *, GFC_INTEGER_8 *); iexport_proto(fstat_i8_sub); void -fstat_i8_sub (GFC_INTEGER_8 *unit, gfc_array_i8 *sarray, GFC_INTEGER_8 *status) +fstat_i8_sub (GFC_INTEGER_8 *unit, gfc_array_i8 *values, GFC_INTEGER_8 *status) { int val; struct stat sb; /* If the rank of the array is not 1, abort. */ - if (GFC_DESCRIPTOR_RANK (sarray) != 1) - runtime_error ("Array rank of SARRAY is not 1."); + if (GFC_DESCRIPTOR_RANK (values) != 1) + runtime_error ("Array rank of VALUES is not 1."); /* If the array is too small, abort. */ - if (GFC_DESCRIPTOR_EXTENT(sarray,0) < 13) - runtime_error ("Array size of SARRAY is too small."); + if (GFC_DESCRIPTOR_EXTENT(values,0) < 13) + runtime_error ("Array size of VALUES is too small."); /* Convert Fortran unit number to C file descriptor. */ val = unit_to_fd ((int) *unit); @@ -461,57 +487,57 @@ fstat_i8_sub (GFC_INTEGER_8 *unit, gfc_array_i8 *sarray, GFC_INTEGER_8 *status) if (val == 0) { - index_type stride = GFC_DESCRIPTOR_STRIDE(sarray,0); + index_type stride = GFC_DESCRIPTOR_STRIDE(values,0); /* Device ID */ - sarray->base_addr[0] = sb.st_dev; + values->base_addr[0] = sb.st_dev; /* Inode number */ - sarray->base_addr[stride] = sb.st_ino; + values->base_addr[stride] = sb.st_ino; /* File mode */ - sarray->base_addr[2 * stride] = sb.st_mode; + values->base_addr[2 * stride] = sb.st_mode; /* Number of (hard) links */ - sarray->base_addr[3 * stride] = sb.st_nlink; + values->base_addr[3 * stride] = sb.st_nlink; /* Owner's uid */ - sarray->base_addr[4 * stride] = sb.st_uid; + values->base_addr[4 * stride] = sb.st_uid; /* Owner's gid */ - sarray->base_addr[5 * stride] = sb.st_gid; + values->base_addr[5 * stride] = sb.st_gid; /* ID of device containing directory entry for file (0 if not available) */ #if HAVE_STRUCT_STAT_ST_RDEV - sarray->base_addr[6 * stride] = sb.st_rdev; + values->base_addr[6 * stride] = sb.st_rdev; #else - sarray->base_addr[6 * stride] = 0; + values->base_addr[6 * stride] = 0; #endif /* File size (bytes) */ - sarray->base_addr[7 * stride] = sb.st_size; + values->base_addr[7 * stride] = sb.st_size; /* Last access time */ - sarray->base_addr[8 * stride] = sb.st_atime; + values->base_addr[8 * stride] = sb.st_atime; /* Last modification time */ - sarray->base_addr[9 * stride] = sb.st_mtime; + values->base_addr[9 * stride] = sb.st_mtime; /* Last file status change time */ - sarray->base_addr[10 * stride] = sb.st_ctime; + values->base_addr[10 * stride] = sb.st_ctime; /* Preferred I/O block size (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLKSIZE - sarray->base_addr[11 * stride] = sb.st_blksize; + values->base_addr[11 * stride] = sb.st_blksize; #else - sarray->base_addr[11 * stride] = -1; + values->base_addr[11 * stride] = -1; #endif /* Number of blocks allocated (-1 if not available) */ #if HAVE_STRUCT_STAT_ST_BLOCKS - sarray->base_addr[12 * stride] = sb.st_blocks; + values->base_addr[12 * stride] = sb.st_blocks; #else - sarray->base_addr[12 * stride] = -1; + values->base_addr[12 * stride] = -1; #endif } @@ -524,10 +550,10 @@ extern GFC_INTEGER_4 fstat_i4 (GFC_INTEGER_4 *, gfc_array_i4 *); export_proto(fstat_i4); GFC_INTEGER_4 -fstat_i4 (GFC_INTEGER_4 *unit, gfc_array_i4 *sarray) +fstat_i4 (GFC_INTEGER_4 *unit, gfc_array_i4 *values) { GFC_INTEGER_4 val; - fstat_i4_sub (unit, sarray, &val); + fstat_i4_sub (unit, values, &val); return val; } @@ -535,10 +561,10 @@ extern GFC_INTEGER_8 fstat_i8 (GFC_INTEGER_8 *, gfc_array_i8 *); export_proto(fstat_i8); GFC_INTEGER_8 -fstat_i8 (GFC_INTEGER_8 *unit, gfc_array_i8 *sarray) +fstat_i8 (GFC_INTEGER_8 *unit, gfc_array_i8 *values) { GFC_INTEGER_8 val; - fstat_i8_sub (unit, sarray, &val); + fstat_i8_sub (unit, values, &val); return val; } |