2004-05-13 08:41:07 +02:00
|
|
|
/* Generic implementation of the CSHIFT intrinsic
|
2009-04-08 18:48:07 +02:00
|
|
|
Copyright 2003, 2005, 2006, 2007, 2009 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
|
2009-04-09 17:00:19 +02:00
|
|
|
version 3 of the License, or (at your option) any later version.
|
2005-01-12 22:27:33 +01:00
|
|
|
|
|
|
|
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
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
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
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2007-08-31 16:01:34 +02:00
|
|
|
#include "libgfortran.h"
|
2004-05-13 08:41:07 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
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,
|
2009-04-08 18:48:07 +02:00
|
|
|
index_type 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;
|
2008-07-21 12:05:32 +02:00
|
|
|
index_type arraysize;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
index_type type_size;
|
|
|
|
|
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'");
|
|
|
|
|
2008-07-21 12:05:32 +02:00
|
|
|
arraysize = size0 ((array_t *) array);
|
|
|
|
|
|
|
|
if (ret->data == NULL)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ret->offset = 0;
|
|
|
|
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
|
|
|
|
ret->dim[i].stride = (ret->dim[i-1].ubound + 1)
|
|
|
|
* ret->dim[i-1].stride;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arraysize > 0)
|
|
|
|
ret->data = internal_malloc_size (size * arraysize);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret->data = internal_malloc_size (1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arraysize == 0)
|
|
|
|
return;
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
type_size = GFC_DTYPE_TYPE_SIZE (array);
|
2008-07-21 12:05:32 +02:00
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
switch(type_size)
|
|
|
|
{
|
|
|
|
case GFC_DTYPE_LOGICAL_1:
|
|
|
|
case GFC_DTYPE_INTEGER_1:
|
|
|
|
case GFC_DTYPE_DERIVED_1:
|
|
|
|
cshift0_i1 ((gfc_array_i1 *)ret, (gfc_array_i1 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case GFC_DTYPE_LOGICAL_2:
|
|
|
|
case GFC_DTYPE_INTEGER_2:
|
|
|
|
cshift0_i2 ((gfc_array_i2 *)ret, (gfc_array_i2 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case GFC_DTYPE_LOGICAL_4:
|
|
|
|
case GFC_DTYPE_INTEGER_4:
|
|
|
|
cshift0_i4 ((gfc_array_i4 *)ret, (gfc_array_i4 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case GFC_DTYPE_LOGICAL_8:
|
|
|
|
case GFC_DTYPE_INTEGER_8:
|
|
|
|
cshift0_i8 ((gfc_array_i8 *)ret, (gfc_array_i8 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_INTEGER_16
|
|
|
|
case GFC_DTYPE_LOGICAL_16:
|
|
|
|
case GFC_DTYPE_INTEGER_16:
|
2008-08-14 23:36:31 +02:00
|
|
|
cshift0_i16 ((gfc_array_i16 *)ret, (gfc_array_i16 *) array, shift,
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
which);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case GFC_DTYPE_REAL_4:
|
|
|
|
cshift0_r4 ((gfc_array_r4 *)ret, (gfc_array_r4 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case GFC_DTYPE_REAL_8:
|
|
|
|
cshift0_r8 ((gfc_array_r8 *)ret, (gfc_array_r8 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_REAL_10
|
|
|
|
case GFC_DTYPE_REAL_10:
|
|
|
|
cshift0_r10 ((gfc_array_r10 *)ret, (gfc_array_r10 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_REAL_16
|
|
|
|
case GFC_DTYPE_REAL_16:
|
|
|
|
cshift0_r16 ((gfc_array_r16 *)ret, (gfc_array_r16 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case GFC_DTYPE_COMPLEX_4:
|
|
|
|
cshift0_c4 ((gfc_array_c4 *)ret, (gfc_array_c4 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case GFC_DTYPE_COMPLEX_8:
|
|
|
|
cshift0_c8 ((gfc_array_c8 *)ret, (gfc_array_c8 *) array, shift, which);
|
|
|
|
return;
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_COMPLEX_10
|
|
|
|
case GFC_DTYPE_COMPLEX_10:
|
|
|
|
cshift0_c10 ((gfc_array_c10 *)ret, (gfc_array_c10 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_COMPLEX_16
|
|
|
|
case GFC_DTYPE_COMPLEX_16:
|
|
|
|
cshift0_c16 ((gfc_array_c16 *)ret, (gfc_array_c16 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
#endif
|
2004-05-13 08:41:07 +02:00
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
switch (size)
|
2005-01-23 18:01:00 +01:00
|
|
|
{
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
/* Let's check the actual alignment of the data pointers. If they
|
|
|
|
are suitably aligned, we can safely call the unpack functions. */
|
2005-01-23 18:01:00 +01:00
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
case sizeof (GFC_INTEGER_1):
|
|
|
|
cshift0_i1 ((gfc_array_i1 *) ret, (gfc_array_i1 *) array, shift,
|
|
|
|
which);
|
2005-01-23 18:01:00 +01:00
|
|
|
break;
|
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
case sizeof (GFC_INTEGER_2):
|
|
|
|
if (GFC_UNALIGNED_2(ret->data) || GFC_UNALIGNED_2(array->data))
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cshift0_i2 ((gfc_array_i2 *) ret, (gfc_array_i2 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
case sizeof (GFC_INTEGER_4):
|
|
|
|
if (GFC_UNALIGNED_4(ret->data) || GFC_UNALIGNED_4(array->data))
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cshift0_i4 ((gfc_array_i4 *)ret, (gfc_array_i4 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
case sizeof (GFC_INTEGER_8):
|
|
|
|
if (GFC_UNALIGNED_8(ret->data) || GFC_UNALIGNED_8(array->data))
|
|
|
|
{
|
|
|
|
/* Let's try to use the complex routines. First, a sanity
|
|
|
|
check that the sizes match; this should be optimized to
|
|
|
|
a no-op. */
|
|
|
|
if (sizeof(GFC_INTEGER_8) != sizeof(GFC_COMPLEX_4))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (GFC_UNALIGNED_C4(ret->data) || GFC_UNALIGNED_C4(array->data))
|
|
|
|
break;
|
|
|
|
|
|
|
|
cshift0_c4 ((gfc_array_c4 *) ret, (gfc_array_c4 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cshift0_i8 ((gfc_array_i8 *)ret, (gfc_array_i8 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_GFC_INTEGER_16
|
|
|
|
case sizeof (GFC_INTEGER_16):
|
|
|
|
if (GFC_UNALIGNED_16(ret->data) || GFC_UNALIGNED_16(array->data))
|
|
|
|
{
|
|
|
|
/* Let's try to use the complex routines. First, a sanity
|
|
|
|
check that the sizes match; this should be optimized to
|
|
|
|
a no-op. */
|
2008-08-14 23:36:31 +02:00
|
|
|
if (sizeof(GFC_INTEGER_16) != sizeof(GFC_COMPLEX_8))
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
if (GFC_UNALIGNED_C8(ret->data) || GFC_UNALIGNED_C8(array->data))
|
|
|
|
break;
|
|
|
|
|
|
|
|
cshift0_c8 ((gfc_array_c8 *) ret, (gfc_array_c8 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cshift0_i16 ((gfc_array_i16 *) ret, (gfc_array_i16 *) array,
|
|
|
|
shift, which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
case sizeof (GFC_COMPLEX_8):
|
|
|
|
|
|
|
|
if (GFC_UNALIGNED_C8(ret->data) || GFC_UNALIGNED_C8(array->data))
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cshift0_c8 ((gfc_array_c8 *) ret, (gfc_array_c8 *) array, shift,
|
|
|
|
which);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-01-23 18:01:00 +01:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
|
|
|
|
which = which - 1;
|
|
|
|
sstride[0] = 0;
|
|
|
|
rstride[0] = 0;
|
|
|
|
|
|
|
|
extent[0] = 1;
|
|
|
|
count[0] = 0;
|
|
|
|
n = 0;
|
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;
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
2009-04-08 18:48:07 +02:00
|
|
|
shift = len == 0 ? 0 : shift % 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
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
a time. */
|
|
|
|
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++)
|
2004-09-03 21:03:43 +02:00
|
|
|
{
|
re PR libfortran/36886 (misaligment for cshift of character)
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* Makefile.am: Added $(i_cshift0_c).
Added $(i_cshift0_c) to gfor_built_specific_src.
Add rule to build from cshift0.m4.
* Makefile.in: Regenerated.
* libgfortran.h: Addedd prototypes for cshift0_i1,
cshift0_i2, cshift0_i4, cshift0_i8, cshift0_i16,
cshift0_r4, cshift0_r8, cshift0_r10, cshift0_r16,
cshift0_c4, cshift0_c8, cshift0_c10, cshift0_c16.
Define Macros GFC_UNALIGNED_C4 and GFC_UNALIGNED_C8.
* intrinsics/cshift0.c: Remove helper functions for
the innter shift loop.
(cshift0): Call specific functions depending on type
of array argument. Only call specific functions for
correct alignment for other types.
* m4/cshift0.m4: New file.
* generated/cshift0_i1.c: New file.
* generated/cshift0_i2.c: New file.
* generated/cshift0_i4.c: New file.
* generated/cshift0_i8:.c New file.
* generated/cshift0_i16.c: New file.
* generated/cshift0_r4.c: New file.
* generated/cshift0_r8.c: New file.
* generated/cshift0_r10.c: New file.
* generated/cshift0_r16.c: New file.
* generated/cshift0_c4.c: New file.
* generated/cshift0_c8.c: New file.
* generated/cshift0_c10.c: New file.
* generated/cshift0_c16.c: New file.
2008-08-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36886
* gfortran.dg/cshift_char_3.f90: New test case.
* gfortran.dg/cshift_nan_1.f90: New test case.
From-SVN: r139111
2008-08-14 20:31:32 +02:00
|
|
|
memcpy (dest, src, size);
|
|
|
|
dest += roffset;
|
|
|
|
src += soffset;
|
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); \
|
re PR fortran/36319 (Segfault with wide characters in DATA)
PR fortran/36319
* intrinsic.c (gfc_convert_chartype): Don't mark conversion
function as pure.
* trans-array.c (gfc_trans_array_ctor_element): Divide element
size by the size of one character to obtain length.
* iresolve.c (gfc_resolve_cshift): Call the _char4 variant when
appropriate.
(gfc_resolve_eoshift): Likewise.
* trans-intrinsic.c (gfc_conv_intrinsic_ctime): Minor beautification.
(gfc_conv_intrinsic_fdate): Minor beautification.
(gfc_conv_intrinsic_ttynam): Minor beautification.
(gfc_conv_intrinsic_minmax_char): Allow all character kinds.
(size_of_string_in_bytes): New function.
(gfc_conv_intrinsic_size): Call size_of_string_in_bytes for
character expressions.
(gfc_conv_intrinsic_sizeof): Likewise.
(gfc_conv_intrinsic_array_transfer): Likewise.
(gfc_conv_intrinsic_trim): Allow all character kinds. Minor
beautification.
(gfc_conv_intrinsic_repeat): Fix comment typo.
* simplify.c (gfc_convert_char_constant): Take care of conversion
of array constructors.
* intrinsics/string_intrinsics_inc.c (string_index): Return
correct value for zero-length substring.
* intrinsics/cshift0.c: Add _char4 variant.
* intrinsics/eoshift0.c (eoshift0): Allow filler to be a pattern
wider than a single byte. Add _char4 variant and use above
functionality.
* intrinsics/eoshift2.c (eoshift2): Likewise.
* m4/eoshift1.m4: Likewise.
* m4/eoshift3.m4: Likewise.
* m4/cshift1.m4: Add _char4 variants.
* gfortran.map (GFORTRAN_1.1): Add _gfortran_cshift0_1_char4,
_gfortran_cshift0_2_char4, _gfortran_cshift0_4_char4,
_gfortran_cshift0_8_char4, _gfortran_cshift1_16_char4,
_gfortran_cshift1_4_char4, _gfortran_cshift1_8_char4,
_gfortran_eoshift0_1_char4, _gfortran_eoshift0_2_char4,
_gfortran_eoshift0_4_char4, _gfortran_eoshift0_8_char4,
_gfortran_eoshift1_16_char4, _gfortran_eoshift1_4_char4,
_gfortran_eoshift1_8_char4, _gfortran_eoshift2_1_char4,
_gfortran_eoshift2_2_char4, _gfortran_eoshift2_4_char4,
_gfortran_eoshift2_8_char4, _gfortran_eoshift3_16_char4,
_gfortran_eoshift3_4_char4 and _gfortran_eoshift3_8_char4.
* generated/eoshift3_4.c: Regenerate.
* generated/eoshift1_8.c: Regenerate.
* generated/eoshift1_16.c: Regenerate.
* generated/cshift1_4.c: Regenerate.
* generated/eoshift1_4.c: Regenerate.
* generated/eoshift3_8.c: Regenerate.
* generated/eoshift3_16.c: Regenerate.
* generated/cshift1_8.c: Regenerate.
* generated/cshift1_16.c: Regenerate.
* gfortran.dg/widechar_5.f90: New file.
* gfortran.dg/widechar_6.f90: New file.
* gfortran.dg/widechar_7.f90: New file.
* gfortran.dg/widechar_intrinsics_5.f90: Uncomment the lines
testing the SPREAD intrinsic.
* gfortran.dg/widechar_intrinsics_6.f90: New file.
* gfortran.dg/widechar_intrinsics_7.f90: New file.
* gfortran.dg/widechar_intrinsics_8.f90: New file.
* gfortran.dg/widechar_intrinsics_9.f90: New file.
* gfortran.dg/widechar_intrinsics_10.f90: New file.
From-SVN: r136129
2008-05-28 23:11:39 +02:00
|
|
|
} \
|
|
|
|
\
|
|
|
|
extern void cshift0_##N##_char4 (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##_char4); \
|
|
|
|
\
|
|
|
|
void \
|
|
|
|
cshift0_##N##_char4 (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 * sizeof (gfc_char4_t)); \
|
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_CSHIFT (1);
|
|
|
|
DEFINE_CSHIFT (2);
|
|
|
|
DEFINE_CSHIFT (4);
|
|
|
|
DEFINE_CSHIFT (8);
|
2008-05-22 23:55:43 +02:00
|
|
|
#ifdef HAVE_GFC_INTEGER_16
|
|
|
|
DEFINE_CSHIFT (16);
|
|
|
|
#endif
|