d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle ldr pc, [reg] in branch_taken().

Browse Source 
Obtained from:	NetBSD
MFC after:	3 days
This commit is contained in:
Olivier Houchard 2008-08-03 01:53:14 +00:00
parent 697292d902
commit fcfc49979c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arm/arm/db_interface.c
View File

@ -294,7 +294,7 @@ db_fetch_reg(int reg)
u_int
branch_taken(u_int insn, db_addr_t pc)
{
u_int addr, nregs;
u_int addr, nregs, offset = 0;
switch ((insn >> 24) & 0xf) {
case 0xa: /* b ... */
@ -311,6 +311,17 @@ branch_taken(u_int insn, db_addr_t pc)
case 0x1: /* mov pc, reg */
addr = db_fetch_reg(insn & 0xf);
return (addr);
case 0x5: /* ldr pc, [reg] */
addr = db_fetch_reg((insn >> 16) & 0xf);
/* ldr pc, [reg, #offset] */
if (insn & (1 << 24))
offset = insn & 0xfff;
if (insn & 0x00800000)
addr += offset;
else
addr -= offset;
db_read_bytes(addr, 4, (char *)&addr);
return (addr);
case 0x8: /* ldmxx reg, {..., pc} */
case 0x9:
addr = db_fetch_reg((insn >> 16) & 0xf);