Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-27 08:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix line highlighting of 2-operand insn (#9949)

Browse Source
This commit is contained in:
Khairul Azhar Kasmiran 2018-04-25 00:03:14 +08:00 committed by radare
parent a129fe433a
commit 94605e3e67
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libr/core/disasm.c
View File

@ -311,6 +311,7 @@ static void ds_print_str(RDisasmState *ds, const char *str, int len, ut64 refadd
static char *ds_sub_jumps(RDisasmState *ds, char *str);
static void ds_start_line_highlight(RDisasmState *ds);
static void ds_end_line_highlight(RDisasmState *ds);
static bool line_highlighted(RDisasmState *ds);
static ut64 p2v(RDisasmState *ds, ut64 addr) {
#if 0
@ -838,7 +839,7 @@ static char *colorize_asm_string(RCore *core, RDisasmState *ds, bool print_color
char *spacer = NULL;
char *source = ds->opstr? ds->opstr: ds->asmop.buf_asm;
char *hlstr = r_meta_get_string (ds->core->anal, R_META_TYPE_HIGHLIGHT, ds->at);
bool partial_reset = hlstr ? (*hlstr?true:false):false;
bool partial_reset = line_highlighted (ds) ? true : ((hlstr && *hlstr) ? true : false);
if (!ds->show_color || !ds->colorop) {
return strdup (source);
@ -4340,14 +4341,18 @@ static char *ds_sub_jumps(RDisasmState *ds, char *str) {
return str;
}
static bool line_highlighted(RDisasmState *ds) {
return ds->asm_highlight != UT64_MAX && ds->vat == ds->asm_highlight;
}
static void ds_start_line_highlight(RDisasmState *ds) {
if (ds->asm_highlight != UT64_MAX && ds->show_color && ds->vat == ds->asm_highlight) {
if (ds->show_color && line_highlighted (ds)) {
r_cons_strcat (Color_BGBLUE);
}
}
static void ds_end_line_highlight(RDisasmState *ds) {
if (ds->asm_highlight != UT64_MAX && ds->show_color && ds->vat == ds->asm_highlight) {
if (ds->show_color && line_highlighted (ds)) {
r_cons_strcat (Color_RESET);
}
}

2
libr/util/print.c
View File

@ -1632,7 +1632,7 @@ static bool ishexprefix(char *p) {
R_API char* r_print_colorize_opcode(RPrint *print, char *p, const char *reg, const char *num, bool partial_reset) {
int i, j, k, is_mod, is_float = 0, is_arg = 0;
char *reset = Color_RESET;
char *reset = partial_reset ? Color_RESET_NOBG : Color_RESET;
ut32 c_reset = strlen (reset);
int is_jmp = p && (*p == 'j' || ((*p == 'c') && (p[1] == 'a')))? 1: 0;
ut32 opcode_sz = p && *p? strlen (p) * 10 + 1: 0;