dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dkreuter's fix for ARM's gnu disassembler

This commit is contained in:
pancake 2012-10-25 13:10:33 +02:00
parent 1e52015eee
commit ded886e371
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -14,6 +14,7 @@ Contributors: (sorted by length)
- schrotthaufen
- elektranox
- neuroflip
- dkreuter
- rvalles
- esteve
- capi_x

8
libr/asm/arch/arm/gnu/arm-dis.c
View File

@ -4099,7 +4099,7 @@ is_thumb = (info->bytes_per_line == 2)?1:0;
info->bytes_per_chunk = 2;
size = 2;
status = info->read_memory_func (pc, (bfd_byte *)b, 2, info);
status = info->read_memory_func (pc, (bfd_byte *)b, 4, info);
if (little)
given = (b[0]) | (b[1] << 8);
else
@ -4113,11 +4113,11 @@ is_thumb = (info->bytes_per_line == 2)?1:0;
|| (given & 0xF800) == 0xF000
|| (given & 0xF800) == 0xE800)
{
status = info->read_memory_func (pc + 2, (bfd_byte *)b, 2, info);
//status = info->read_memory_func (pc + 2, (bfd_byte *)b, 2, info);
if (little)
given = (b[0]) | (b[1] << 8) | (given << 16);
given = (b[2]) | (b[3] << 8) | (given << 16);
else
given = (b[1]) | (b[0] << 8) | (given << 16);
given = (b[3]) | (b[2] << 8) | (given << 16);
printer = print_insn_thumb32;
size = 4;