2004-10-04 21:27:29 +02:00
|
|
|
/* Generic implementation of the PACK intrinsic
|
2005-05-15 17:37:18 +02:00
|
|
|
Copyright (C) 2002, 2004, 2005 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.
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
/* PACK is specified as follows:
|
|
|
|
|
|
|
|
13.14.80 PACK (ARRAY, MASK, [VECTOR])
|
2005-05-15 17:37:18 +02:00
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
Description: Pack an array into an array of rank one under the
|
|
|
|
control of a mask.
|
|
|
|
|
|
|
|
Class: Transformational fucntion.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
ARRAY may be of any type. It shall not be scalar.
|
|
|
|
MASK shall be of type LOGICAL. It shall be conformable with ARRAY.
|
|
|
|
VECTOR (optional) shall be of the same type and type parameters
|
|
|
|
as ARRAY. VECTOR shall have at least as many elements as
|
|
|
|
there are true elements in MASK. If MASK is a scalar
|
2005-05-15 17:37:18 +02:00
|
|
|
with the value true, VECTOR shall have at least as many
|
2004-10-04 21:27:29 +02:00
|
|
|
elements as there are in ARRAY.
|
|
|
|
|
|
|
|
Result Characteristics: The result is an array of rank one with the
|
|
|
|
same type and type parameters as ARRAY. If VECTOR is present, the
|
|
|
|
result size is that of VECTOR; otherwise, the result size is the
|
|
|
|
number /t/ of true elements in MASK unless MASK is scalar with the
|
|
|
|
value true, in which case the result size is the size of ARRAY.
|
|
|
|
|
|
|
|
Result Value: Element /i/ of the result is the element of ARRAY
|
|
|
|
that corresponds to the /i/th true element of MASK, taking elements
|
|
|
|
in array element order, for /i/ = 1, 2, ..., /t/. If VECTOR is
|
|
|
|
present and has size /n/ > /t/, element /i/ of the result has the
|
|
|
|
value VECTOR(/i/), for /i/ = /t/ + 1, ..., /n/.
|
|
|
|
|
|
|
|
Examples: The nonzero elements of an array M with the value
|
|
|
|
| 0 0 0 |
|
|
|
|
| 9 0 0 | may be "gathered" by the function PACK. The result of
|
|
|
|
| 0 0 7 |
|
|
|
|
PACK (M, MASK = M.NE.0) is [9,7] and the result of PACK (M, M.NE.0,
|
2005-05-15 17:37:18 +02:00
|
|
|
VECTOR = (/ 2,4,6,8,10,12 /)) is [9,7,6,8,10,12].
|
2004-10-04 21:27:29 +02:00
|
|
|
|
|
|
|
There are two variants of the PACK intrinsic: one, where MASK is
|
|
|
|
array valued, and the other one where MASK is scalar. */
|
|
|
|
|
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
|
|
|
extern void pack (gfc_array_char *, const gfc_array_char *,
|
|
|
|
const gfc_array_l4 *, const gfc_array_char *);
|
|
|
|
export_proto(pack);
|
acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
* acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
(LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT): New.
(LIBGFOR_CHECK_ATTRIBUTE_ALIAS): New.
* configure.ac: Use them.
* configure, config.h.in, aclocal.m4: Rebuild.
* libgfortran.h (prefix): Remove.
(PREFIX, IPREFIX): New.
(sym_rename, sym_rename1, sym_rename2): New.
(internal_proto, export_proto, export_proto_np): New.
(iexport_proto, iexport): New.
(iexport_data_proto, iexport_data): New.
* intrinsics/abort.c, intrinsics/args.c, intrinsics/associated.c,
intrinsics/cpu_time.c, intrinsics/cshift0.c,
intrinsics/date_and_time.c, intrinsics/env.c, intrinsics/eoshift0.c,
intrinsics/eoshift2.c, intrinsics/etime.c, intrinsics/exit.c,
intrinsics/flush.c, intrinsics/fnum.c, intrinsics/getXid.c,
intrinsics/getcwd.c, intrinsics/ishftc.c, intrinsics/mvbits.c,
intrinsics/pack_generic.c, intrinsics/rand.c, intrinsics/random.c,
intrinsics/reshape_generic.c, intrinsics/size.c,
intrinsics/spread_generic.c, intrinsics/stat.c,
intrinsics/string_intrinsics.c, intrinsics/system.c,
intrinsics/system_clock.c, intrinsics/transpose_generic.c,
intrinsics/umask.c, intrinsics/unlink.c, intrinsics/unpack_generic.c,
io/backspace.c, io/close.c, io/endfile.c, io/inquire.c, io/io.h,
io/open.c, io/rewind.c, io/transfer.c, libgfortran.h, 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/iforeach.m4,
m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/nearest.m4,
m4/pow.m4, m4/reshape.m4, m4/set_exponent.m4, m4/shape.m4,
m4/transpose.m4, runtime/environ.c, runtime/error.c,
runtime/in_pack_generic.c, runtime/in_unpack_generic.c,
runtime/main.c, runtime/memory.c, runtime/pause.c, runtime/select.c,
runtime/stop.c: Use them to mark symbols internal or external.
* generated/*: Rebuild.
From-SVN: r92045
2004-12-12 09:59:05 +01:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
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
|
|
|
pack (gfc_array_char *ret, const gfc_array_char *array,
|
|
|
|
const gfc_array_l4 *mask, const gfc_array_char *vector)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
|
|
|
/* r.* indicates the return array. */
|
|
|
|
index_type rstride0;
|
|
|
|
char *rptr;
|
|
|
|
/* s.* indicates the source array. */
|
|
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type sstride0;
|
|
|
|
const char *sptr;
|
|
|
|
/* m.* indicates the mask array. */
|
|
|
|
index_type mstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type mstride0;
|
|
|
|
const GFC_LOGICAL_4 *mptr;
|
|
|
|
|
|
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type n;
|
|
|
|
index_type dim;
|
|
|
|
index_type size;
|
|
|
|
index_type nelem;
|
|
|
|
|
|
|
|
size = GFC_DESCRIPTOR_SIZE (array);
|
|
|
|
dim = GFC_DESCRIPTOR_RANK (array);
|
|
|
|
for (n = 0; n < dim; n++)
|
|
|
|
{
|
|
|
|
count[n] = 0;
|
|
|
|
extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
|
|
|
|
sstride[n] = array->dim[n].stride * size;
|
|
|
|
mstride[n] = mask->dim[n].stride;
|
|
|
|
}
|
|
|
|
if (sstride[0] == 0)
|
|
|
|
sstride[0] = size;
|
|
|
|
if (mstride[0] == 0)
|
|
|
|
mstride[0] = 1;
|
|
|
|
|
|
|
|
sptr = array->data;
|
|
|
|
mptr = mask->data;
|
|
|
|
|
|
|
|
/* Use the same loop for both logical types. */
|
|
|
|
if (GFC_DESCRIPTOR_SIZE (mask) != 4)
|
|
|
|
{
|
|
|
|
if (GFC_DESCRIPTOR_SIZE (mask) != 8)
|
|
|
|
runtime_error ("Funny sized logical array");
|
|
|
|
for (n = 0; n < dim; n++)
|
|
|
|
mstride[n] <<= 1;
|
|
|
|
mptr = GFOR_POINTER_L8_TO_L4 (mptr);
|
|
|
|
}
|
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
/* Allocate the memory for the result. */
|
|
|
|
int total;
|
|
|
|
|
2005-05-15 17:37:18 +02:00
|
|
|
if (vector != NULL)
|
|
|
|
{
|
2004-10-04 21:27:29 +02:00
|
|
|
/* The return array will have as many
|
2005-05-15 17:37:18 +02:00
|
|
|
elements as there are in VECTOR. */
|
|
|
|
total = vector->dim[0].ubound + 1 - vector->dim[0].lbound;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We have to count the true elements in MASK. */
|
2004-10-04 21:27:29 +02:00
|
|
|
|
|
|
|
/* TODO: We could speed up pack easily in the case of only
|
|
|
|
few .TRUE. entries in MASK, by keeping track of where we
|
|
|
|
would be in the source array during the initial traversal
|
|
|
|
of MASK, and caching the pointers to those elements. Then,
|
|
|
|
supposed the number of elements is small enough, we would
|
|
|
|
only have to traverse the list, and copy those elements
|
|
|
|
into the result array. In the case of datatypes which fit
|
|
|
|
in one of the integer types we could also cache the
|
2005-05-15 17:37:18 +02:00
|
|
|
value instead of a pointer to it.
|
2004-10-04 21:27:29 +02:00
|
|
|
This approach might be bad from the point of view of
|
|
|
|
cache behavior in the case where our cache is not big
|
|
|
|
enough to hold all elements that have to be copied. */
|
|
|
|
|
|
|
|
const GFC_LOGICAL_4 *m = mptr;
|
|
|
|
|
|
|
|
total = 0;
|
|
|
|
|
|
|
|
while (m)
|
|
|
|
{
|
|
|
|
/* Test this element. */
|
|
|
|
if (*m)
|
|
|
|
total++;
|
|
|
|
|
|
|
|
/* Advance to the next element. */
|
|
|
|
m += mstride[0];
|
|
|
|
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 this product, but this is a
|
|
|
|
less frequently used path so proabably not worth
|
|
|
|
it. */
|
|
|
|
m -= mstride[n] * extent[n];
|
|
|
|
n++;
|
|
|
|
if (n >= dim)
|
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
m = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n]++;
|
|
|
|
mptr += mstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-05-15 17:37:18 +02:00
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
/* Setup the array descriptor. */
|
|
|
|
ret->dim[0].lbound = 0;
|
|
|
|
ret->dim[0].ubound = total - 1;
|
|
|
|
ret->dim[0].stride = 1;
|
|
|
|
|
cshift0.c, [...]: Use internal_malloc_size instead of internal_malloc.
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/string_intrinsics.c,
intrinsics/transpose_generic.c, m4/ifunction.m4, m4/matmul.m4,
m4/matmull.m4, m4/transpose.m4: Use internal_malloc_size instead
of internal_malloc.
* generated/*: Rebuild.
From-SVN: r91799
2004-12-07 01:24:44 +01:00
|
|
|
ret->data = internal_malloc_size (size * total);
|
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-10-04 21:27:29 +02:00
|
|
|
|
|
|
|
if (total == 0)
|
|
|
|
/* In this case, nothing remains to be done. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
rstride0 = ret->dim[0].stride * size;
|
|
|
|
if (rstride0 == 0)
|
|
|
|
rstride0 = size;
|
|
|
|
sstride0 = sstride[0];
|
|
|
|
mstride0 = mstride[0];
|
|
|
|
rptr = ret->data;
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
while (sptr)
|
|
|
|
{
|
|
|
|
/* Test this element. */
|
|
|
|
if (*mptr)
|
|
|
|
{
|
|
|
|
/* Add it. */
|
|
|
|
memcpy (rptr, sptr, size);
|
|
|
|
rptr += rstride0;
|
|
|
|
}
|
|
|
|
/* Advance to the next element. */
|
|
|
|
sptr += sstride0;
|
|
|
|
mptr += mstride0;
|
|
|
|
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 proabably not worth it. */
|
|
|
|
sptr -= sstride[n] * extent[n];
|
|
|
|
mptr -= mstride[n] * extent[n];
|
|
|
|
n++;
|
|
|
|
if (n >= dim)
|
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
sptr = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n]++;
|
|
|
|
sptr += sstride[n];
|
|
|
|
mptr += mstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add any remaining elements from VECTOR. */
|
|
|
|
if (vector)
|
|
|
|
{
|
|
|
|
n = vector->dim[0].ubound + 1 - vector->dim[0].lbound;
|
|
|
|
nelem = ((rptr - ret->data) / rstride0);
|
|
|
|
if (n > nelem)
|
|
|
|
{
|
|
|
|
sstride0 = vector->dim[0].stride * size;
|
|
|
|
if (sstride0 == 0)
|
|
|
|
sstride0 = size;
|
|
|
|
|
|
|
|
sptr = vector->data + sstride0 * nelem;
|
|
|
|
n -= nelem;
|
|
|
|
while (n--)
|
|
|
|
{
|
|
|
|
memcpy (rptr, sptr, size);
|
|
|
|
rptr += rstride0;
|
|
|
|
sptr += sstride0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
extern void pack_s (gfc_array_char *ret, const gfc_array_char *array,
|
|
|
|
const GFC_LOGICAL_4 *, const gfc_array_char *);
|
|
|
|
export_proto(pack_s);
|
acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
* acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
(LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT): New.
(LIBGFOR_CHECK_ATTRIBUTE_ALIAS): New.
* configure.ac: Use them.
* configure, config.h.in, aclocal.m4: Rebuild.
* libgfortran.h (prefix): Remove.
(PREFIX, IPREFIX): New.
(sym_rename, sym_rename1, sym_rename2): New.
(internal_proto, export_proto, export_proto_np): New.
(iexport_proto, iexport): New.
(iexport_data_proto, iexport_data): New.
* intrinsics/abort.c, intrinsics/args.c, intrinsics/associated.c,
intrinsics/cpu_time.c, intrinsics/cshift0.c,
intrinsics/date_and_time.c, intrinsics/env.c, intrinsics/eoshift0.c,
intrinsics/eoshift2.c, intrinsics/etime.c, intrinsics/exit.c,
intrinsics/flush.c, intrinsics/fnum.c, intrinsics/getXid.c,
intrinsics/getcwd.c, intrinsics/ishftc.c, intrinsics/mvbits.c,
intrinsics/pack_generic.c, intrinsics/rand.c, intrinsics/random.c,
intrinsics/reshape_generic.c, intrinsics/size.c,
intrinsics/spread_generic.c, intrinsics/stat.c,
intrinsics/string_intrinsics.c, intrinsics/system.c,
intrinsics/system_clock.c, intrinsics/transpose_generic.c,
intrinsics/umask.c, intrinsics/unlink.c, intrinsics/unpack_generic.c,
io/backspace.c, io/close.c, io/endfile.c, io/inquire.c, io/io.h,
io/open.c, io/rewind.c, io/transfer.c, libgfortran.h, 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/iforeach.m4,
m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/nearest.m4,
m4/pow.m4, m4/reshape.m4, m4/set_exponent.m4, m4/shape.m4,
m4/transpose.m4, runtime/environ.c, runtime/error.c,
runtime/in_pack_generic.c, runtime/in_unpack_generic.c,
runtime/main.c, runtime/memory.c, runtime/pause.c, runtime/select.c,
runtime/stop.c: Use them to mark symbols internal or external.
* generated/*: Rebuild.
From-SVN: r92045
2004-12-12 09:59:05 +01:00
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
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
|
|
|
pack_s (gfc_array_char *ret, const gfc_array_char *array,
|
|
|
|
const GFC_LOGICAL_4 *mask, const gfc_array_char *vector)
|
2004-10-04 21:27:29 +02:00
|
|
|
{
|
|
|
|
/* r.* indicates the return array. */
|
|
|
|
index_type rstride0;
|
|
|
|
char *rptr;
|
|
|
|
/* s.* indicates the source array. */
|
|
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type sstride0;
|
|
|
|
const char *sptr;
|
|
|
|
|
|
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
|
|
index_type n;
|
|
|
|
index_type dim;
|
|
|
|
index_type size;
|
|
|
|
index_type nelem;
|
|
|
|
|
|
|
|
size = GFC_DESCRIPTOR_SIZE (array);
|
|
|
|
dim = GFC_DESCRIPTOR_RANK (array);
|
|
|
|
for (n = 0; n < dim; n++)
|
|
|
|
{
|
|
|
|
count[n] = 0;
|
|
|
|
extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
|
|
|
|
sstride[n] = array->dim[n].stride * size;
|
|
|
|
}
|
|
|
|
if (sstride[0] == 0)
|
|
|
|
sstride[0] = size;
|
|
|
|
|
|
|
|
sstride0 = sstride[0];
|
|
|
|
sptr = array->data;
|
|
|
|
|
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
/* Allocate the memory for the result. */
|
|
|
|
int total;
|
|
|
|
|
|
|
|
if (vector != NULL)
|
|
|
|
{
|
|
|
|
/* The return array will have as many elements as there are
|
|
|
|
in vector. */
|
|
|
|
total = vector->dim[0].ubound + 1 - vector->dim[0].lbound;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (*mask)
|
|
|
|
{
|
|
|
|
/* The result array will have as many elements as the input
|
|
|
|
array. */
|
|
|
|
total = extent[0];
|
|
|
|
for (n = 1; n < dim; n++)
|
|
|
|
total *= extent[n];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The result array will be empty. */
|
|
|
|
ret->dim[0].lbound = 0;
|
|
|
|
ret->dim[0].ubound = -1;
|
|
|
|
ret->dim[0].stride = 1;
|
cshift0.c, [...]: Use internal_malloc_size instead of internal_malloc.
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/string_intrinsics.c,
intrinsics/transpose_generic.c, m4/ifunction.m4, m4/matmul.m4,
m4/matmull.m4, m4/transpose.m4: Use internal_malloc_size instead
of internal_malloc.
* generated/*: Rebuild.
From-SVN: r91799
2004-12-07 01:24:44 +01:00
|
|
|
ret->data = internal_malloc_size (0);
|
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;
|
2005-05-15 17:37:18 +02:00
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup the array descriptor. */
|
|
|
|
ret->dim[0].lbound = 0;
|
|
|
|
ret->dim[0].ubound = total - 1;
|
|
|
|
ret->dim[0].stride = 1;
|
|
|
|
|
cshift0.c, [...]: Use internal_malloc_size instead of internal_malloc.
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/string_intrinsics.c,
intrinsics/transpose_generic.c, m4/ifunction.m4, m4/matmul.m4,
m4/matmull.m4, m4/transpose.m4: Use internal_malloc_size instead
of internal_malloc.
* generated/*: Rebuild.
From-SVN: r91799
2004-12-07 01:24:44 +01:00
|
|
|
ret->data = internal_malloc_size (size * total);
|
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-10-04 21:27:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
rstride0 = ret->dim[0].stride * size;
|
|
|
|
if (rstride0 == 0)
|
|
|
|
rstride0 = size;
|
|
|
|
rptr = ret->data;
|
|
|
|
|
2005-05-15 17:37:18 +02:00
|
|
|
/* The remaining possibilities are now:
|
2004-10-04 21:27:29 +02:00
|
|
|
If MASK is .TRUE., we have to copy the source array into the
|
|
|
|
result array. We then have to fill it up with elements from VECTOR.
|
|
|
|
If MASK is .FALSE., we have to copy VECTOR into the result
|
|
|
|
array. If VECTOR were not present we would have already returned. */
|
|
|
|
|
|
|
|
if (*mask)
|
|
|
|
{
|
|
|
|
while (sptr)
|
|
|
|
{
|
|
|
|
/* Add this element. */
|
|
|
|
memcpy (rptr, sptr, size);
|
|
|
|
rptr += rstride0;
|
|
|
|
|
|
|
|
/* Advance to the next element. */
|
|
|
|
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 frequently used path so proabably not worth it. */
|
|
|
|
sptr -= sstride[n] * extent[n];
|
|
|
|
n++;
|
|
|
|
if (n >= dim)
|
|
|
|
{
|
|
|
|
/* Break out of the loop. */
|
|
|
|
sptr = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count[n]++;
|
|
|
|
sptr += sstride[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-05-15 17:37:18 +02:00
|
|
|
|
2004-10-04 21:27:29 +02:00
|
|
|
/* Add any remaining elements from VECTOR. */
|
|
|
|
if (vector)
|
|
|
|
{
|
|
|
|
n = vector->dim[0].ubound + 1 - vector->dim[0].lbound;
|
|
|
|
nelem = ((rptr - ret->data) / rstride0);
|
|
|
|
if (n > nelem)
|
|
|
|
{
|
|
|
|
sstride0 = vector->dim[0].stride * size;
|
|
|
|
if (sstride0 == 0)
|
|
|
|
sstride0 = size;
|
|
|
|
|
|
|
|
sptr = vector->data + sstride0 * nelem;
|
|
|
|
n -= nelem;
|
|
|
|
while (n--)
|
|
|
|
{
|
|
|
|
memcpy (rptr, sptr, size);
|
|
|
|
rptr += rstride0;
|
|
|
|
sptr += sstride0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|