From: Daniel Jacobowitz <drow@false.org>
Date: Fri, 26 Feb 2010 20:45:33 +0000 (+0000)
Subject: 	* arm-tdep.c (thumb_get_next_pc): Correct conditional branch opcode.
X-Git-Tag: gdb_7_1-2010-03-18-release~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ba6b38da74c6cb10c28ea82e4f63ba8de89386;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab548dcd59e..4d33c022d8c 100644
--- 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-24  Pedro Alves  <pedro@codesourcery.com>
 	    Stan Shebs  <stan@codesourcery.com>
 
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 524e4ace2c0..b932c81e0b2 100644
--- 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))