90469382c0
2008-01-15 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/34671 * gfortran.am: Added _gfortran_all_l1, _gfortran_all_l2, _gfortran_any_l1, _gfortran_any_l2, -28,15 _gfortran_count_1_l, _gfortran_count_16_l, _gfortran_count_2_l, _gfortran_count_4_l and _gfortran_count_8_l Removed _gfortran_count_16_l16, _gfortran_count_16_l4, _gfortran_count_16_l8, _gfortran_count_4_l16, _gfortran_count_4_l4, _gfortran_count_4_l8, _gfortran_count_8_l16, _gfortran_count_8_l4 and _gfortran_count_8_l8. * Makefile.am: Added generated/any_l1.c and generated/any_l2.c to i_any_c. Added generated/all_l1. and generated/all_l2.c to i_all_c. Removed generated/count_4_l4.c, generated/count_8_l4.c, generated/count_16_l4.c, generated/count_4_l8.c, generated/count_8_l8.c, generated/count_16_l8.c, generated/count_4_l16.c, generated/count_8_l16.c, and generated/count_16_l16.c from i_count_c. Added count_1_l.c, count_2_l.c, count_4_l.c, count_8_l.c and count_16_l.c to i_count_c. I_M4_DEPS2 depends on ifunction_logical.m4, for any of the files generated from all.m4, any.m4 and count.m4. * Makefile.in: Regenerated. * m4/ifunction_logical.m4: New file. Use GFC_LOGICAL_1 pointer for access to source arrays. * m4/any.m4: Include ifunction_logical.m4 instead of ifunction.m4. Don't check atype_name. * m4/all.m4: Likewise. * m4/count.m4: Likewise. * generated/any_l1.c: New file. * generated/any_l2.c: New file. * generated/all_l1.c: New file. * generated/count_1_l.c: New file. * generated/count_2_l.c: New file. * generated/count_4_l.c: New file. * generated/count_8_l.c: New file. * generated/count_16_l.c: New file. * generated/any_l4.c: Regenerated. * generated/any_l8.c: Regenerated. * generated/any_l16.c: Regenerated. * generated/all_l4.c: Regenerated. * generated/all_l8.c: Regenerated. * generated/all_l16.c: Regenerated. * generated/count_4_l4.c: Removed. * generated/count_4_l8.c: Removed. * generated/count_4_l16.c: Removed. * generated/count_8_l4.c: Removed. * generated/count_8_l8.c: Removed. * generated/count_8_l16.c: Removed. * generated/count_16_l4.c: Removed. * generated/count_16_l8.c: Removed. * generated/count_16_l16.c: Removed. 2008-01-15 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/34671 * iresolve.c (gfc_resolve_all): Call resolve_mask_arg. (gfc_resolve_any): Likewise. (gfc_resolve_count): Likewise. Don't append kind of argument to function name. 2008-01-15 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/34671 * gfortran.dg/anyallcount_1.f90: New test. From-SVN: r131553
223 lines
5.8 KiB
C
223 lines
5.8 KiB
C
/* Implementation of the ANY intrinsic
|
|
Copyright 2002, 2007 Free Software Foundation, Inc.
|
|
Contributed by Paul Brook <paul@nowt.org>
|
|
|
|
This file is part of the GNU Fortran 95 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 2 of the License, or (at your option) any later version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combine
|
|
executable.)
|
|
|
|
Libgfortran is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public
|
|
License along with libgfortran; see the file COPYING. If not,
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "libgfortran.h"
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
|
|
#if defined (HAVE_GFC_LOGICAL_1)
|
|
|
|
|
|
extern void any_l1 (gfc_array_l1 * const restrict,
|
|
gfc_array_l1 * const restrict, const index_type * const restrict);
|
|
export_proto(any_l1);
|
|
|
|
void
|
|
any_l1 (gfc_array_l1 * const restrict retarray,
|
|
gfc_array_l1 * const restrict array,
|
|
const index_type * const restrict pdim)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
index_type dstride[GFC_MAX_DIMENSIONS];
|
|
const GFC_LOGICAL_1 * restrict base;
|
|
GFC_LOGICAL_1 * restrict dest;
|
|
index_type rank;
|
|
index_type n;
|
|
index_type len;
|
|
index_type delta;
|
|
index_type dim;
|
|
int src_kind;
|
|
|
|
/* Make dim zero based to avoid confusion. */
|
|
dim = (*pdim) - 1;
|
|
rank = GFC_DESCRIPTOR_RANK (array) - 1;
|
|
|
|
src_kind = GFC_DESCRIPTOR_SIZE (array);
|
|
|
|
len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
|
|
delta = array->dim[dim].stride * src_kind;
|
|
|
|
for (n = 0; n < dim; n++)
|
|
{
|
|
sstride[n] = array->dim[n].stride * src_kind;
|
|
extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
|
|
|
|
if (extent[n] < 0)
|
|
extent[n] = 0;
|
|
}
|
|
for (n = dim; n < rank; n++)
|
|
{
|
|
sstride[n] = array->dim[n + 1].stride * src_kind;
|
|
extent[n] =
|
|
array->dim[n + 1].ubound + 1 - array->dim[n + 1].lbound;
|
|
|
|
if (extent[n] < 0)
|
|
extent[n] = 0;
|
|
}
|
|
|
|
if (retarray->data == NULL)
|
|
{
|
|
size_t alloc_size;
|
|
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
retarray->dim[n].lbound = 0;
|
|
retarray->dim[n].ubound = extent[n]-1;
|
|
if (n == 0)
|
|
retarray->dim[n].stride = 1;
|
|
else
|
|
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
|
|
}
|
|
|
|
retarray->offset = 0;
|
|
retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
|
|
|
|
alloc_size = sizeof (GFC_LOGICAL_1) * retarray->dim[rank-1].stride
|
|
* extent[rank-1];
|
|
|
|
if (alloc_size == 0)
|
|
{
|
|
/* Make sure we have a zero-sized array. */
|
|
retarray->dim[0].lbound = 0;
|
|
retarray->dim[0].ubound = -1;
|
|
return;
|
|
}
|
|
else
|
|
retarray->data = internal_malloc_size (alloc_size);
|
|
}
|
|
else
|
|
{
|
|
if (rank != GFC_DESCRIPTOR_RANK (retarray))
|
|
runtime_error ("rank of return array incorrect in"
|
|
" ANY intrinsic: is %d, should be %d",
|
|
GFC_DESCRIPTOR_RANK (retarray), rank);
|
|
|
|
if (compile_options.bounds_check)
|
|
{
|
|
for (n=0; n < rank; n++)
|
|
{
|
|
index_type ret_extent;
|
|
|
|
ret_extent = retarray->dim[n].ubound + 1
|
|
- retarray->dim[n].lbound;
|
|
if (extent[n] != ret_extent)
|
|
runtime_error ("Incorrect extent in return value of"
|
|
" ANY intrinsic in dimension %d:"
|
|
" is %ld, should be %ld", n + 1,
|
|
(long int) ret_extent, (long int) extent[n]);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
count[n] = 0;
|
|
dstride[n] = retarray->dim[n].stride;
|
|
if (extent[n] <= 0)
|
|
len = 0;
|
|
}
|
|
|
|
base = array->data;
|
|
|
|
if (src_kind == 1 || src_kind == 2 || src_kind == 4 || src_kind == 8
|
|
#ifdef HAVE_GFC_LOGICAL_16
|
|
|| src_kind == 16
|
|
#endif
|
|
)
|
|
{
|
|
if (base)
|
|
base = GFOR_POINTER_TO_L1 (base, src_kind);
|
|
}
|
|
else
|
|
internal_error (NULL, "Funny sized logical array in ANY intrinsic");
|
|
|
|
dest = retarray->data;
|
|
|
|
while (base)
|
|
{
|
|
const GFC_LOGICAL_1 * restrict src;
|
|
GFC_LOGICAL_1 result;
|
|
src = base;
|
|
{
|
|
|
|
result = 0;
|
|
if (len <= 0)
|
|
*dest = 0;
|
|
else
|
|
{
|
|
for (n = 0; n < len; n++, src += delta)
|
|
{
|
|
|
|
/* Return true if any of the elements are set. */
|
|
if (*src)
|
|
{
|
|
result = 1;
|
|
break;
|
|
}
|
|
}
|
|
*dest = result;
|
|
}
|
|
}
|
|
/* Advance to the next element. */
|
|
count[0]++;
|
|
base += sstride[0];
|
|
dest += dstride[0];
|
|
n = 0;
|
|
while (count[n] == extent[n])
|
|
{
|
|
/* 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];
|
|
dest -= dstride[n] * extent[n];
|
|
n++;
|
|
if (n == rank)
|
|
{
|
|
/* Break out of the look. */
|
|
base = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
base += sstride[n];
|
|
dest += dstride[n];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|