Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-11 23:16:05 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix BL for arm thumb (#6968)

Browse Source
This commit is contained in:
Simone Ferrini 2017-03-09 23:47:03 +01:00 committed by radare
parent e8f80a165c
commit 781b3fc58e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libr/asm/arch/arm/armass.c
View File

@ -494,13 +494,17 @@ static int thumb_assemble(ArmOpcode *ao, ut64 off, const char *str) {
return 4;
} else
if (!strcmpnull (ao->op, "bl")) {
int reg = getreg (ao->a[0]);
ao->o = 0x47;
if (reg == -1) {
ao->o |= getnum (ao->a[0]) << 8;
} else {
return 0;
}
int high, low;
high = low = (getnum (ao->a[0]) - 4);
high &= 0x7FFFFF;
high >>= 12;
high |= 0xF000;
low &= 0xFFF;
low >>= 1;
low |= 0xF800;
ao->o = low;
ao->o |= (high << 16);
thumb_swap (&ao->o);
// XXX: length = 4
return 4;
} else