From: Roman Zippel <zippel@linux-m68k.org>
Date: Fri, 31 Aug 2001 22:54:19 +0000 (+0000)
Subject: expmed.c (store_bit_field): Update to patch from 2001-08-27: move adjustment of bitpo... 
X-Git-Tag: prereleases/libstdc++-3.0.95~2306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57bfa49ae1ca6b049392285801bb1438e38a911a;p=thirdparty%2Fgcc.git

expmed.c (store_bit_field): Update to patch from 2001-08-27: move adjustment of bitpos instead.

        * expmed.c (store_bit_field): Update to patch from 2001-08-27:
        move adjustment of bitpos instead.

From-SVN: r45338
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77be0dc794fc..e03aa816e481 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-30  Roman Zippel  <zippel@linux-m68k.org>
+
+	* expmed.c (store_bit_field): Update to patch from 2001-08-27:
+	move adjustment of bitpos instead.
+
 2001-08-31  Zack Weinberg  <zack@codesourcery.com>
 
 	* function.c: Remove all_functions.  Make outer_function_chain
diff --git a/gcc/expmed.c b/gcc/expmed.c
index af5e56fdd757..8bc66b27cd4f 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -330,14 +330,6 @@ store_bit_field (str_rtx, bitsize, bitnum, fieldmode, value, align, total_size)
       op0 = SUBREG_REG (op0);
     }
 
-  /* If OP0 is a register, BITPOS must count within a word.
-     But as we have it, it counts within whatever size OP0 now has.
-     On a bigendian machine, these are not the same, so convert.  */
-  if (BYTES_BIG_ENDIAN
-      && GET_CODE (op0) != MEM
-      && unit > GET_MODE_BITSIZE (GET_MODE (op0)))
-    bitpos += unit - GET_MODE_BITSIZE (GET_MODE (op0));
-
   value = protect_from_queue (value, 0);
 
   if (flag_force_mem)
@@ -350,7 +342,7 @@ store_bit_field (str_rtx, bitsize, bitnum, fieldmode, value, align, total_size)
      done with a simple store.  For targets that support fast unaligned
      memory, any naturally sized, unit aligned field can be done directly.  */
      
-  if (bitnum == 0
+  if (bitpos == 0
       && bitsize == GET_MODE_BITSIZE (fieldmode)
       && (GET_CODE (op0) != MEM
 	  ? (GET_MODE_SIZE (fieldmode) >= UNITS_PER_WORD
@@ -401,6 +393,14 @@ store_bit_field (str_rtx, bitsize, bitnum, fieldmode, value, align, total_size)
       }
   }
 
+  /* If OP0 is a register, BITPOS must count within a word.
+     But as we have it, it counts within whatever size OP0 now has.
+     On a bigendian machine, these are not the same, so convert.  */
+  if (BYTES_BIG_ENDIAN
+      && GET_CODE (op0) != MEM
+      && unit > GET_MODE_BITSIZE (GET_MODE (op0)))
+    bitpos += unit - GET_MODE_BITSIZE (GET_MODE (op0));
+
   /* Storing an lsb-aligned field in a register
      can be done with a movestrict instruction.  */