* cpu-ia64-opc.c (ext_imms_scaled): Don't sign extend using shifts.

	(ins_imms, ins_immsm1u4): Likewise.  Warning fix.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f2e5665b982937ea2bf2e4f9f29f60e44031c503..47e0038fbf1975fe0e966e5b3b4c3a5b62b4c68e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-30  Alan Modra  <amodra@bigpond.net.au>
+
+       * cpu-ia64-opc.c (ext_imms_scaled): Don't sign extend using shifts.
+       (ins_imms, ins_immsm1u4): Likewise.  Warning fix.
+
 2003-06-29  Alan Modra  <amodra@bigpond.net.au>
 
        * archive.c: Convert to C90, remove unnecessary prototypes and casts.

diff --git a/bfd/cpu-ia64-opc.c b/bfd/cpu-ia64-opc.c
index 1025256490e568d3a578e2409dc54723189d5687..3cafb9f14d9f090ba1b54751c84fb53fbf705335 100644 (file)
--- a/bfd/cpu-ia64-opc.c
+++ b/bfd/cpu-ia64-opc.c
@@ -161,8 +161,8 @@ static const char*
 ext_imms_scaled (const struct ia64_operand *self, ia64_insn code,
                 ia64_insn *valuep, int scale)
 {
-  int i, bits = 0, total = 0, shift;
-  BFD_HOST_64_BIT val = 0;
+  int i, bits = 0, total = 0;
+  BFD_HOST_64_BIT val = 0, sign;
 
   for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
     {
@@ -172,8 +172,8 @@ ext_imms_scaled (const struct ia64_operand *self, ia64_insn code,
       total += bits;
     }
   /* sign extend: */
-  shift = 8*sizeof (val) - total;
-  val = (val << shift) >> shift;
+  sign = (BFD_HOST_64_BIT) 1 << (total - 1);
+  val = (val ^ sign) - sign;
 
   *valuep = (val << scale);
   return 0;
@@ -188,10 +188,7 @@ ins_imms (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
 static const char*
 ins_immsu4 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
 {
-  if (value == (BFD_HOST_U_64_BIT) 0x100000000)
-    value = 0;
-  else
-    value = (((BFD_HOST_64_BIT)value << 32) >> 32);
+  value = ((value & 0xffffffff) ^ 0x80000000) - 0x80000000;
 
   return ins_imms_scaled (self, value, code, 0);
 }
@@ -213,10 +210,7 @@ static const char*
 ins_immsm1u4 (const struct ia64_operand *self, ia64_insn value,
              ia64_insn *code)
 {
-  if (value == (BFD_HOST_U_64_BIT) 0x100000000)
-    value = 0;
-  else
-    value = (((BFD_HOST_64_BIT)value << 32) >> 32);
+  value = ((value & 0xffffffff) ^ 0x80000000) - 0x80000000;
 
   --value;
   return ins_imms_scaled (self, value, code, 0);