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
|
|
|
/* Generic implementation of the SPREAD intrinsic
|
2006-06-06 10:10:09 +02:00
|
|
|
Copyright 2002, 2005, 2006 Free Software Foundation, Inc.
|
2004-05-13 08:41:07 +02:00
|
|
|
Contributed by Paul Brook <paul@nowt.org>
|
|
|
|
|
2005-01-12 22:27:33 +01:00
|
|
|
This file is part of the GNU Fortran 95 runtime library (libgfortran).
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2005-01-12 22:27:33 +01:00
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
|
|
|
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.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2005-01-12 22:27:33 +01:00
|
|
|
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.)
|
|
|
|
|
|
|
|
Ligbfortran 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"
|
|
|
|
|
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
|
|
|
static void
|
|
|
|
spread_internal (gfc_array_char *ret, const gfc_array_char *source,
|
|
|
|
const index_type *along, const index_type *pncopies,
|
|
|
|
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;
|
2005-05-15 17:50:09 +02:00
|
|
|
index_type rdelta = 0;
|
2005-04-15 22:06:17 +02:00
|
|
|
index_type rrank;
|
|
|
|
index_type rs;
|
2004-05-13 08:41:07 +02:00
|
|
|
char *rptr;
|
|
|
|
char *dest;
|
|
|
|
/* 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;
|
2005-04-15 22:06:17 +02:00
|
|
|
index_type srank;
|
2004-05-13 08:41:07 +02:00
|
|
|
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 n;
|
|
|
|
index_type dim;
|
|
|
|
index_type ncopies;
|
|
|
|
|
2005-04-15 22:06:17 +02:00
|
|
|
srank = GFC_DESCRIPTOR_RANK(source);
|
|
|
|
|
|
|
|
rrank = srank + 1;
|
|
|
|
if (rrank > GFC_MAX_DIMENSIONS)
|
|
|
|
runtime_error ("return rank too large in spread()");
|
|
|
|
|
|
|
|
if (*along > rrank)
|
|
|
|
runtime_error ("dim outside of rank in spread()");
|
|
|
|
|
|
|
|
ncopies = *pncopies;
|
|
|
|
|
|
|
|
if (ret->data == NULL)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
2005-04-15 22:06:17 +02:00
|
|
|
/* The front end has signalled that we need to populate the
|
|
|
|
return array descriptor. */
|
|
|
|
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rrank;
|
|
|
|
dim = 0;
|
|
|
|
rs = 1;
|
|
|
|
for (n = 0; n < rrank; n++)
|
|
|
|
{
|
|
|
|
ret->dim[n].stride = rs;
|
|
|
|
ret->dim[n].lbound = 0;
|
|
|
|
if (n == *along - 1)
|
|
|
|
{
|
|
|
|
ret->dim[n].ubound = ncopies - 1;
|
|
|
|
rdelta = rs * size;
|
|
|
|
rs *= ncopies;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[dim] = 0;
|
|
|
|
extent[dim] = source->dim[dim].ubound + 1
|
|
|
|
- source->dim[dim].lbound;
|
|
|
|
sstride[dim] = source->dim[dim].stride * size;
|
|
|
|
rstride[dim] = rs * size;
|
|
|
|
|
|
|
|
ret->dim[n].ubound = extent[dim]-1;
|
|
|
|
rs *= extent[dim];
|
|
|
|
dim++;
|
|
|
|
}
|
|
|
|
}
|
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;
|
2006-10-19 23:48:50 +02:00
|
|
|
if (rs > 0)
|
|
|
|
ret->data = internal_malloc_size (rs * size);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret->data = internal_malloc_size (1);
|
|
|
|
return;
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
}
|
2005-04-15 22:06:17 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
dim = 0;
|
|
|
|
if (GFC_DESCRIPTOR_RANK(ret) != rrank)
|
|
|
|
runtime_error ("rank mismatch in spread()");
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2005-04-15 22:06:17 +02:00
|
|
|
for (n = 0; n < rrank; n++)
|
|
|
|
{
|
|
|
|
if (n == *along - 1)
|
|
|
|
{
|
|
|
|
rdelta = ret->dim[n].stride * size;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[dim] = 0;
|
|
|
|
extent[dim] = source->dim[dim].ubound + 1
|
|
|
|
- source->dim[dim].lbound;
|
|
|
|
sstride[dim] = source->dim[dim].stride * size;
|
|
|
|
rstride[dim] = ret->dim[n].stride * size;
|
|
|
|
dim++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sstride[0] == 0)
|
|
|
|
sstride[0] = size;
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
sstride0 = sstride[0];
|
|
|
|
rstride0 = rstride[0];
|
|
|
|
rptr = ret->data;
|
|
|
|
sptr = source->data;
|
|
|
|
|
|
|
|
while (sptr)
|
|
|
|
{
|
|
|
|
/* Spread this element. */
|
|
|
|
dest = rptr;
|
|
|
|
for (n = 0; n < ncopies; n++)
|
|
|
|
{
|
|
|
|
memcpy (dest, sptr, size);
|
|
|
|
dest += rdelta;
|
|
|
|
}
|
|
|
|
/* Advance to the next element. */
|
|
|
|
sptr += sstride0;
|
|
|
|
rptr += rstride0;
|
|
|
|
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
|
|
|
|
frequently used path so probably not worth it. */
|
|
|
|
sptr -= sstride[n] * extent[n];
|
|
|
|
rptr -= rstride[n] * extent[n];
|
|
|
|
n++;
|
2005-04-15 22:06:17 +02:00
|
|
|
if (n >= srank)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
sptr = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n]++;
|
|
|
|
sptr += sstride[n];
|
|
|
|
rptr += rstride[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
|
|
|
|
2005-10-23 08:59:17 +02:00
|
|
|
/* This version of spread_internal treats the special case of a scalar
|
|
|
|
source. This is much simpler than the more general case above. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
spread_internal_scalar (gfc_array_char *ret, const char *source,
|
|
|
|
const index_type *along, const index_type *pncopies,
|
|
|
|
index_type size)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
int ncopies = *pncopies;
|
|
|
|
char * dest;
|
|
|
|
|
|
|
|
if (GFC_DESCRIPTOR_RANK (ret) != 1)
|
|
|
|
runtime_error ("incorrect destination rank in spread()");
|
|
|
|
|
|
|
|
if (*along > 1)
|
|
|
|
runtime_error ("dim outside of rank in spread()");
|
|
|
|
|
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
ret->data = internal_malloc_size (ncopies * size);
|
|
|
|
ret->offset = 0;
|
|
|
|
ret->dim[0].stride = 1;
|
|
|
|
ret->dim[0].lbound = 0;
|
|
|
|
ret->dim[0].ubound = ncopies - 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (ncopies - 1 > (ret->dim[0].ubound - ret->dim[0].lbound)
|
|
|
|
/ ret->dim[0].stride)
|
|
|
|
runtime_error ("dim too large in spread()");
|
|
|
|
}
|
|
|
|
|
|
|
|
for (n = 0; n < ncopies; n++)
|
|
|
|
{
|
|
|
|
dest = (char*)(ret->data + n*size*ret->dim[0].stride);
|
|
|
|
memcpy (dest , source, size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
extern void spread (gfc_array_char *, const gfc_array_char *,
|
|
|
|
const index_type *, const index_type *);
|
|
|
|
export_proto(spread);
|
|
|
|
|
|
|
|
void
|
|
|
|
spread (gfc_array_char *ret, const gfc_array_char *source,
|
|
|
|
const index_type *along, const index_type *pncopies)
|
|
|
|
{
|
|
|
|
spread_internal (ret, source, along, pncopies, GFC_DESCRIPTOR_SIZE (source));
|
|
|
|
}
|
|
|
|
|
|
|
|
extern void spread_char (gfc_array_char *, GFC_INTEGER_4,
|
|
|
|
const gfc_array_char *, const index_type *,
|
|
|
|
const index_type *, GFC_INTEGER_4);
|
|
|
|
export_proto(spread_char);
|
|
|
|
|
|
|
|
void
|
|
|
|
spread_char (gfc_array_char *ret,
|
|
|
|
GFC_INTEGER_4 ret_length __attribute__((unused)),
|
|
|
|
const gfc_array_char *source, const index_type *along,
|
|
|
|
const index_type *pncopies, GFC_INTEGER_4 source_length)
|
|
|
|
{
|
|
|
|
spread_internal (ret, source, along, pncopies, source_length);
|
|
|
|
}
|
2005-10-23 08:59:17 +02:00
|
|
|
|
|
|
|
/* The following are the prototypes for the versions of spread with a
|
|
|
|
scalar source. */
|
|
|
|
|
|
|
|
extern void spread_scalar (gfc_array_char *, const char *,
|
|
|
|
const index_type *, const index_type *);
|
|
|
|
export_proto(spread_scalar);
|
|
|
|
|
|
|
|
void
|
|
|
|
spread_scalar (gfc_array_char *ret, const char *source,
|
|
|
|
const index_type *along, const index_type *pncopies)
|
|
|
|
{
|
|
|
|
if (!ret->dtype)
|
|
|
|
runtime_error ("return array missing descriptor in spread()");
|
|
|
|
spread_internal_scalar (ret, source, along, pncopies, GFC_DESCRIPTOR_SIZE (ret));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
extern void spread_char_scalar (gfc_array_char *, GFC_INTEGER_4,
|
|
|
|
const char *, const index_type *,
|
|
|
|
const index_type *, GFC_INTEGER_4);
|
|
|
|
export_proto(spread_char_scalar);
|
|
|
|
|
|
|
|
void
|
|
|
|
spread_char_scalar (gfc_array_char *ret,
|
|
|
|
GFC_INTEGER_4 ret_length __attribute__((unused)),
|
|
|
|
const char *source, const index_type *along,
|
|
|
|
const index_type *pncopies, GFC_INTEGER_4 source_length)
|
|
|
|
{
|
|
|
|
if (!ret->dtype)
|
|
|
|
runtime_error ("return array missing descriptor in spread()");
|
|
|
|
spread_internal_scalar (ret, source, along, pncopies, source_length);
|
|
|
|
}
|
|
|
|
|