diff options
| author | Thomas Koenig <Thomas.Koenig@online.de> | 2006-03-25 21:15:48 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2006-03-25 21:15:48 +0000 |
| commit | 9a0fb43ea1f6aabf4668d4ad3faf76c2da4d8647 (patch) | |
| tree | ecdfff8b892396495441f76b77c91589555fd96d /gcc | |
| parent | fe1f8f442ef9952650c38ae0383498d41965775c (diff) | |
| download | gcc-9a0fb43ea1f6aabf4668d4ad3faf76c2da4d8647.zip gcc-9a0fb43ea1f6aabf4668d4ad3faf76c2da4d8647.tar.gz gcc-9a0fb43ea1f6aabf4668d4ad3faf76c2da4d8647.tar.bz2 | |
re PR fortran/26769 (Implement transpose() and reshape() for real instead of using integer)
2006-03-25 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/26769
* iresolve.c (gfc_resolve_reshape): Remove doubling of
kind for complex. For real(kind=10), call reshape_r10.
(gfc_resolve_transpose): For real(kind=10), call
transpose_r10.
2006-03-25 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/26769
* Makefile.am: Add transpose_r10.c and reshape_r10.c.
* aclocal.m4: Regenerate using aclocal 1.9.3.
* Makefile.in: Regenerate using automake 1.9.3.
* m4/iparm.m4 (rtype_ccode): If rtype_letter is `i',
evaluate to rtype_kind, otherwise to rtype_code.
* generated/transpose_r10.c: Add.
* generated/reshape_r10.c: Add.
2006-03-25 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/26769
* gfortran.dg/transpose_reshape_r10.f90: New test case.
From-SVN: r112381
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/transpose_reshape_r10.f90 | 12 |
4 files changed, 41 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 52a55c6..5937e09a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2006-03-25 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/26769 + * iresolve.c (gfc_resolve_reshape): Remove doubling of + kind for complex. For real(kind=10), call reshape_r10. + (gfc_resolve_transpose): For real(kind=10), call + transpose_r10. + 2006-03-25 Roger Sayle <roger@eyesopen.com> * dependency.c (gfc_check_dependency): Improve handling of pointers; diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index df562f7..a517994 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -1499,9 +1499,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape, switch (source->ts.type) { case BT_COMPLEX: - kind = source->ts.kind * 2; - break; - case BT_REAL: case BT_INTEGER: case BT_LOGICAL: @@ -1523,6 +1520,10 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape, f->value.function.name = gfc_get_string (PREFIX("reshape_%c%d"), gfc_type_letter (BT_COMPLEX), source->ts.kind); + else if (source->ts.type == BT_REAL && kind == 10) + f->value.function.name = + gfc_get_string (PREFIX("reshape_%c%d"), + gfc_type_letter (BT_REAL), source->ts.kind); else f->value.function.name = gfc_get_string (PREFIX("reshape_%d"), source->ts.kind); @@ -1987,8 +1988,19 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix) gfc_get_string (PREFIX("transpose_c%d"), kind); break; - case BT_INTEGER: case BT_REAL: + /* There is no kind=10 integer type. We need to + call the real version. */ + if (kind == 10) + { + f->value.function.name = + gfc_get_string (PREFIX("transpose_r%d"), kind); + break; + } + + /* Fall through */ + + case BT_INTEGER: case BT_LOGICAL: /* Use the integer routines for real and logical cases. This assumes they all have the same alignment requirements. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f9c591c..fc7b98d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-25 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/26769 + * gfortran.dg/transpose_reshape_r10.f90: New test case. + 2006-03-25 Uros Bizjak <uros@kss-loka.si> PR middle-end/26717 diff --git a/gcc/testsuite/gfortran.dg/transpose_reshape_r10.f90 b/gcc/testsuite/gfortran.dg/transpose_reshape_r10.f90 new file mode 100644 index 0000000..83da8fa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/transpose_reshape_r10.f90 @@ -0,0 +1,12 @@ +! { dg-do run } +! { dg-require-effective-target fortran_large_real } +program main + integer,parameter :: k = selected_real_kind (precision (0.0_8) + 1) + character(len=90) line + real(k) :: a(3,3) + real(k) :: b(9) + a = 1.0_k + a(1,3) = 0.0_k + write (line,'(9G10.6)') transpose(a) + write (line,'(9G10.6)') reshape(a,shape(b)) +end |