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

Avoid dupe flag comments and UH.. trash strings

Browse Source
This commit is contained in:
pancake 2016-12-26 04:06:33 +01:00
parent 0030d2a63e
commit b19a6136f9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/disasm.c
View File

@ -2590,6 +2590,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
DOALIGN();
r_cons_printf (" ; '%c'", ch);
}
bool flag_printed = false;
if (p == UT64_MAX) {
/* do nothing */
} else if (((st64)p) > 0) {
@ -2620,6 +2621,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
}
CMTRIGHT_NL
r_cons_printf (" ; 0x%"PFMT64x"%s%s", p, *flag?" ; ":"", flag);
flag_printed = true;
} else {
f = NULL;
if (n == UT32_MAX || n == UT64_MAX) {
@ -2672,6 +2674,9 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
f = r_flag_get_i (core->flags, p);
if (f) {
r_str_filter (msg, 0);
if (!strncmp (msg, "UH..", 4)) {
*msg = 0;
}
ds_comment_newline (ds);
DOALIGN();
if (*msg) {
@ -2697,7 +2702,10 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
r_cons_printf (" ; \"%s\" @ 0x%"PFMT64x, msg, p);
}
} else {
r_cons_printf (" ; %s", f->name);
if (!flag_printed) {
r_cons_printf (" ; %s", f->name);
flag_printed = true;
}
}
} else {
if (p == UT64_MAX || p == UT32_MAX) {