0ac7425470
2017-12-03 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/36313 * check.c (gfc_check_minval_maxval): Use int_orLreal_or_char_check_f2003 for array argument. * iresolve.c (gfc_resolve_maxval): Insert number in function name for character arguments. (gfc_resolve_minval): Likewise. * trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Fix comment. (gfc_conv_intrinsic_minmaxval): Resort arguments and call library function if dealing with a character function. 2017-12-03 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/36313 * Makefile.am: Add new files for character-valued maxval and minval. * Makefile.in: Regenerated. * gfortran.map: Add new functions. * m4/iforeach-s2.m4: New file. * m4/ifunction-s2.m4: New file. * m4/iparm.m4: Add intitval for minval and maxval. * m4/maxval0s.m4: New file. * m4/maxval1s.m4: New file. * m4/minval0s.m4: New file. * m4/minval1s.m4: New file. * generated/maxval0_s1.c: New file. * generated/maxval0_s4.c: New file. * generated/maxval1_s1.c: New file. * generated/maxval1_s4.c: New file. * generated/minval0_s1.c: New file. * generated/minval0_s4.c: New file. * generated/minval1_s1.c: New file. * generated/minval1_s4.c: New file. 2017-12-03 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/36313 * gfortran.dg/maxval_char_1.f90: New test. * gfortran.dg/maxval_char_2.f90: New test. * gfortran.dg/maxval_char_3.f90: New test. * gfortran.dg/maxval_char_4.f90: New test. * gfortran.dg/minval_char_1.f90: New test. * gfortran.dg/minval_char_2.f90: New test. * gfortran.dg/minval_char_3.f90: New test. * gfortran.dg/minval_char_4.f90: New test. From-SVN: r255367
223 lines
5.5 KiB
Plaintext
223 lines
5.5 KiB
Plaintext
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 Runtime Library (libgfortran)
|
|
dnl Distributed under the GNU GPL with exception. See COPYING for details.
|
|
define(START_FOREACH_FUNCTION,
|
|
`static inline int
|
|
compare_fcn (const atype_name *a, const atype_name *b, gfc_charlen_type n)
|
|
{
|
|
if (sizeof ('atype_name`) == 1)
|
|
return memcmp (a, b, n);
|
|
else
|
|
return memcmp_char4 (a, b, n);
|
|
|
|
}
|
|
|
|
#define INITVAL 'initval`
|
|
|
|
extern void 'name`'rtype_qual`_'atype_code (atype_name * restrict,
|
|
gfc_charlen_type,
|
|
atype * const restrict array, gfc_charlen_type);
|
|
export_proto(name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
name`'rtype_qual`_'atype_code` ('atype_name` * restrict ret,
|
|
gfc_charlen_type xlen,
|
|
'atype` * const restrict array, gfc_charlen_type len)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
const 'atype_name` *base;
|
|
index_type rank;
|
|
index_type n;
|
|
|
|
rank = GFC_DESCRIPTOR_RANK (array);
|
|
if (rank <= 0)
|
|
runtime_error ("Rank of array needs to be > 0");
|
|
|
|
assert (xlen == len);
|
|
|
|
/* Initialize return value. */
|
|
memset (ret, INITVAL, sizeof(*ret) * len);
|
|
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n) * len;
|
|
extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
|
|
count[n] = 0;
|
|
if (extent[n] <= 0)
|
|
return;
|
|
}
|
|
|
|
base = array->base_addr;
|
|
|
|
{
|
|
')dnl
|
|
define(START_FOREACH_BLOCK,
|
|
` while (base)
|
|
{
|
|
do
|
|
{
|
|
/* Implementation start. */
|
|
')dnl
|
|
define(FINISH_FOREACH_FUNCTION,
|
|
` /* Implementation end. */
|
|
/* Advance to the next element. */
|
|
base += sstride[0];
|
|
}
|
|
while (++count[0] != extent[0]);
|
|
n = 0;
|
|
do
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
base -= sstride[n] * extent[n];
|
|
n++;
|
|
if (n >= rank)
|
|
{
|
|
/* Break out of the loop. */
|
|
base = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
base += sstride[n];
|
|
}
|
|
}
|
|
while (count[n] == extent[n]);
|
|
}
|
|
memcpy (ret, retval, len * sizeof (*ret));
|
|
}
|
|
}')dnl
|
|
define(START_MASKED_FOREACH_FUNCTION,
|
|
`
|
|
extern void `m'name`'rtype_qual`_'atype_code (atype_name * restrict,
|
|
gfc_charlen_type, atype * const restrict array,
|
|
gfc_array_l1 * const restrict mask, gfc_charlen_type len);
|
|
export_proto(`m'name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
`m'name`'rtype_qual`_'atype_code (atype_name * const restrict ret,
|
|
gfc_charlen_type xlen, atype * const restrict array,
|
|
gfc_array_l1 * const restrict mask, gfc_charlen_type len)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
index_type mstride[GFC_MAX_DIMENSIONS];
|
|
const atype_name *base;
|
|
GFC_LOGICAL_1 *mbase;
|
|
int rank;
|
|
index_type n;
|
|
int mask_kind;
|
|
|
|
rank = GFC_DESCRIPTOR_RANK (array);
|
|
if (rank <= 0)
|
|
runtime_error ("Rank of array needs to be > 0");
|
|
|
|
assert (xlen == len);
|
|
|
|
/* Initialize return value. */
|
|
memset (ret, INITVAL, sizeof(*ret) * len);
|
|
|
|
mask_kind = GFC_DESCRIPTOR_SIZE (mask);
|
|
|
|
mbase = mask->base_addr;
|
|
|
|
if (mask_kind == 1 || mask_kind == 2 || mask_kind == 4 || mask_kind == 8
|
|
#ifdef HAVE_GFC_LOGICAL_16
|
|
|| mask_kind == 16
|
|
#endif
|
|
)
|
|
mbase = GFOR_POINTER_TO_L1 (mbase, mask_kind);
|
|
else
|
|
runtime_error ("Funny sized logical array");
|
|
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n) * len;
|
|
mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
|
|
extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
|
|
count[n] = 0;
|
|
if (extent[n] <= 0)
|
|
return;
|
|
}
|
|
|
|
base = array->base_addr;
|
|
{
|
|
')dnl
|
|
define(START_MASKED_FOREACH_BLOCK, `START_FOREACH_BLOCK')dnl
|
|
define(FINISH_MASKED_FOREACH_FUNCTION,
|
|
` /* Implementation end. */
|
|
/* Advance to the next element. */
|
|
base += sstride[0];
|
|
mbase += mstride[0];
|
|
}
|
|
while (++count[0] != extent[0]);
|
|
n = 0;
|
|
do
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
base -= sstride[n] * extent[n];
|
|
mbase -= mstride[n] * extent[n];
|
|
n++;
|
|
if (n >= rank)
|
|
{
|
|
/* Break out of the loop. */
|
|
base = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
base += sstride[n];
|
|
mbase += mstride[n];
|
|
}
|
|
}
|
|
while (count[n] == extent[n]);
|
|
}
|
|
memcpy (ret, retval, len * sizeof (*ret));
|
|
}
|
|
}')dnl
|
|
define(FOREACH_FUNCTION,
|
|
`START_FOREACH_FUNCTION
|
|
$1
|
|
START_FOREACH_BLOCK
|
|
$2
|
|
FINISH_FOREACH_FUNCTION')dnl
|
|
define(MASKED_FOREACH_FUNCTION,
|
|
`START_MASKED_FOREACH_FUNCTION
|
|
$1
|
|
START_MASKED_FOREACH_BLOCK
|
|
$2
|
|
FINISH_MASKED_FOREACH_FUNCTION')dnl
|
|
define(SCALAR_FOREACH_FUNCTION,
|
|
`
|
|
extern void `s'name`'rtype_qual`_'atype_code (atype_name * restrict,
|
|
gfc_charlen_type,
|
|
atype * const restrict array, GFC_LOGICAL_4 *, gfc_charlen_type);
|
|
export_proto(`s'name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
`s'name`'rtype_qual`_'atype_code (atype_name * restrict ret,
|
|
gfc_charlen_type xlen, atype * const restrict array,
|
|
GFC_LOGICAL_4 *mask, gfc_charlen_type len)
|
|
|
|
{
|
|
if (*mask)
|
|
{
|
|
name`'rtype_qual`_'atype_code (ret, xlen, array, len);
|
|
return;
|
|
}
|
|
memset (ret, INITVAL, sizeof (*ret) * len);
|
|
}')dnl
|