From Maciej W. Rozycki <macro@mips.com>:

	* mips-tdep.c (mips32_next_pc): Check the register's contents,
	not its number for BLEZ/BLEZL and BGTZ/BGTZL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e8fa592..d4244e3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-07  Daniel Jacobowitz  <dan@debian.org>
+
+       From Maciej W. Rozycki  <macro@mips.com>:
+       * mips-tdep.c (mips32_next_pc): Check the register's contents,
+       not its number for BLEZ/BLEZL and BGTZ/BGTZL.
+
 2004-10-07  Kei Sakamoto  <sakamoto.kei@renesas.com>
 
        * m32r-tdep.c (decode_prologue): Support functions written

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 05f823e..fffc70d 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -1167,7 +1167,7 @@ mips32_next_pc (CORE_ADDR pc)
            pc += 8;
          break;
        case 6:         /* BLEZ, BLEZL */
-         if (read_signed_register (itype_rs (inst) <= 0))
+         if (read_signed_register (itype_rs (inst)) <= 0)
            pc += mips32_relative_offset (inst) + 4;
          else
            pc += 8;
@@ -1175,7 +1175,7 @@ mips32_next_pc (CORE_ADDR pc)
        case 7:
        default:
        greater_branch: /* BGTZ, BGTZL */
-         if (read_signed_register (itype_rs (inst) > 0))
+         if (read_signed_register (itype_rs (inst)) > 0)
            pc += mips32_relative_offset (inst) + 4;
          else
            pc += 8;