From: Daniel Jacobowitz <drow@false.org>
Date: Tue, 9 Mar 2004 15:44:26 +0000 (+0000)
Subject: 	* arm-tdep.c (thumb_get_next_pc): Handle Thumb BLX.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa17d93ef598c597538deaa8f19217ee8ca0ec26;p=binutils-gdb.git

	* arm-tdep.c (thumb_get_next_pc): Handle Thumb BLX.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 52df7690be4..56fc35d9194 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-09  Daniel Jacobowitz  <drow@mvista.com>
+
+	* arm-tdep.c (thumb_get_next_pc): Handle Thumb BLX.
+
 2004-03-08  Nathan J. Williams  <nathanw@wasabisystems.com>
 
 	* MAINTAINERS (write after approval): Add myself.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 06bfcb612e4..05c0f23d035 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1651,13 +1651,16 @@ thumb_get_next_pc (CORE_ADDR pc)
     {
       nextpc = pc_val + (sbits (inst1, 0, 10) << 1);
     }
-  else if ((inst1 & 0xf800) == 0xf000)	/* long branch with link */
+  else if ((inst1 & 0xf800) == 0xf000)	/* long branch with link, and blx */
     {
       unsigned short inst2 = read_memory_integer (pc + 2, 2);
       offset = (sbits (inst1, 0, 10) << 12) + (bits (inst2, 0, 10) << 1);
       nextpc = pc_val + offset;
+      /* For BLX make sure to clear the low bits.  */
+      if (bits (inst2, 11, 12) == 1)
+	nextpc = nextpc & 0xfffffffc;
     }
-  else if ((inst1 & 0xff80) == 0x4700)	/* branch and exchange (bx) */
+  else if ((inst1 & 0xff00) == 0x4700)	/* bx REG, blx REG */
     {
       if (bits (inst1, 3, 6) == 0x0f)
 	nextpc = pc_val;