Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-27 00:05:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Handle numeric values for ldr rN, [rN, N]

Browse Source 
does not handle special cases with values ending in 0, 4, 8
This commit is contained in:
Sven Steinbauer 2016-11-11 19:06:23 +00:00
parent 26cdbfdbdc
commit 9eb8802a0e
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,10 +568,26 @@ static int thumb_assemble(ArmOpcode *ao, ut64 off, const char *str) {
int a1 = getreg (ao->a[1]);
int a2 = getreg (ao->a[2]);
if (a2 == -1) {
// ldr r0, [rN]
ao->o = 0x68;
ao->o |= (7 & a0) << 8;
ao->o |= (7 & a1) << 11;
int num= getnum (ao->a[2]);
if (num > 0) {
if (num >= 0x1000) {
return -1;
}
// ldr r0, [rN, num]
// Separate out hundreds
int h = num >> 8;
num &= 0xff;
ao->o = (0xd0 | a1) << 24;
ao->o |= 0xf8 << 16;
ao->o |= num << 8;
ao->o |= a0 << 4;
ao->o |= h;
} else {
// ldr r0, [rN]
ao->o = 0x68;
ao->o |= (7 & a0) << 8;
ao->o |= (7 & a1) << 11;
}
} else {
ao->o = 0x58; // | (8+(0xf & a0));
ao->o |= (7 & a0) << 8;