Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-07 22:36:52 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #3921 - do not show dupped instructions with asm.nodup

Browse Source
This commit is contained in:
pancake 2016-01-10 22:30:10 +01:00
parent ce7fe3bc3c
commit 5ed63681b4
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/core/config.c
View File

@ -1440,6 +1440,7 @@ R_API int r_core_config_init(RCore *core) {
SETI("asm.indentspace", 2, "How many spaces to indent the code");
SETPREF("asm.dwarf", "false", "Show dwarf comment at disassembly");
SETPREF("asm.esil", "false", "Show ESIL instead of mnemonic");
SETPREF("asm.nodup", "false", "Do not show dupped instructions (collapse disasm)");
SETPREF("asm.emu", "false", "Run ESIL emulation analysis on disasm");
SETPREF("asm.emuwrite", "false", "Allow asm.emu to modify memory (WARNING)");
SETPREF("asm.filter", "true", "Replace numeric values by flags (e.g. 0x4003e0 -> sym.imp.printf)");

28
libr/core/disasm.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2015 - nibble, pancake, dso */
/* radare - LGPL - Copyright 2009-2016 - nibble, pancake, dso */
#include "r_core.h"
#include "r_cons.h"
@ -169,6 +169,10 @@ typedef struct r_disam_options_t {
int len;
int maxrefs;
char *prev_ins;
bool prev_ins_eq;
bool show_nodup;
} RDisasmState;
static void handle_reflines_init (RAnal *anal, RDisasmState *ds);
@ -281,6 +285,7 @@ static RDisasmState * handle_init_ds (RCore * core) {
ds->color_gui_border = P(gui_border): Color_BGGRAY;
ds->use_esil = r_config_get_i (core->config, "asm.esil");
ds->show_nodup = r_config_get_i (core->config, "asm.nodup");
ds->show_color = r_config_get_i (core->config, "scr.color");
ds->colorop = r_config_get_i (core->config, "scr.colorops");
ds->show_utf8 = r_config_get_i (core->config, "scr.utf8");
@ -1023,6 +1028,20 @@ static int perform_disassembly(RCore *core, RDisasmState *ds, ut8 *buf, int len)
int ret = r_asm_disassemble (core->assembler, &ds->asmop, buf, len);
if (ds->asmop.size < 1) ds->asmop.size = 1;
if (ds->show_nodup) {
if (ds->prev_ins && !strcmp (ds->prev_ins, ds->asmop.buf_asm)) {
if (!ds->prev_ins_eq) {
r_cons_printf ("...\n");
}
ds->prev_ins_eq = true;
return -31337;
}
ds->prev_ins_eq = false;
if (ds->prev_ins) {
R_FREE (ds->prev_ins);
}
ds->prev_ins = strdup (ds->asmop.buf_asm);
}
ds->oplen = ds->asmop.size;
if (ret < 1) {
@ -2472,6 +2491,10 @@ toro:
}
handle_show_comments_right (core, ds);
ret = perform_disassembly (core, ds, buf+idx, len-idx);
if (ret == -31337) {
inc = ds->oplen;
continue;
}
if (ds->retry) {
ds->retry = 0;
goto retry;
@ -2571,8 +2594,7 @@ toro:
free (ds->refline2);
ds->line = ds->refline = ds->refline2 = NULL;
}
free (ds->opstr);
ds->opstr = NULL;
R_FREE (ds->opstr);
inc = ds->oplen;
if (ds->midflags == R_MIDFLAGS_REALIGN && skip_bytes)
inc = skip_bytes;