From 43ff4e9aa3075d4eab3c74b4bc510a9cde17c313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Schl=C3=BCter?= <tobi@gcc.gnu.org>
Date: Wed, 8 Feb 2006 00:52:37 +0100
Subject: [PATCH] re PR libfortran/25577 (gfortran routine mvbits returns wrong
answer.)
libgfortran/
2006-02-07 Dale Ranta <dir@lanl.gov>
PR fortran/25577
* intrinsics/mvbits.c: Shift '(TYPE)1' type when building 'lenmask'.
testsuite/
2006-02-07 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/25577
* gfortran.dg/mvbits_1.f90: New.
Also fixed Dirk Mueller's preceding ChangeLog entry.
From-SVN: r110728
---
gcc/testsuite/ChangeLog | 9 ++++--
gcc/testsuite/gfortran.dg/mvbits_1.f90 | 39 ++++++++++++++++++++++++++
libgfortran/ChangeLog | 5 ++++
libgfortran/intrinsics/mvbits.c | 4 +--
4 files changed, 53 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/mvbits_1.f90
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b0b39a317421..4c5dc8f206cc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,12 @@
+2006-02-07 Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de>
+
+ PR fortran/25577
+ * gfortran.dg/mvbits_1.f90: New.
+
2006-02-07 Dirk Mueller <dmueller@suse.com>
- g++.dg/warn/Wdiv-by-zero.C: New test.
- g++.dg/warn/Wno-div-by-zero.C: New.
+ * g++.dg/warn/Wdiv-by-zero.C: New test.
+ * g++.dg/warn/Wno-div-by-zero.C: New.
2006-02-07 Jeff Law <law@redhat.com>
diff --git a/gcc/testsuite/gfortran.dg/mvbits_1.f90 b/gcc/testsuite/gfortran.dg/mvbits_1.f90
new file mode 100644
index 000000000000..90e92bb0e265
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/mvbits_1.f90
@@ -0,0 +1,39 @@
+! PR 25577
+! MVBITS didn't work correctly for integer types wider than a C int
+! The testcase is based on the one Dale Ranta posted in the bug report
+implicit none
+integer(1) i1,j1
+integer(2) i2,j2
+integer(4) i4,j4
+integer(8) i8,j8
+integer ibits,n
+
+ibits=bit_size(1_1)
+do n=1,ibits
+ i1=-1
+ call mvbits(1_1, 0,n,i1,0)
+ j1=-1-2_1**n+2
+ if(i1.ne.j1)call abort
+enddo
+ibits=bit_size(1_2)
+do n=1,ibits
+ i2=-1
+ call mvbits(1_2, 0,n,i2,0)
+ j2=-1-2_2**n+2
+ if(i2.ne.j2)call abort
+enddo
+ibits=bit_size(1_4)
+do n=1,ibits
+ i4=-1
+ call mvbits(1_4, 0,n,i4,0)
+ j4=-1-2_4**n+2
+ if(i4.ne.j4)call abort
+enddo
+ibits=bit_size(1_8)
+do n=1,ibits
+ i8=-1
+ call mvbits(1_8, 0,n,i8,0)
+ j8=-1-2_8**n+2
+ if(i8.ne.j8)call abort
+enddo
+end
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index a48b5d800686..8517787a1a77 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-07 Dale Ranta <dir@lanl.gov>
+
+ PR fortran/25577
+ * intrinsics/mvbits.c: Shift '(TYPE)1' type when building 'lenmask'.
+
2006-02-07 Rainer Emrich <r.emrich@de.tecosim.com>
* intrinsics/c99_functions.c: Work around incompatible
diff --git a/libgfortran/intrinsics/mvbits.c b/libgfortran/intrinsics/mvbits.c
index 6bfb5cad85bf..a452fc98b3f7 100644
--- a/libgfortran/intrinsics/mvbits.c
+++ b/libgfortran/intrinsics/mvbits.c
@@ -1,5 +1,5 @@
/* Implementation of the MVBITS intrinsic
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006 Free Software Foundation, Inc.
Contributed by Tobias Schlأ¼ter
This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -48,7 +48,7 @@ SUB_NAME (const TYPE *from, const GFC_INTEGER_4 *frompos,
{
TYPE oldbits, newbits, lenmask;
- lenmask = (*len == sizeof (TYPE)*8) ? ~(TYPE)0 : (1 << *len) - 1;
+ lenmask = (*len == sizeof (TYPE)*8) ? ~(TYPE)0 : ((TYPE)1 << *len) - 1;
newbits = (((UTYPE)(*from) >> *frompos) & lenmask) << *topos;
oldbits = *to & (~(lenmask << *topos));
--
GitLab