Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-16 02:28:12 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove | in asm.bbline and fix some glitches when no analysis found

Browse Source
This commit is contained in:
pancake 2017-05-20 14:37:51 +02:00
parent 642062d58e
commit 70852bb66f
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libr/core/disasm.c
View File

@ -3070,16 +3070,15 @@ static void ds_print_esil_anal_fini(RDisasmState *ds) {
}
}
static void ds_print_bbline(RDisasmState *ds) {
if (ds->show_bbline && ds->fcn && r_anal_fcn_bbget (ds->fcn, ds->at)) {
ds->bblined = true;
static void ds_print_bbline(RDisasmState *ds, bool force) {
if (ds->show_bbline && (force || (ds->fcn && r_anal_fcn_bbget (ds->fcn, ds->at)))) {
ds_setup_print_pre (ds, false, false);
ds_update_ref_lines (ds);
if (!ds->linesright && ds->show_lines && ds->line) {
r_cons_printf ("%s%s%s", COLOR (ds, color_flow),
ds->refline2, COLOR_RESET (ds));
}
r_cons_printf("|\n");
r_cons_printf ("\n");
}
}
@ -3664,7 +3663,7 @@ toro:
ds->analop.ptr = ds->hint->ptr;
}
}
ds_print_bbline (ds);
ds_print_bbline (ds, false);
if (ds->at >= addr) {
r_print_set_rowoff (core->print, ds->lines, ds->at - addr);
}
@ -3753,8 +3752,7 @@ toro:
}
r_cons_newline ();
if (ds->show_bbline && !ds->bblined) {
bool showBBLine = false;
if (ds->show_bbline && !ds->bblined && !ds->fcn) {
switch (ds->analop.type) {
case R_ANAL_OP_TYPE_MJMP:
case R_ANAL_OP_TYPE_UJMP:
@ -3764,18 +3762,9 @@ toro:
case R_ANAL_OP_TYPE_CJMP:
case R_ANAL_OP_TYPE_JMP:
case R_ANAL_OP_TYPE_RET:
showBBLine = true;
ds_print_bbline (ds, true);
break;
}
if (showBBLine) {
ds_setup_print_pre (ds, false, false);
ds_update_ref_lines (ds);
if (!ds->linesright && ds->show_lines && ds->line) {
r_cons_printf ("%s%s%s", COLOR (ds, color_flow),
ds->refline2, COLOR_RESET (ds));
}
r_cons_printf("|\n");
}
}
if (ds->line) {
if (ds->show_lines_ret && ds->analop.type == R_ANAL_OP_TYPE_RET) {
@ -4567,7 +4556,7 @@ R_API int r_core_print_fcn_disasm(RPrint *p, RCore *core, ut64 addr, int l, int
R_FREE (ds->refline);
R_FREE (ds->refline2);
}
ds_print_bbline (ds);
ds_print_bbline (ds, false);
bb_size_consumed += ds->oplen;
ds->index += ds->oplen;