* arm-tdep.c (thumb_get_next_pc): Correct conditional branch opcode.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 554b743ffbc44a482add3476b80e1ffcc0690bb0..1e16950a14dc65c6e5b74f6f4c1474db4c7452d2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * arm-tdep.c (thumb_get_next_pc): Correct conditional branch opcode.
+
 2010-02-26  Pedro Alves  <pedro@codesourcery.com>
 
        * NEWS: Add "New targets" section, and mention ARM Symbian

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 524e4ace2c0a43902913a039dbb714c2a392bcf6..b932c81e0b2d038331a26c51ad56f75c98ae1319 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2503,7 +2503,7 @@ thumb_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
              nextpc = get_frame_register_unsigned (frame, ARM_LR_REGNUM);
              nextpc -= inst2 & 0x00ff;
            }
-         else if ((inst2 & 0xd000) == 0xc000 && (inst1 & 0x0380) != 0x0380)
+         else if ((inst2 & 0xd000) == 0x8000 && (inst1 & 0x0380) != 0x0380)
            {
              /* Conditional branch.  */
              if (condition_true (bits (inst1, 6, 9), status))