Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-24 06:48:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #4313 - & in function switches fcn->bits instead of global ones

Browse Source
This commit is contained in:
pancake 2016-03-15 11:47:13 +01:00
parent b0f887edd9
commit 15d9563014
2 changed files with 82 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libr/core/disasm.c
View File

@ -236,6 +236,25 @@ static int cmpaddr (const void *_a, const void *_b) {
return (a->addr > b->addr);
}
static void get_bits_comment(RCore *core, RAnalFunction *f, char *cmt, int cmt_size) {
if (core && f && cmt && cmt_size>0 && f->bits) {
const char *asm_arch = r_config_get (core->config, "asm.arch");
if (strstr (asm_arch, "arm")) {
switch (f->bits) {
case 16: strcpy (cmt, " (thumb)"); break;
case 32: strcpy (cmt, " (arm)"); break;
case 64: strcpy (cmt, " (aarch64)"); break;
}
} else {
snprintf (cmt, cmt_size, " (%d bits)", f->bits);
}
} else {
if (cmt) {
cmt[0] = 0;
}
}
}
static const char *getSectionName (RCore *core, ut64 addr) {
static char section[128] = "";
static ut64 oaddr = UT64_MAX;
@ -839,6 +858,8 @@ static void handle_show_functions(RCore *core, RDisasmState *ds) {
} else {
const char *space = ds->show_fcnlines ? " " : "";
const char *fcntype;
char cmt[32];
get_bits_comment (core, f, cmt, sizeof (cmt));
switch (f->type) {
case R_ANAL_FCN_TYPE_FCN:
@ -866,14 +887,14 @@ static void handle_show_functions(RCore *core, RDisasmState *ds) {
}
handle_print_lines_left (core, ds);
handle_print_offset (core, ds);
r_cons_printf ("%s%s%s(%s) %s%s %d\n",
r_cons_printf ("%s%s%s(%s) %s%s%s %d\n",
space, COLOR_RESET (ds), COLOR (ds, color_fname),
fcntype, fcn_name, COLOR_RESET (ds), f->size);
fcntype, fcn_name, cmt, COLOR_RESET (ds), f->size);
} else {
r_cons_printf ("%s%s%s%s%s(%s) %s%s %d\n",
r_cons_printf ("%s%s%s%s%s(%s) %s%s%s %d\n",
COLOR (ds, color_fline), ds->pre,
space, COLOR_RESET (ds), COLOR (ds, color_fname),
fcntype, fcn_name, COLOR_RESET (ds), f->size);
fcntype, fcn_name, cmt, COLOR_RESET (ds), f->size);
}
}
if (sign)
@ -2548,10 +2569,12 @@ toro:
if (f && f->folded && ds->at >= f->addr && ds->at < f->addr+f->size) {
int delta = (ds->at <= f->addr)? (ds->at - f->addr + f->size): 0;
if (of != f) {
char cmt[32];
get_bits_comment(core, f, cmt, sizeof (cmt));
handle_show_comments_right (core, ds);
r_cons_printf ("%s%s%s (fcn) %s%s\n",
r_cons_printf ("%s%s%s (fcn) %s%s%s\n",
COLOR (ds, color_fline), core->cons->vline[RUP_CORNER],
COLOR (ds, color_fname), f->name, COLOR_RESET (ds));
COLOR (ds, color_fname), f->name, cmt, COLOR_RESET (ds));
handle_print_pre (core, ds, true);
handle_print_lines_left (core, ds);
handle_print_offset (core, ds);

91
libr/core/visual.c
View File

@ -39,6 +39,58 @@ static int visual_repeat_thread(RThread *th) {
return 0;
}
static void toggle_bits(RCore *core) {
RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
if (fcn) {
int bits = fcn->bits? fcn->bits: core->assembler->bits;
switch (bits) {
case 16: bits = 32; break;
case 32: bits = 64; break;
default: bits = 16; break;
}
fcn->bits = bits;
return;
}
switch (core->assembler->bits) {
case 8:
r_config_set_i (core->config, "asm.bits", 16);
if (core->assembler->bits != 16) {
r_config_set_i (core->config, "asm.bits", 32);
if (core->assembler->bits != 32) {
r_config_set_i (core->config, "asm.bits", 64);
}
}
break;
case 16:
r_config_set_i (core->config, "asm.bits", 32);
if (core->assembler->bits != 32) {
r_config_set_i (core->config, "asm.bits", 64);
if (core->assembler->bits != 64) {
r_config_set_i (core->config, "asm.bits", 8);
}
}
break;
case 32:
r_config_set_i (core->config, "asm.bits", 64);
if (core->assembler->bits != 64) {
r_config_set_i (core->config, "asm.bits", 8);
if (core->assembler->bits != 8) {
r_config_set_i (core->config, "asm.bits", 16);
}
}
break;
case 64:
r_config_set_i (core->config, "asm.bits", 8);
if (core->assembler->bits != 8) {
r_config_set_i (core->config, "asm.bits", 16);
if (core->assembler->bits != 16) {
r_config_set_i (core->config, "asm.bits", 32);
}
}
break;
}
}
static void visual_repeat(RCore *core) {
int atport = r_config_get_i (core->config, "scr.atport");
if (atport) {
@ -1284,44 +1336,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
r_core_visual_mounts (core);
break;
case '&':
switch (core->assembler->bits) {
case 8:
r_config_set_i (core->config, "asm.bits", 16);
if (core->assembler->bits!=16) {
r_config_set_i (core->config, "asm.bits", 32);
if (core->assembler->bits!=32) {
r_config_set_i (core->config, "asm.bits", 64);
}
}
break;
case 16:
r_config_set_i (core->config, "asm.bits", 32);
if (core->assembler->bits!=32) {
r_config_set_i (core->config, "asm.bits", 64);
if (core->assembler->bits!=64) {
r_config_set_i (core->config, "asm.bits", 8);
}
}
break;
case 32:
r_config_set_i (core->config, "asm.bits", 64);
if (core->assembler->bits!=64) {
r_config_set_i (core->config, "asm.bits", 8);
if (core->assembler->bits!=8) {
r_config_set_i (core->config, "asm.bits", 16);
}
}
break;
case 64:
r_config_set_i (core->config, "asm.bits", 8);
if (core->assembler->bits!=8) {
r_config_set_i (core->config, "asm.bits", 16);
if (core->assembler->bits!=16) {
r_config_set_i (core->config, "asm.bits", 32);
}
}
break;
}
toggle_bits (core);
break;
case 't':
r_core_visual_types (core);