OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Jacobowitz 2004-03-09 15:44:26 +00:00
parent 58670637de
commit aa17d93ef5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -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.

7
gdb/arm-tdep.c
View File

@ -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;