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

Fix #580 - Incorrect ARM far branch (applied @kikuchan patch)

Browse Source
This commit is contained in:
pancake 2014-01-28 17:14:33 +01:00
parent 73b884ae59
commit 809de9cd9c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,10 +598,14 @@ static int arm_assemble(ArmOpcode *ao, const char *str) {
case TYPE_BRA:
if ((ret = getreg (ao->a[0])) == -1) {
// TODO: control if branch out of range
ret = (getnum(ao->a[0])-ao->off-8)/4;
ret = (getnum(ao->a[0])-(int)ao->off-8)/4;
if (ret >= 0x00800000 || ret < (int)0xff800000) {
printf("Branch into out of range\n");
return 0;
}
ao->o |= ((ret>>16)&0xff)<<8;
ao->o |= ((ret>>8)&0xff)<<16;
ao->o |= ((ret)&0xff)<<24;
if (ret<0) ao->o |= (0xff<<8); // MAKE IT NEGATIVE!
} else {
printf("This branch does not accept reg as arg\n");
return 0;