2004-05-13 08:41:07 +02:00
|
|
|
/* Generic implementation of the CSHIFT intrinsic
|
2006-10-19 23:48:50 +02:00
|
|
|
Copyright 2003, 2005, 2006 Free Software Foundation, Inc.
|
2004-05-13 08:41:07 +02:00
|
|
|
Contributed by Feng Wang <wf_cs@yahoo.com>
|
|
|
|
|
|
|
|
This file is part of the GNU Fortran 95 runtime library (libgfortran).
|
|
|
|
|
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
2005-01-12 22:27:33 +01:00
|
|
|
modify it under the terms of the GNU General Public
|
2004-05-13 08:41:07 +02:00
|
|
|
License as published by the Free Software Foundation; either
|
2005-01-12 22:27:33 +01:00
|
|
|
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,
|
2004-05-13 08:41:07 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2005-01-12 22:27:33 +01:00
|
|
|
GNU General Public License for more details.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2005-01-12 22:27:33 +01:00
|
|
|
You should have received a copy of the GNU General Public
|
|
|
|
License along with libgfortran; see the file COPYING. If not,
|
2005-08-17 04:49:08 +02:00
|
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "libgfortran.h"
|
|
|
|
|
2004-09-03 21:03:43 +02:00
|
|
|
|
|
|
|
/* "Templatized" helper function for the inner shift loop. */
|
|
|
|
|
|
|
|
#define DEF_COPY_LOOP(NAME, TYPE) \
|
|
|
|
static inline void \
|
|
|
|
copy_loop_##NAME (void *xdest, const void *xsrc, \
|
|
|
|
size_t roff, size_t soff, \
|
|
|
|
index_type len, index_type shift) \
|
|
|
|
{ \
|
|
|
|
TYPE *dest = xdest; \
|
|
|
|
const TYPE *src; \
|
|
|
|
index_type i; \
|
|
|
|
\
|
|
|
|
roff /= sizeof (TYPE); \
|
|
|
|
soff /= sizeof (TYPE); \
|
|
|
|
\
|
|
|
|
src = xsrc; \
|
|
|
|
src += shift * soff; \
|
|
|
|
for (i = 0; i < len - shift; ++i) \
|
|
|
|
{ \
|
|
|
|
*dest = *src; \
|
|
|
|
dest += roff; \
|
|
|
|
src += soff; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
src = xsrc; \
|
|
|
|
for (i = 0; i < shift; ++i) \
|
|
|
|
{ \
|
|
|
|
*dest = *src; \
|
|
|
|
dest += roff; \
|
|
|
|
src += soff; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_COPY_LOOP(int, int)
|
|
|
|
DEF_COPY_LOOP(long, long)
|
|
|
|
DEF_COPY_LOOP(double, double)
|
|
|
|
DEF_COPY_LOOP(ldouble, long double)
|
2005-01-23 18:01:00 +01:00
|
|
|
DEF_COPY_LOOP(cfloat, _Complex float)
|
|
|
|
DEF_COPY_LOOP(cdouble, _Complex double)
|
2004-09-03 21:03:43 +02:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
static void
|
iresolve.c (gfc_resolve_all, [...]): Use PREFIX.
gcc/fortran/
* iresolve.c (gfc_resolve_all, gfc_resolve_any, gfc_resolve_count,
gfc_resolve_cshift, gfc_resolve_dot_product, gfc_resolve_eoshift,
gfc_resolve_matmul, gfc_resolve_maxloc, gfc_resolve_maxval,
gfc_resolve_minloc, gfc_resolve_minval, gfc_resolve_pack,
gfc_resolve_product, gfc_resolve_reshape, gfc_resolve_shape,
gfc_resolve_spread, gfc_resolve_sum, gfc_resolve_transpose,
gfc_resolve_unpack: Use PREFIX.
libgfortran/
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/reshape_generic.c,
intrinsics/spread_generic.c, intrinsics/transpose_generic.c,
intrinsics/unpack_generic.c, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/iforeach.m4, m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4,
m4/reshape.m4, m4/shape.m4, m4/transpose.m4: Use standard prefix
instead of "__".
* generated/*: Rebuild.
From-SVN: r92075
2004-12-13 03:47:58 +01:00
|
|
|
cshift0 (gfc_array_char * ret, const gfc_array_char * array,
|
re PR fortran/19269 (transpose(reshape(...)) of character array segfaults.)
gcc/fortran/
PR target/19269
* iresolve.c (gfc_resolve_cshift, gfc_resolve_eoshift)
(gfc_resolve_pack, gfc_resolve_reshape, gfc_resolve_spread)
(gfc_resolve_transpose, gfc_resolve_unpack): Add "_char" to the name
for character-based operations.
(gfc_resolve_pack): Remove ATTRIBUTE_UNUSED from array argument.
(gfc_resolve_unpack): Copy the whole typespec from the vector.
* trans-array.c (gfc_conv_expr_descriptor): In the EXPR_FUNCTION
case, get the string length from the scalarization state.
libgfortran/
PR target/19269
* intrinsics/cshift0.c (cshift0): Add an extra size argument.
(cshift0_1, cshift0_2, cshift0_4, cshift0_8): Replace explicit
implementations with...
(DEFINE_CSHIFT): ...this new macro. Define character versions too.
* intrinsics/eoshift0.c (zeros): Delete.
(eoshift0): Add extra size and filler arguments. Use memset if no
bound is provided.
(eoshift0_1, eoshift0_2, eoshift0_4, eoshift0_8): Replace explicit
implementations with...
(DEFINE_EOSHIFT): ...this new macro. Define character versions too.
* intrinsics/eoshift2.c (zeros): Delete.
(eoshift2): Add extra size and filler arguments. Use memset if no
bound is provided.
(eoshift2_1, eoshift2_2, eoshift2_4, eoshift2_8): Replace explicit
implementations with...
(DEFINE_EOSHIFT): ...this new macro. Define character versions too.
* intrinsics/pack.c (pack_internal): New static function, reusing
the contents of pack and adding an extra size argument. Change
"mptr" rather than "m" when calculating the array size.
(pack): Redefine as a forwarder to pack_internal.
(pack_s_internal): New static function, reusing the contents of
pack_s and adding an extra size argument.
(pack_s): Redefine as a forwarder to pack_s_internal.
(pack_char, pack_s_char): New functions.
* intrinsics/reshape.c (reshape_internal): New static function,
reusing the contents of reshape and adding an extra size argument.
(reshape): Redefine as a forwarder to reshape_internal.
(reshape_char): New function.
* intrinsics/spread.c (spread_internal): New static function,
reusing the contents of spread and adding an extra size argument.
(spread): Redefine as a forwarder to spread_internal.
(spread_char): New function.
* intrinsics/transpose.c (transpose_internal): New static function,
reusing the contents of transpose and adding an extra size argument.
(transpose): Redefine as a forwarder to transpose_internal.
(transpose_char): New function.
* intrinsics/unpack.c (unpack_internal): New static function, reusing
the contents of unpack1 and adding extra size and fsize arguments.
(unpack1): Redefine as a forwarder to unpack_internal.
(unpack0): Call unpack_internal instead of unpack1.
(unpack1_char, unpack0_char): New functions.
* m4/cshift1.m4 (cshift1): New static function, reusing the contents
of cshift1_<kind> and adding an extra size argument.
(cshift1_<kind>): Redefine as a forwarder to cshift1.
(cshift1_<kind>_char): New function.
* m4/eoshift1.m4 (zeros): Delete.
(eoshift1): New static function, reusing the contents of
eoshift1_<kind> and adding extra size and filler arguments.
Fix calculation of hstride. Use memset if no bound is provided.
(eoshift1_<kind>): Redefine as a forwarder to eoshift1.
(eoshift1_<kind>_char): New function.
* m4/eoshift3.m4 (zeros): Delete.
(eoshift3): New static function, reusing the contents of
eoshift3_<kind> and adding extra size and filler arguments.
Use memset if no bound is provided.
(eoshift3_<kind>): Redefine as a forwarder to eoshift3.
(eoshift3_<kind>_char): New function.
* generated/cshift1_4.c, generated/cshift1_8.c,
* generated/eoshift1_4.c, generated/eoshift1_8.c,
* generated/eoshift3_4.c, generated/eoshift3_8.c: Regenerate.
From-SVN: r104217
2005-09-13 09:15:01 +02:00
|
|
|
ssize_t shift, int which, index_type size)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
|
|
|
/* r.* indicates the return array. */
|
2005-05-04 23:38:23 +02:00
|
|
|
index_type rstride[GFC_MAX_DIMENSIONS];
|
2004-05-13 08:41:07 +02:00
|
|
|
index_type rstride0;
|
|
|
|
index_type roffset;
|
|
|
|
char *rptr;
|
2004-09-03 21:03:43 +02:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
/* s.* indicates the source array. */
|
2005-05-04 23:38:23 +02:00
|
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
2004-05-13 08:41:07 +02:00
|
|
|
index_type sstride0;
|
|
|
|
index_type soffset;
|
|
|
|
const char *sptr;
|
|
|
|
|
2005-05-04 23:38:23 +02:00
|
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
2004-05-13 08:41:07 +02:00
|
|
|
index_type dim;
|
|
|
|
index_type len;
|
|
|
|
index_type n;
|
2005-01-23 18:01:00 +01:00
|
|
|
int whichloop;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
if (which < 1 || which > GFC_DESCRIPTOR_RANK (array))
|
|
|
|
runtime_error ("Argument 'DIM' is out of range in call to 'CSHIFT'");
|
|
|
|
|
|
|
|
which = which - 1;
|
|
|
|
|
|
|
|
extent[0] = 1;
|
|
|
|
count[0] = 0;
|
|
|
|
n = 0;
|
|
|
|
|
2005-01-23 18:01:00 +01:00
|
|
|
/* The values assigned here must match the cases in the inner loop. */
|
|
|
|
whichloop = 0;
|
|
|
|
switch (GFC_DESCRIPTOR_TYPE (array))
|
|
|
|
{
|
|
|
|
case GFC_DTYPE_LOGICAL:
|
|
|
|
case GFC_DTYPE_INTEGER:
|
|
|
|
case GFC_DTYPE_REAL:
|
|
|
|
if (size == sizeof (int))
|
|
|
|
whichloop = 1;
|
|
|
|
else if (size == sizeof (long))
|
|
|
|
whichloop = 2;
|
|
|
|
else if (size == sizeof (double))
|
|
|
|
whichloop = 3;
|
|
|
|
else if (size == sizeof (long double))
|
|
|
|
whichloop = 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GFC_DTYPE_COMPLEX:
|
|
|
|
if (size == sizeof (_Complex float))
|
|
|
|
whichloop = 5;
|
|
|
|
else if (size == sizeof (_Complex double))
|
|
|
|
whichloop = 6;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-09-03 21:03:43 +02:00
|
|
|
/* Initialized for avoiding compiler warnings. */
|
2004-05-13 08:41:07 +02:00
|
|
|
roffset = size;
|
|
|
|
soffset = size;
|
|
|
|
len = 0;
|
|
|
|
|
2004-08-04 16:30:46 +02:00
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
int i;
|
2006-10-19 23:48:50 +02:00
|
|
|
index_type arraysize = size0 ((array_t *)array);
|
2004-08-04 16:30:46 +02:00
|
|
|
|
libgfortran.h (GFC_ARRAY_DESCRIPTOR): Replace 'type *base' by 'size_t offset'.
* libgfortran.h (GFC_ARRAY_DESCRIPTOR): Replace 'type *base' by
'size_t offset'.
* intrinsics/cshift0.c, intrinsics/eoshift0.c,
intrinsics/eoshift2.c,intrinsics/pack_generic.c,
intrinsics/reshape_generic.c, intrinsics/spread_generic.c,
intrinsics/transpose_generic.c, intrinsics/unpack_generic,
m4/cshift1.m4, m4/eoshift1.m4, m4/eoshift3.m4, m4/iforeach.m4,
m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/reshape.m4,
m4,transpose.m4: Set renamed field 'offset' to zero instead of
'base'.
* generated/all_l4.c, generated/all_l8.c,
generated/any_l4.c, generated/any_l8.c, generated/count_4_l4.c,
generated/count_4_l8.c, generated/count_8_l4.c,
generated/count_8_l8.c, generated/chift1_4.c,
generated/cshift1_8.c, generated/eoshift1_4.c,
generated/eoshift1_8.c, generated/eoshift3_4.c,
generated/eoshift3_8.c, generated/matmul_c4.c,
generated/matmul_c8.c, generated/matmul_i4.c, matmul_i8.c,
generated/matmul_l4.c, generated/matmul_l8.c,
generated/matmul_r4.c, generated/matmul_r8.c,
generated/maxloc0_4_i4.c, generated/maxloc0_4_i8.c,
generated/maxloc0_4_r4.c, generated/maxloc0_4_r8.c,
generated/maxloc0_8_i4.c, generated/maxloc0_8_i8.c,
generated/maxloc0_8_r4.c, generated/maxloc0_8_r8.c,
generated/maxloc1_4_i4.c, generated/maxloc1_4_i8.c,
generated/maxloc1_4_r4.c, generated/maxloc1_4_r8.c,
generated/maxloc1_8_i4.c, generated/maxloc1_8_i8.c,
generated/maxloc1_8_r4.c, generated/maxloc1_8_r8.c,
generated/maxval_i4.c, generated/maxval_i8.c,
generated/maxval_r4.c, generated/maxval_r8.c,
generated/minloc0_4_i4.c, generated/minloc0_4_i8.c,
generated/minloc0_4_r4.c, generated/minloc0_4_r8.c,
generated/minloc0_8_i4.c, generated/minloc0_8_i8.c,
generated/minloc0_8_r4.c, generated/minloc0_8_r8.c,
generated/minloc1_4_i4.c, generated/minloc1_4_i8.c,
generated/minloc1_4_r4.c, generated/minloc1_4_r8.c,
generated/minloc1_8_i4.c, generated/minloc1_8_i8.c,
generated/minloc1_8_r4.c, generated/minloc1_8_r8.c,
generated/minval_i4.c, generated/minval_i8.c,
generated/minval_r4.c, generated/minval_r8.c,
generated/product_c4.c, generated/product_c8.c,
generated/product_i4.c, generated/product_i8.c,
generated/product_r4.c, generated/product_r8.c,
generated/reshape_c4.c, generated/reshape_c8.c,
generated/reshape_i4.c, generated/reshape_i8.c,
generated/sum_c4.c, generated/sum_c8.c, generated/sum_i4.c,
generated/sum_i8.c, generated/sum_r4.c, generated/sum_r8.c,
generated/transpose_c4.c, generated/transpose_c8.c,
generated/transpose_i4.c, generated/transpose_i8.c: Regenerate:
From-SVN: r101739
2005-07-08 00:08:06 +02:00
|
|
|
ret->offset = 0;
|
2004-08-04 16:30:46 +02:00
|
|
|
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
|
2006-10-19 23:48:50 +02:00
|
|
|
ret->dim[i].stride = (ret->dim[i-1].ubound + 1)
|
|
|
|
* ret->dim[i-1].stride;
|
2004-08-04 16:30:46 +02:00
|
|
|
}
|
2006-10-19 23:48:50 +02:00
|
|
|
|
|
|
|
if (arraysize > 0)
|
|
|
|
ret->data = internal_malloc_size (size * arraysize);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret->data = internal_malloc_size (1);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-04 16:30:46 +02:00
|
|
|
}
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
for (dim = 0; dim < GFC_DESCRIPTOR_RANK (array); dim++)
|
|
|
|
{
|
|
|
|
if (dim == which)
|
|
|
|
{
|
|
|
|
roffset = ret->dim[dim].stride * size;
|
|
|
|
if (roffset == 0)
|
|
|
|
roffset = size;
|
|
|
|
soffset = array->dim[dim].stride * size;
|
|
|
|
if (soffset == 0)
|
|
|
|
soffset = size;
|
|
|
|
len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n] = 0;
|
|
|
|
extent[n] = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
|
|
|
|
rstride[n] = ret->dim[dim].stride * size;
|
|
|
|
sstride[n] = array->dim[dim].stride * size;
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sstride[0] == 0)
|
|
|
|
sstride[0] = size;
|
|
|
|
if (rstride[0] == 0)
|
|
|
|
rstride[0] = size;
|
|
|
|
|
|
|
|
dim = GFC_DESCRIPTOR_RANK (array);
|
|
|
|
rstride0 = rstride[0];
|
|
|
|
sstride0 = sstride[0];
|
|
|
|
rptr = ret->data;
|
|
|
|
sptr = array->data;
|
|
|
|
|
2004-09-03 21:03:43 +02:00
|
|
|
shift = shift % (ssize_t)len;
|
2004-05-13 08:41:07 +02:00
|
|
|
if (shift < 0)
|
|
|
|
shift += len;
|
|
|
|
|
|
|
|
while (rptr)
|
|
|
|
{
|
|
|
|
/* Do the shift for this dimension. */
|
2004-09-03 21:03:43 +02:00
|
|
|
|
|
|
|
/* If elements are contiguous, perform the operation
|
|
|
|
in two block moves. */
|
|
|
|
if (soffset == size && roffset == size)
|
|
|
|
{
|
|
|
|
size_t len1 = shift * size;
|
|
|
|
size_t len2 = (len - shift) * size;
|
|
|
|
memcpy (rptr, sptr + len1, len2);
|
|
|
|
memcpy (rptr + len2, sptr, len1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Otherwise, we'll have to perform the copy one element at
|
|
|
|
a time. We can speed this up a tad for common cases of
|
|
|
|
fundamental types. */
|
2005-01-23 18:01:00 +01:00
|
|
|
switch (whichloop)
|
2004-09-03 21:03:43 +02:00
|
|
|
{
|
2005-01-23 18:01:00 +01:00
|
|
|
case 0:
|
|
|
|
{
|
|
|
|
char *dest = rptr;
|
|
|
|
const char *src = &sptr[shift * soffset];
|
|
|
|
|
|
|
|
for (n = 0; n < len - shift; n++)
|
|
|
|
{
|
|
|
|
memcpy (dest, src, size);
|
|
|
|
dest += roffset;
|
|
|
|
src += soffset;
|
|
|
|
}
|
|
|
|
for (src = sptr, n = 0; n < shift; n++)
|
|
|
|
{
|
|
|
|
memcpy (dest, src, size);
|
|
|
|
dest += roffset;
|
|
|
|
src += soffset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
copy_loop_int (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
copy_loop_long (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
copy_loop_double (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
copy_loop_ldouble (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 5:
|
|
|
|
copy_loop_cfloat (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 6:
|
|
|
|
copy_loop_cdouble (rptr, sptr, roffset, soffset, len, shift);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
abort ();
|
2004-09-03 21:03:43 +02:00
|
|
|
}
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
/* Advance to the next section. */
|
|
|
|
rptr += rstride0;
|
|
|
|
sptr += sstride0;
|
|
|
|
count[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
|
2006-10-18 19:17:49 +02:00
|
|
|
frequently used path so probably not worth it. */
|
2004-05-13 08:41:07 +02:00
|
|
|
rptr -= rstride[n] * extent[n];
|
|
|
|
sptr -= sstride[n] * extent[n];
|
|
|
|
n++;
|
|
|
|
if (n >= dim - 1)
|
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
rptr = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n]++;
|
|
|
|
rptr += rstride[n];
|
|
|
|
sptr += sstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
re PR fortran/19269 (transpose(reshape(...)) of character array segfaults.)
gcc/fortran/
PR target/19269
* iresolve.c (gfc_resolve_cshift, gfc_resolve_eoshift)
(gfc_resolve_pack, gfc_resolve_reshape, gfc_resolve_spread)
(gfc_resolve_transpose, gfc_resolve_unpack): Add "_char" to the name
for character-based operations.
(gfc_resolve_pack): Remove ATTRIBUTE_UNUSED from array argument.
(gfc_resolve_unpack): Copy the whole typespec from the vector.
* trans-array.c (gfc_conv_expr_descriptor): In the EXPR_FUNCTION
case, get the string length from the scalarization state.
libgfortran/
PR target/19269
* intrinsics/cshift0.c (cshift0): Add an extra size argument.
(cshift0_1, cshift0_2, cshift0_4, cshift0_8): Replace explicit
implementations with...
(DEFINE_CSHIFT): ...this new macro. Define character versions too.
* intrinsics/eoshift0.c (zeros): Delete.
(eoshift0): Add extra size and filler arguments. Use memset if no
bound is provided.
(eoshift0_1, eoshift0_2, eoshift0_4, eoshift0_8): Replace explicit
implementations with...
(DEFINE_EOSHIFT): ...this new macro. Define character versions too.
* intrinsics/eoshift2.c (zeros): Delete.
(eoshift2): Add extra size and filler arguments. Use memset if no
bound is provided.
(eoshift2_1, eoshift2_2, eoshift2_4, eoshift2_8): Replace explicit
implementations with...
(DEFINE_EOSHIFT): ...this new macro. Define character versions too.
* intrinsics/pack.c (pack_internal): New static function, reusing
the contents of pack and adding an extra size argument. Change
"mptr" rather than "m" when calculating the array size.
(pack): Redefine as a forwarder to pack_internal.
(pack_s_internal): New static function, reusing the contents of
pack_s and adding an extra size argument.
(pack_s): Redefine as a forwarder to pack_s_internal.
(pack_char, pack_s_char): New functions.
* intrinsics/reshape.c (reshape_internal): New static function,
reusing the contents of reshape and adding an extra size argument.
(reshape): Redefine as a forwarder to reshape_internal.
(reshape_char): New function.
* intrinsics/spread.c (spread_internal): New static function,
reusing the contents of spread and adding an extra size argument.
(spread): Redefine as a forwarder to spread_internal.
(spread_char): New function.
* intrinsics/transpose.c (transpose_internal): New static function,
reusing the contents of transpose and adding an extra size argument.
(transpose): Redefine as a forwarder to transpose_internal.
(transpose_char): New function.
* intrinsics/unpack.c (unpack_internal): New static function, reusing
the contents of unpack1 and adding extra size and fsize arguments.
(unpack1): Redefine as a forwarder to unpack_internal.
(unpack0): Call unpack_internal instead of unpack1.
(unpack1_char, unpack0_char): New functions.
* m4/cshift1.m4 (cshift1): New static function, reusing the contents
of cshift1_<kind> and adding an extra size argument.
(cshift1_<kind>): Redefine as a forwarder to cshift1.
(cshift1_<kind>_char): New function.
* m4/eoshift1.m4 (zeros): Delete.
(eoshift1): New static function, reusing the contents of
eoshift1_<kind> and adding extra size and filler arguments.
Fix calculation of hstride. Use memset if no bound is provided.
(eoshift1_<kind>): Redefine as a forwarder to eoshift1.
(eoshift1_<kind>_char): New function.
* m4/eoshift3.m4 (zeros): Delete.
(eoshift3): New static function, reusing the contents of
eoshift3_<kind> and adding extra size and filler arguments.
Use memset if no bound is provided.
(eoshift3_<kind>): Redefine as a forwarder to eoshift3.
(eoshift3_<kind>_char): New function.
* generated/cshift1_4.c, generated/cshift1_8.c,
* generated/eoshift1_4.c, generated/eoshift1_8.c,
* generated/eoshift3_4.c, generated/eoshift3_8.c: Regenerate.
From-SVN: r104217
2005-09-13 09:15:01 +02:00
|
|
|
#define DEFINE_CSHIFT(N) \
|
|
|
|
extern void cshift0_##N (gfc_array_char *, const gfc_array_char *, \
|
|
|
|
const GFC_INTEGER_##N *, const GFC_INTEGER_##N *); \
|
|
|
|
export_proto(cshift0_##N); \
|
|
|
|
\
|
|
|
|
void \
|
|
|
|
cshift0_##N (gfc_array_char *ret, const gfc_array_char *array, \
|
|
|
|
const GFC_INTEGER_##N *pshift, const GFC_INTEGER_##N *pdim) \
|
|
|
|
{ \
|
|
|
|
cshift0 (ret, array, *pshift, pdim ? *pdim : 1, \
|
|
|
|
GFC_DESCRIPTOR_SIZE (array)); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
extern void cshift0_##N##_char (gfc_array_char *, GFC_INTEGER_4, \
|
|
|
|
const gfc_array_char *, \
|
|
|
|
const GFC_INTEGER_##N *, \
|
|
|
|
const GFC_INTEGER_##N *, GFC_INTEGER_4); \
|
|
|
|
export_proto(cshift0_##N##_char); \
|
|
|
|
\
|
|
|
|
void \
|
|
|
|
cshift0_##N##_char (gfc_array_char *ret, \
|
|
|
|
GFC_INTEGER_4 ret_length __attribute__((unused)), \
|
|
|
|
const gfc_array_char *array, \
|
|
|
|
const GFC_INTEGER_##N *pshift, \
|
|
|
|
const GFC_INTEGER_##N *pdim, \
|
|
|
|
GFC_INTEGER_4 array_length) \
|
|
|
|
{ \
|
|
|
|
cshift0 (ret, array, *pshift, pdim ? *pdim : 1, array_length); \
|
|
|
|
}
|
|
|
|
|
|
|
|
DEFINE_CSHIFT (1);
|
|
|
|
DEFINE_CSHIFT (2);
|
|
|
|
DEFINE_CSHIFT (4);
|
|
|
|
DEFINE_CSHIFT (8);
|