X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libgfortran%2Fgenerated%2Freshape_i8.c;h=34620cf6d4096f0a097349a3e2635c0693d895c4;hb=5f0d36be6d31b78172bb45c0dbba9b1dc7f6ae84;hp=e08586337249901274775ac453a19984fa8facdb;hpb=93830de1da404ed79635b483769802c798b94980;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index e0858633724..34620cf6d40 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -1,5 +1,5 @@ -/* Implementation of the RESHAPE - Copyright 2002 Free Software Foundation, Inc. +/* Implementation of the RESHAPE intrinsic + Copyright 2002, 2006, 2007, 2009 Free Software Foundation, Inc. Contributed by Paul Brook This file is part of the GNU Fortran 95 runtime library (libgfortran). @@ -7,44 +7,45 @@ 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.) +version 3 of the License, or (at your option) any later version. 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., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ -#include "config.h" +#include "libgfortran.h" #include #include -#include "libgfortran.h" + + +#if defined (HAVE_GFC_INTEGER_8) typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type; -/* The shape parameter is ignored. We can currently deduce the shape from the - return array. */ -extern void reshape_8 (gfc_array_i8 *, gfc_array_i8 *, shape_type *, - gfc_array_i8 *, shape_type *); +extern void reshape_8 (gfc_array_i8 * const restrict, + gfc_array_i8 * const restrict, + shape_type * const restrict, + gfc_array_i8 * const restrict, + shape_type * const restrict); export_proto(reshape_8); void -reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, - gfc_array_i8 * pad, shape_type * order) +reshape_8 (gfc_array_i8 * const restrict ret, + gfc_array_i8 * const restrict source, + shape_type * const restrict shape, + gfc_array_i8 * const restrict pad, + shape_type * const restrict order) { /* r.* indicates the return array. */ index_type rcount[GFC_MAX_DIMENSIONS]; @@ -75,52 +76,145 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, const GFC_INTEGER_8 *src; int n; int dim; + int sempty, pempty, shape_empty; + index_type shape_data[GFC_MAX_DIMENSIONS]; - if (source->dim[0].stride == 0) - source->dim[0].stride = 1; - if (shape->dim[0].stride == 0) - shape->dim[0].stride = 1; - if (pad && pad->dim[0].stride == 0) - pad->dim[0].stride = 1; - if (order && order->dim[0].stride == 0) - order->dim[0].stride = 1; + rdim = GFC_DESCRIPTOR_EXTENT(shape,0); + 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 * GFC_DESCRIPTOR_STRIDE(shape,0)]; + if (shape_data[n] <= 0) + { + shape_data[n] = 0; + shape_empty = 1; + } + } if (ret->data == NULL) { - rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1; rs = 1; - for (n=0; n < rdim; n++) + for (n = 0; n < rdim; n++) { - ret->dim[n].lbound = 0; - rex = shape->data[n * shape->dim[0].stride]; - ret->dim[n].ubound = rex - 1; - ret->dim[n].stride = rs; + rex = shape_data[n]; + + GFC_DIMENSION_SET(ret->dim[n], 0, rex - 1, rs); + rs *= rex; } ret->offset = 0; ret->data = internal_malloc_size ( rs * sizeof (GFC_INTEGER_8)); ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim; } + + if (shape_empty) + return; + + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = GFC_DESCRIPTOR_STRIDE(pad,n); + pextent[n] = GFC_DESCRIPTOR_EXTENT(pad,n); + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } else { - rdim = GFC_DESCRIPTOR_RANK (ret); - if (ret->dim[0].stride == 0) - ret->dim[0].stride = 1; + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + + if (unlikely (compile_options.bounds_check)) + { + index_type ret_extent, source_extent; + + rs = 1; + for (n = 0; n < rdim; n++) + { + rs *= shape_data[n]; + ret_extent = GFC_DESCRIPTOR_EXTENT(ret,n); + 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]); + } + + source_extent = 1; + sdim = GFC_DESCRIPTOR_RANK (source); + for (n = 0; n < sdim; n++) + { + index_type se; + se = GFC_DESCRIPTOR_EXTENT(source,n); + source_extent *= se > 0 ? se : 0; + } + + if (rs > source_extent && (!pad || pempty)) + runtime_error("Incorrect size in SOURCE argument to RESHAPE" + " intrinsic: is %ld, should be %ld", + (long int) source_extent, (long int) rs); + + 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 * GFC_DESCRIPTOR_STRIDE(order,0)] - 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; + } + } } rsize = 1; for (n = 0; n < rdim; n++) { if (order) - dim = order->data[n * order->dim[0].stride] - 1; + dim = order->data[n * GFC_DESCRIPTOR_STRIDE(order,0)] - 1; else dim = n; rcount[n] = 0; - rstride[n] = ret->dim[dim].stride; - rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound; + rstride[n] = GFC_DESCRIPTOR_STRIDE(ret,dim); + rextent[n] = GFC_DESCRIPTOR_EXTENT(ret,dim); + if (rextent[n] < 0) + rextent[n] = 0; - if (rextent[n] != shape->data[dim * shape->dim[0].stride]) + if (rextent[n] != shape_data[dim]) runtime_error ("shape and target do not conform"); if (rsize == rstride[n]) @@ -133,13 +227,17 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, sdim = GFC_DESCRIPTOR_RANK (source); ssize = 1; + sempty = 0; 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; + sstride[n] = GFC_DESCRIPTOR_STRIDE(source,n); + sextent[n] = GFC_DESCRIPTOR_EXTENT(source,n); if (sextent[n] <= 0) - abort (); + { + sempty = 1; + sextent[n] = 0; + } if (ssize == sstride[n]) ssize *= sextent[n]; @@ -147,31 +245,6 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - 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) - abort (); - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_INTEGER_8); @@ -186,6 +259,24 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, rstride0 = rstride[0]; sstride0 = sstride[0]; + if (sempty && pempty) + abort (); + + if (sempty) + { + /* Pretend we are using the pad array the first time around, too. */ + src = pptr; + sptr = pptr; + sdim = pdim; + for (dim = 0; dim < pdim; dim++) + { + scount[dim] = pcount[dim]; + sextent[dim] = pextent[dim]; + sstride[dim] = pstride[dim]; + sstride0 = pstride[0]; + } + } + while (rptr) { /* Select between the source and pad arrays. */ @@ -195,6 +286,7 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, src += sstride0; rcount[0]++; scount[0]++; + /* Advance to the next destination element. */ n = 0; while (rcount[n] == rextent[n]) @@ -203,7 +295,7 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, the next dimension. */ rcount[n] = 0; /* We could precalculate these products, but this is a less - frequently used path so proabably not worth it. */ + frequently used path so probably not worth it. */ rptr -= rstride[n] * rextent[n]; n++; if (n == rdim) @@ -226,7 +318,7 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, the next dimension. */ scount[n] = 0; /* We could precalculate these products, but this is a less - frequently used path so proabably not worth it. */ + frequently used path so probably not worth it. */ src -= sstride[n] * sextent[n]; n++; if (n == sdim) @@ -256,3 +348,5 @@ reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape, } } } + +#endif