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

fixing m68k branch disasm bug

Browse Source 
16bit displacement must be signed, but were unsigned. I've converted the
branch variants to 8/16/32bit signed casts rather than duplicating the
8bit ISBITSET() special case.
This commit is contained in:
Anders Kaare 2016-04-04 17:24:55 +02:00 committed by pancake
parent 8615a6a7c6
commit cb2d45e491
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libr/asm/arch/m68k/m68k_disasm/m68k_disasm.c
View File

@ -913,22 +913,19 @@ static void opcode_branch(dis_buffer_t *dbuf, ut16 opc)
make_cond(dbuf,11,"b");
addchar('.');
disp = BITFIELD(opc,7,0);
disp = (st8)BITFIELD(opc,7,0);
if (disp == 0) {
/* 16-bit signed displacement */
disp = read16(dbuf->val + 1);
disp = (st16)read16(dbuf->val + 1);
dbuf->used++;
addchar('w');
} else if (disp == 0xff) {
} else if (disp == -1) {
/* 32-bit signed displacement */
disp = read32(dbuf->val + 1);
disp = (st32)read32(dbuf->val + 1);
dbuf->used += 2;
addchar('l');
} else {
/* 8-bit signed displacement in opcode. */
/* Needs to be sign-extended... */
if (ISBITSET(disp,7))
disp -= 256;
/* 8-bit signed displacement */
addchar('b');
}
addchar('\t');