2005-05-18 20:24:32 +00:00
|
|
|
/* Implementation of the RESHAPE
|
2007-08-31 14:01:34 +00:00
|
|
|
Copyright 2002, 2006, 2007 Free Software Foundation, Inc.
|
2005-05-18 20:24:32 +00:00
|
|
|
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,
|
2005-08-17 02:49:08 +00:00
|
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2005-05-18 20:24:32 +00:00
|
|
|
|
2007-08-31 14:01:34 +00:00
|
|
|
#include "libgfortran.h"
|
2005-05-18 20:24:32 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <assert.h>
|
2007-08-31 14:01:34 +00:00
|
|
|
|
2005-05-18 20:24:32 +00:00
|
|
|
|
re PR libfortran/19308 (I/O library should support more real and integer kinds)
PR libfortran/19308
PR fortran/20120
PR libfortran/22437
* Makefile.am: Add generated files for large real and integers
kinds. Add a rule to create the kinds.inc c99_protos.inc files.
Use kinds.inc to preprocess Fortran generated files.
* libgfortran.h: Add macro definitions for GFC_INTEGER_16_HUGE,
GFC_REAL_10_HUGE and GFC_REAL_16_HUGE. Add types gfc_array_i16,
gfc_array_r10, gfc_array_r16, gfc_array_c10, gfc_array_c16,
gfc_array_l16.
* mk-kinds-h.sh: Define macros HAVE_GFC_LOGICAL_* and
HAVE_GFC_COMPLEX_* when these types are available.
* intrinsics/ishftc.c (ishftc16): New function for GFC_INTEGER_16.
* m4/all.m4, m4/any.m4, m4/count.m4, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/exponent.m4, m4/fraction.m4, m4/in_pack.m4, m4/in_unpack.m4,
m4/matmul.m4, m4/matmull.m4, m4/maxloc0.m4, m4/maxloc1.m4,
m4/maxval.m4, m4/minloc0.m4, m4/minloc1.m4, m4/minval.m4, m4/mtype.m4,
m4/nearest.m4, m4/pow.m4, m4/product.m4, m4/reshape.m4,
m4/set_exponent.m4, m4/shape.m4, m4/specific.m4, m4/specific2.m4,
m4/sum.m4, m4/transpose.m4: Protect generated functions with
appropriate "#if defined (HAVE_GFC_type_kind)" preprocessor directives.
* Makefile.in: Regenerate.
* all files in generated/: Regenerate.
* f95-lang.c (DO_DEFINE_MATH_BUILTIN): Add support for long
double builtin function.
(gfc_init_builtin_functions): Add mfunc_longdouble,
mfunc_clongdouble and func_clongdouble_longdouble trees. Build
them for round, trunc, cabs, copysign and pow functions.
* iresolve.c (gfc_resolve_reshape, gfc_resolve_transpose): Add
case for kind 10 and 16.
* trans-decl.c: Add trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
(gfc_build_intrinsic_function_decls): Build nodes for int16,
real10, real16, complex10 and complex16 types. Build all possible
combinations for function _gfortran_pow_?n_?n. Build function
calls cpowl10, cpowl16, ishftc16, exponent10 and exponent16.
* trans-expr.c (gfc_conv_power_op): Add case for integer(16),
real(10) and real(16).
* trans-intrinsic.c: Add suppport for long double builtin
functions in BUILT_IN_FUNCTION, LIBM_FUNCTION and LIBF_FUNCTION
macros.
(gfc_conv_intrinsic_aint): Add case for integer(16), real(10) and
real(16) kinds.
(gfc_build_intrinsic_lib_fndecls): Add support for real10_decl
and real16_decl in library functions.
(gfc_get_intrinsic_lib_fndecl): Add cases for real and complex
kinds 10 and 16.
(gfc_conv_intrinsic_exponent): Add cases for real(10) and real(16)
kinds.
(gfc_conv_intrinsic_sign): Likewise.
(gfc_conv_intrinsic_ishftc): Add case for integer(16) kind.
* trans-types.c (gfc_get_int_type, gfc_get_real_type,
gfc_get_complex_type, gfc_get_logical_type): Doesn't error out in
the case of kinds not available.
* trans.h: Declare trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
* gfortran.dg/large_real_kind_2.F90: New test.
* gfortran.dg/large_integer_kind_2.f90: New test.
From-SVN: r104889
2005-10-03 07:22:20 +00:00
|
|
|
#if defined (HAVE_GFC_COMPLEX_8)
|
|
|
|
|
2005-05-18 20:24:32 +00:00
|
|
|
typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
|
|
|
|
|
|
|
|
|
2005-11-27 21:03:33 +00:00
|
|
|
extern void reshape_c8 (gfc_array_c8 * const restrict,
|
|
|
|
gfc_array_c8 * const restrict,
|
|
|
|
shape_type * const restrict,
|
|
|
|
gfc_array_c8 * const restrict,
|
|
|
|
shape_type * const restrict);
|
2005-05-18 20:24:32 +00:00
|
|
|
export_proto(reshape_c8);
|
|
|
|
|
|
|
|
void
|
2005-11-27 21:03:33 +00:00
|
|
|
reshape_c8 (gfc_array_c8 * const restrict ret,
|
|
|
|
gfc_array_c8 * const restrict source,
|
|
|
|
shape_type * const restrict shape,
|
|
|
|
gfc_array_c8 * const restrict pad,
|
|
|
|
shape_type * const restrict order)
|
2005-05-18 20:24:32 +00:00
|
|
|
{
|
|
|
|
/* r.* indicates the return array. */
|
|
|
|
index_type rcount[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type rextent[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type rstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type rstride0;
|
|
|
|
index_type rdim;
|
|
|
|
index_type rsize;
|
|
|
|
index_type rs;
|
|
|
|
index_type rex;
|
|
|
|
GFC_COMPLEX_8 *rptr;
|
|
|
|
/* s.* indicates the source array. */
|
|
|
|
index_type scount[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type sextent[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type sstride0;
|
|
|
|
index_type sdim;
|
|
|
|
index_type ssize;
|
|
|
|
const GFC_COMPLEX_8 *sptr;
|
|
|
|
/* p.* indicates the pad array. */
|
|
|
|
index_type pcount[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type pextent[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type pstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type pdim;
|
|
|
|
index_type psize;
|
|
|
|
const GFC_COMPLEX_8 *pptr;
|
|
|
|
|
|
|
|
const GFC_COMPLEX_8 *src;
|
|
|
|
int n;
|
|
|
|
int dim;
|
2008-04-20 19:56:07 +00:00
|
|
|
int sempty, pempty, shape_empty;
|
|
|
|
index_type shape_data[GFC_MAX_DIMENSIONS];
|
|
|
|
|
|
|
|
rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
|
|
|
|
if (rdim != GFC_DESCRIPTOR_RANK(ret))
|
|
|
|
runtime_error("rank of return array incorrect in RESHAPE intrinsic");
|
|
|
|
|
|
|
|
shape_empty = 0;
|
|
|
|
|
|
|
|
for (n = 0; n < rdim; n++)
|
|
|
|
{
|
|
|
|
shape_data[n] = shape->data[n * shape->dim[0].stride];
|
|
|
|
if (shape_data[n] <= 0)
|
|
|
|
{
|
|
|
|
shape_data[n] = 0;
|
|
|
|
shape_empty = 1;
|
|
|
|
}
|
|
|
|
}
|
2005-05-18 20:24:32 +00:00
|
|
|
|
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
rs = 1;
|
2006-11-03 11:51:09 +00:00
|
|
|
for (n = 0; n < rdim; n++)
|
2005-05-18 20:24:32 +00:00
|
|
|
{
|
|
|
|
ret->dim[n].lbound = 0;
|
2008-04-20 19:56:07 +00:00
|
|
|
rex = shape_data[n];
|
2005-05-18 20:24:32 +00:00
|
|
|
ret->dim[n].ubound = rex - 1;
|
|
|
|
ret->dim[n].stride = rs;
|
|
|
|
rs *= rex;
|
|
|
|
}
|
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-07 22:08:06 +00:00
|
|
|
ret->offset = 0;
|
2005-05-18 20:24:32 +00:00
|
|
|
ret->data = internal_malloc_size ( rs * sizeof (GFC_COMPLEX_8));
|
|
|
|
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
|
|
|
|
}
|
2008-04-20 19:56:07 +00:00
|
|
|
|
|
|
|
if (shape_empty)
|
|
|
|
return;
|
2005-05-18 20:24:32 +00:00
|
|
|
|
2008-11-23 19:25:42 +00:00
|
|
|
if (pad)
|
|
|
|
{
|
|
|
|
pdim = GFC_DESCRIPTOR_RANK (pad);
|
|
|
|
psize = 1;
|
|
|
|
pempty = 0;
|
|
|
|
for (n = 0; n < pdim; n++)
|
|
|
|
{
|
|
|
|
pcount[n] = 0;
|
|
|
|
pstride[n] = pad->dim[n].stride;
|
|
|
|
pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound;
|
|
|
|
if (pextent[n] <= 0)
|
|
|
|
{
|
|
|
|
pempty = 1;
|
|
|
|
pextent[n] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (psize == pstride[n])
|
|
|
|
psize *= pextent[n];
|
|
|
|
else
|
|
|
|
psize = 0;
|
|
|
|
}
|
|
|
|
pptr = pad->data;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pdim = 0;
|
|
|
|
psize = 1;
|
|
|
|
pempty = 1;
|
|
|
|
pptr = NULL;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:33:18 +00:00
|
|
|
if (unlikely (compile_options.bounds_check))
|
|
|
|
{
|
2008-10-15 16:27:58 +00:00
|
|
|
index_type ret_extent, source_extent;
|
|
|
|
|
|
|
|
rs = 1;
|
|
|
|
for (n = 0; n < rdim; n++)
|
|
|
|
{
|
|
|
|
rs *= shape_data[n];
|
|
|
|
ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
|
|
|
|
if (ret_extent != shape_data[n])
|
|
|
|
runtime_error("Incorrect extent in return value of RESHAPE"
|
|
|
|
" intrinsic in dimension %ld: is %ld,"
|
|
|
|
" should be %ld", (long int) n+1,
|
|
|
|
(long int) ret_extent, (long int) shape_data[n]);
|
|
|
|
}
|
|
|
|
|
2008-11-22 21:41:27 +00:00
|
|
|
source_extent = 1;
|
|
|
|
sdim = GFC_DESCRIPTOR_RANK (source);
|
|
|
|
for (n = 0; n < sdim; n++)
|
|
|
|
{
|
|
|
|
index_type se;
|
|
|
|
se = source->dim[n].ubound + 1 - source->dim[0].lbound;
|
|
|
|
source_extent *= se > 0 ? se : 0;
|
|
|
|
}
|
2008-10-15 16:27:58 +00:00
|
|
|
|
2008-11-23 19:25:42 +00:00
|
|
|
if (rs > source_extent && (!pad || pempty))
|
2008-10-15 16:27:58 +00:00
|
|
|
runtime_error("Incorrect size in SOURCE argument to RESHAPE"
|
|
|
|
" intrinsic: is %ld, should be %ld",
|
|
|
|
(long int) source_extent, (long int) rs);
|
|
|
|
|
2008-09-07 13:33:18 +00:00
|
|
|
if (order)
|
|
|
|
{
|
|
|
|
int seen[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type v;
|
|
|
|
|
|
|
|
for (n = 0; n < rdim; n++)
|
|
|
|
seen[n] = 0;
|
|
|
|
|
|
|
|
for (n = 0; n < rdim; n++)
|
|
|
|
{
|
|
|
|
v = order->data[n * order->dim[0].stride] - 1;
|
|
|
|
|
|
|
|
if (v < 0 || v >= rdim)
|
|
|
|
runtime_error("Value %ld out of range in ORDER argument"
|
|
|
|
" to RESHAPE intrinsic", (long int) v + 1);
|
|
|
|
|
|
|
|
if (seen[v] != 0)
|
|
|
|
runtime_error("Duplicate value %ld in ORDER argument to"
|
|
|
|
" RESHAPE intrinsic", (long int) v + 1);
|
|
|
|
|
|
|
|
seen[v] = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-18 20:24:32 +00:00
|
|
|
rsize = 1;
|
|
|
|
for (n = 0; n < rdim; n++)
|
|
|
|
{
|
|
|
|
if (order)
|
|
|
|
dim = order->data[n * order->dim[0].stride] - 1;
|
|
|
|
else
|
|
|
|
dim = n;
|
|
|
|
|
|
|
|
rcount[n] = 0;
|
|
|
|
rstride[n] = ret->dim[dim].stride;
|
|
|
|
rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
|
2008-04-20 19:56:07 +00:00
|
|
|
if (rextent[n] < 0)
|
2008-04-25 20:11:19 +00:00
|
|
|
rextent[n] = 0;
|
2005-05-18 20:24:32 +00:00
|
|
|
|
2008-04-20 19:56:07 +00:00
|
|
|
if (rextent[n] != shape_data[dim])
|
2005-05-18 20:24:32 +00:00
|
|
|
runtime_error ("shape and target do not conform");
|
|
|
|
|
|
|
|
if (rsize == rstride[n])
|
|
|
|
rsize *= rextent[n];
|
|
|
|
else
|
|
|
|
rsize = 0;
|
|
|
|
if (rextent[n] <= 0)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
sdim = GFC_DESCRIPTOR_RANK (source);
|
|
|
|
ssize = 1;
|
2006-11-03 11:51:09 +00:00
|
|
|
sempty = 0;
|
2005-05-18 20:24:32 +00:00
|
|
|
for (n = 0; n < sdim; n++)
|
|
|
|
{
|
|
|
|
scount[n] = 0;
|
|
|
|
sstride[n] = source->dim[n].stride;
|
|
|
|
sextent[n] = source->dim[n].ubound + 1 - source->dim[n].lbound;
|
|
|
|
if (sextent[n] <= 0)
|
2006-11-03 11:51:09 +00:00
|
|
|
{
|
|
|
|
sempty = 1;
|
|
|
|
sextent[n] = 0;
|
|
|
|
}
|
2005-05-18 20:24:32 +00:00
|
|
|
|
|
|
|
if (ssize == sstride[n])
|
|
|
|
ssize *= sextent[n];
|
|
|
|
else
|
|
|
|
ssize = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rsize != 0 && ssize != 0 && psize != 0)
|
|
|
|
{
|
2005-06-09 19:43:27 +00:00
|
|
|
rsize *= sizeof (GFC_COMPLEX_8);
|
|
|
|
ssize *= sizeof (GFC_COMPLEX_8);
|
|
|
|
psize *= sizeof (GFC_COMPLEX_8);
|
2005-05-18 20:24:32 +00:00
|
|
|
reshape_packed ((char *)ret->data, rsize, (char *)source->data,
|
|
|
|
ssize, pad ? (char *)pad->data : NULL, psize);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
rptr = ret->data;
|
|
|
|
src = sptr = source->data;
|
|
|
|
rstride0 = rstride[0];
|
|
|
|
sstride0 = sstride[0];
|
|
|
|
|
2006-11-03 11:51:09 +00:00
|
|
|
if (sempty && pempty)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
if (sempty)
|
|
|
|
{
|
2008-11-18 22:43:05 +00:00
|
|
|
/* Pretend we are using the pad array the first time around, too. */
|
2006-11-03 11:51:09 +00:00
|
|
|
src = pptr;
|
2008-11-18 22:43:05 +00:00
|
|
|
sptr = pptr;
|
2006-11-03 11:51:09 +00:00
|
|
|
sdim = pdim;
|
|
|
|
for (dim = 0; dim < pdim; dim++)
|
|
|
|
{
|
|
|
|
scount[dim] = pcount[dim];
|
|
|
|
sextent[dim] = pextent[dim];
|
|
|
|
sstride[dim] = pstride[dim];
|
2008-11-18 22:43:05 +00:00
|
|
|
sstride0 = pstride[0];
|
2006-11-03 11:51:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-18 20:24:32 +00:00
|
|
|
while (rptr)
|
|
|
|
{
|
|
|
|
/* Select between the source and pad arrays. */
|
|
|
|
*rptr = *src;
|
|
|
|
/* Advance to the next element. */
|
|
|
|
rptr += rstride0;
|
|
|
|
src += sstride0;
|
|
|
|
rcount[0]++;
|
|
|
|
scount[0]++;
|
2006-11-03 11:51:09 +00:00
|
|
|
|
2005-05-18 20:24:32 +00:00
|
|
|
/* Advance to the next destination element. */
|
|
|
|
n = 0;
|
|
|
|
while (rcount[n] == rextent[n])
|
|
|
|
{
|
|
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
|
|
the next dimension. */
|
|
|
|
rcount[n] = 0;
|
|
|
|
/* We could precalculate these products, but this is a less
|
2006-10-20 11:52:56 +00:00
|
|
|
frequently used path so probably not worth it. */
|
2005-05-18 20:24:32 +00:00
|
|
|
rptr -= rstride[n] * rextent[n];
|
|
|
|
n++;
|
|
|
|
if (n == rdim)
|
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
rptr = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rcount[n]++;
|
|
|
|
rptr += rstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Advance to the next source element. */
|
|
|
|
n = 0;
|
|
|
|
while (scount[n] == sextent[n])
|
|
|
|
{
|
|
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
|
|
the next dimension. */
|
|
|
|
scount[n] = 0;
|
|
|
|
/* We could precalculate these products, but this is a less
|
2006-10-20 11:52:56 +00:00
|
|
|
frequently used path so probably not worth it. */
|
2005-05-18 20:24:32 +00:00
|
|
|
src -= sstride[n] * sextent[n];
|
|
|
|
n++;
|
|
|
|
if (n == sdim)
|
|
|
|
{
|
|
|
|
if (sptr && pad)
|
|
|
|
{
|
|
|
|
/* Switch to the pad array. */
|
|
|
|
sptr = NULL;
|
|
|
|
sdim = pdim;
|
|
|
|
for (dim = 0; dim < pdim; dim++)
|
|
|
|
{
|
|
|
|
scount[dim] = pcount[dim];
|
|
|
|
sextent[dim] = pextent[dim];
|
|
|
|
sstride[dim] = pstride[dim];
|
|
|
|
sstride0 = sstride[0];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* We now start again from the beginning of the pad array. */
|
|
|
|
src = pptr;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
scount[n]++;
|
|
|
|
src += sstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
re PR libfortran/19308 (I/O library should support more real and integer kinds)
PR libfortran/19308
PR fortran/20120
PR libfortran/22437
* Makefile.am: Add generated files for large real and integers
kinds. Add a rule to create the kinds.inc c99_protos.inc files.
Use kinds.inc to preprocess Fortran generated files.
* libgfortran.h: Add macro definitions for GFC_INTEGER_16_HUGE,
GFC_REAL_10_HUGE and GFC_REAL_16_HUGE. Add types gfc_array_i16,
gfc_array_r10, gfc_array_r16, gfc_array_c10, gfc_array_c16,
gfc_array_l16.
* mk-kinds-h.sh: Define macros HAVE_GFC_LOGICAL_* and
HAVE_GFC_COMPLEX_* when these types are available.
* intrinsics/ishftc.c (ishftc16): New function for GFC_INTEGER_16.
* m4/all.m4, m4/any.m4, m4/count.m4, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/exponent.m4, m4/fraction.m4, m4/in_pack.m4, m4/in_unpack.m4,
m4/matmul.m4, m4/matmull.m4, m4/maxloc0.m4, m4/maxloc1.m4,
m4/maxval.m4, m4/minloc0.m4, m4/minloc1.m4, m4/minval.m4, m4/mtype.m4,
m4/nearest.m4, m4/pow.m4, m4/product.m4, m4/reshape.m4,
m4/set_exponent.m4, m4/shape.m4, m4/specific.m4, m4/specific2.m4,
m4/sum.m4, m4/transpose.m4: Protect generated functions with
appropriate "#if defined (HAVE_GFC_type_kind)" preprocessor directives.
* Makefile.in: Regenerate.
* all files in generated/: Regenerate.
* f95-lang.c (DO_DEFINE_MATH_BUILTIN): Add support for long
double builtin function.
(gfc_init_builtin_functions): Add mfunc_longdouble,
mfunc_clongdouble and func_clongdouble_longdouble trees. Build
them for round, trunc, cabs, copysign and pow functions.
* iresolve.c (gfc_resolve_reshape, gfc_resolve_transpose): Add
case for kind 10 and 16.
* trans-decl.c: Add trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
(gfc_build_intrinsic_function_decls): Build nodes for int16,
real10, real16, complex10 and complex16 types. Build all possible
combinations for function _gfortran_pow_?n_?n. Build function
calls cpowl10, cpowl16, ishftc16, exponent10 and exponent16.
* trans-expr.c (gfc_conv_power_op): Add case for integer(16),
real(10) and real(16).
* trans-intrinsic.c: Add suppport for long double builtin
functions in BUILT_IN_FUNCTION, LIBM_FUNCTION and LIBF_FUNCTION
macros.
(gfc_conv_intrinsic_aint): Add case for integer(16), real(10) and
real(16) kinds.
(gfc_build_intrinsic_lib_fndecls): Add support for real10_decl
and real16_decl in library functions.
(gfc_get_intrinsic_lib_fndecl): Add cases for real and complex
kinds 10 and 16.
(gfc_conv_intrinsic_exponent): Add cases for real(10) and real(16)
kinds.
(gfc_conv_intrinsic_sign): Likewise.
(gfc_conv_intrinsic_ishftc): Add case for integer(16) kind.
* trans-types.c (gfc_get_int_type, gfc_get_real_type,
gfc_get_complex_type, gfc_get_logical_type): Doesn't error out in
the case of kinds not available.
* trans.h: Declare trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
* gfortran.dg/large_real_kind_2.F90: New test.
* gfortran.dg/large_integer_kind_2.f90: New test.
From-SVN: r104889
2005-10-03 07:22:20 +00:00
|
|
|
|
|
|
|
#endif
|