2010-03-13 Segher Boessenkool <segher@kernel.crashing.org>

        * config/tc-v850.c (v850_insert_operand): Handle out-of-range
        assembler constants on 64-bit hosts.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4ff6ed348553203bef43a24191998e50a0d8f156..32b0da6500b6e9dab54aad5a2ff167e94ed57804 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-13  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       * config/tc-v850.c (v850_insert_operand): Handle out-of-range
+       assembler constants on 64-bit hosts.
+
 2010-03-10  Mike Frysinger  <michael.frysinger@analog.com>
 
        * bfin-defs.h, bfin-lex.l, bfin-parse.y, tc-bfin.c, tc-bfin.h:

diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c
index c6c343940af4665a60eff8cc60cf8d9cd7b7e6b3..e0ac162279a1068d1ff279f982484a7431d34894 100644 (file)
--- a/gas/config/tc-v850.c
+++ b/gas/config/tc-v850.c
@@ -1536,7 +1536,24 @@ v850_insert_operand (unsigned long insn,
                min = 0;
            }
 
-         if (val < (offsetT) min || val > (offsetT) max)
+         /* Some people write constants with the sign extension done by
+            hand but only up to 32 bits.  This shouldn't really be valid,
+            but, to permit this code to assemble on a 64-bit host, we
+            sign extend the 32-bit value to 64 bits if so doing makes the
+            value valid.  */
+         if (val > max
+             && (offsetT) (val - 0x80000000 - 0x80000000) >= min
+             && (offsetT) (val - 0x80000000 - 0x80000000) <= max)
+           val = val - 0x80000000 - 0x80000000;
+
+         /* Similarly, people write expressions like ~(1<<15), and expect
+            this to be OK for a 32-bit unsigned value.  */
+         else if (val < min
+                  && (offsetT) (val + 0x80000000 + 0x80000000) >= min
+                  && (offsetT) (val + 0x80000000 + 0x80000000) <= max)
+           val = val + 0x80000000 + 0x80000000;
+
+         else if (val < (offsetT) min || val > (offsetT) max)
            {
              char buf [128];