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

Fix 16bit disasm bug using udis86. Fixes #25 #83

Browse Source
This commit is contained in:
pancake 2013-04-29 09:20:16 +02:00
parent ee72446160
commit 1e325fc5b0
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libr/asm/p/asm_x86.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2013 - nibble */
/* radare - LGPL - Copyright 2009-2013 - pancake, nibble */
#include <stdio.h>
#include <string.h>
@ -44,22 +44,15 @@ static int modify(RAsm *a, ut8 *buf, int field, ut64 val) {
}
static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
static ud_t disasm_obj;
ud_init (&disasm_obj);
ud_set_syntax (&disasm_obj,
a->syntax==R_ASM_SYNTAX_ATT?
static ud_t d;
ud_init (&d);
ud_set_syntax (&d, (a->syntax==R_ASM_SYNTAX_ATT)?
UD_SYN_ATT: UD_SYN_INTEL);
ud_set_input_buffer (&disasm_obj, (uint8_t*) buf, len);
ud_set_pc (&disasm_obj, a->pc);
ud_set_mode (&disasm_obj, a->bits);
/*
disasm_obj.inp_fill = 10;
disasm_obj.inp_curr = 0;
disasm_obj.inp_end = 128; //256;
*/
op->inst_len = ud_disassemble (&disasm_obj);
//op->inst_len = ud_insn_len (&disasm_obj);
snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s", ud_insn_asm (&disasm_obj));
ud_set_input_buffer (&d, (uint8_t*) buf, len);
ud_set_pc (&d, a->pc);
ud_set_mode (&d, a->bits);
op->inst_len = ud_disassemble (&d);
snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s", ud_insn_asm (&d));
if (!op->inst_len || strstr (op->buf_asm, "invalid"))
op->inst_len = -1;
if (op->inst_len<1)

2
shlr/udis86/syn-intel.c
View File

@ -92,7 +92,7 @@ static void gen_operand(struct ud* u, struct ud_operand* op, int syn_cast)
case UD_OP_JIMM:
ud_syn_print_addr(u, ud_syn_rel_target(u, op, 0));
ud_syn_print_addr(u, ud_syn_rel_target(u, op, 1));
break;
case UD_OP_PTR: