* mips-tdep.c (mips32_relative_offset): Change return type to

LONGEST, change argument type to ULONGEST.  Fix sign-extension.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 36694a3..386d9f7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  Mark Kettenis  <kettenis@gnu.org>
+
+       * mips-tdep.c (mips32_relative_offset): Change return type to
+       LONGEST, change argument type to ULONGEST.  Fix sign-extension.
+
 2004-11-10  Randolph Chung  <tausq@debian.org>
 
        * hppa-tdep.c (hppa32_register_name, hppa64_register_name): Make static.

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 7ad78da..487e3da 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -878,17 +878,10 @@ mips_fetch_instruction (CORE_ADDR addr)
 #define rtype_shamt(x) ((x >> 6) & 0x1f)
 #define rtype_funct(x) (x & 0x3f)
 
-static CORE_ADDR
-mips32_relative_offset (unsigned long inst)
+static LONGEST
+mips32_relative_offset (ULONGEST inst)
 {
-  long x;
-  x = itype_immediate (inst);
-  if (x & 0x8000)              /* sign bit set */
-    {
-      x |= 0xffff0000;         /* sign extension */
-    }
-  x = x << 2;
-  return x;
+  return ((itype_immediate (inst) ^ 0x8000) - 0x8000) << 2;
 }
 
 /* Determine whate to set a single step breakpoint while considering