Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-23 22:36:27 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Change all asm.emu* to asm.emu.* (#9272)

Browse Source
This commit is contained in:
Craig Ingram 2018-01-30 10:21:31 -05:00 committed by radare
parent 7bd97c3be9
commit cd7d7315d6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/core/cconfig.c
View File

@ -2326,10 +2326,10 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("asm.nodup", "false", "Do not show dupped instructions (collapse disasm)");
SETPREF ("asm.emu.pre", "false", "Run ESIL emulation starting at the closest flag in pd");
SETPREF ("asm.emu", "false", "Run ESIL emulation analysis on disasm");
SETPREF ("asm.emustack", "false", "Create a temporary fake stack when emulating in disasm (asm.emu)");
SETCB ("asm.emustr", "false", &cb_emustr, "Show only strings if any in the asm.emu output");
SETPREF ("asm.emuwrite", "false", "Allow asm.emu to modify memory (WARNING)");
n = NODECB ("asm.emuskip", "ds", &cb_emuskip);
SETPREF ("asm.emu.stack", "false", "Create a temporary fake stack when emulating in disasm (asm.emu)");
SETCB ("asm.emu.str", "false", &cb_emustr, "Show only strings if any in the asm.emu output");
SETPREF ("asm.emu.write", "false", "Allow asm.emu to modify memory (WARNING)");
n = NODECB ("asm.emu.skip", "ds", &cb_emuskip);
SETDESC (n, "Skip metadata of given types in asm.emu");
SETOPTIONS (n, "d", "c", "s", "f", "m", "h", "C", "r", NULL);
SETPREF ("asm.filter", "true", "Replace numeric values by flags (e.g. 0x4003e0 -> sym.imp.printf)");

10
libr/core/disasm.c
View File

@ -571,9 +571,9 @@ static RDisasmState * ds_init(RCore *core) {
ds->show_symbols = r_config_get_i (core->config, "asm.symbol");
ds->show_symbols_col = r_config_get_i (core->config, "asm.symbol.col");
ds->show_emu = r_config_get_i (core->config, "asm.emu");
ds->show_emu_str = r_config_get_i (core->config, "asm.emustr");
ds->show_emu_write = r_config_get_i (core->config, "asm.emuwrite");
ds->show_emu_stack = r_config_get_i (core->config, "asm.emustack");
ds->show_emu_str = r_config_get_i (core->config, "asm.emu.str");
ds->show_emu_write = r_config_get_i (core->config, "asm.emu.write");
ds->show_emu_stack = r_config_get_i (core->config, "asm.emu.stack");
ds->stackFd = -1;
if (ds->show_emu_stack) {
// TODO: initialize fake stack in here
@ -3733,7 +3733,7 @@ static char * resolve_fcn_name(RAnal *anal, const char * func_name) {
static bool can_emulate_metadata(RCore * core, ut64 at) {
const char *infos;
const char *emuskipmeta = r_config_get (core->config, "asm.emuskip");
const char *emuskipmeta = r_config_get (core->config, "asm.emu.skip");
char key[32];
Sdb *s = core->anal->sdb_meta;
snprintf (key, sizeof (key)-1, "meta.0x%"PFMT64x, at);
@ -3980,7 +3980,7 @@ beach:
static void ds_print_calls_hints(RDisasmState *ds) {
int emu = r_config_get_i (ds->core->config, "asm.emu");
int emuwrite = r_config_get_i (ds->core->config, "asm.emuwrite");
int emuwrite = r_config_get_i (ds->core->config, "asm.emu.write");
if (emu && emuwrite) {
// this is done by ESIL
return;

6
libr/core/pseudo.c
View File

@ -173,7 +173,7 @@ R_API int r_core_pseudo_code(RCore *core, const char *input) {
r_config_save_num (hc, "asm.pseudo", "asm.decode", "asm.lines", "asm.bytes", NULL);
r_config_save_num (hc, "asm.offset", "asm.flags", "asm.fcnlines", "asm.comments", NULL);
r_config_save_num (hc, "asm.functions", "asm.section", "asm.cmtcol", "asm.filter", NULL);
r_config_save_num (hc, "scr.color", "asm.emustr", "asm.emu", "asm.emuwrite", NULL);
r_config_save_num (hc, "scr.color", "asm.emu.str", "asm.emu", "asm.emu.write", NULL);
r_config_save_num (hc, "io.cache", NULL);
if (!fcn) {
eprintf ("Cannot find function in 0x%08"PFMT64x"\n", core->offset);
@ -189,8 +189,8 @@ R_API int r_core_pseudo_code(RCore *core, const char *input) {
r_config_set_i (core->config, "asm.offset", 0);
r_config_set_i (core->config, "asm.flags", 0);
r_config_set_i (core->config, "asm.emu", 1);
r_config_set_i (core->config, "asm.emustr", 1);
r_config_set_i (core->config, "asm.emuwrite", 1);
r_config_set_i (core->config, "asm.emu.str", 1);
r_config_set_i (core->config, "asm.emu.write", 1);
r_config_set_i (core->config, "asm.fcnlines", 0);
r_config_set_i (core->config, "asm.comments", 1);
r_config_set_i (core->config, "asm.functions", 0);

2
shlr/www/f/index.html
View File

@ -383,7 +383,7 @@ case 'e':
buttonrow('scr.colors', 'e!scr.color', 'redraw'),
buttonrow('scr.utf8', 'e!scr.utf8', 'redraw'),
buttonrow('scr.utf8.curvy', 'e!scr.utf8.curvy', 'redraw'),
buttonrow('asm.emustr', 'e!asm.emustr', 'redraw'),
buttonrow('asm.emu.str', 'e!asm.emu.str', 'redraw'),
buttonrow('asm.bytes', 'e!asm.bytes', 'redraw'),
buttonrow('asm.slow', 'e!asm.slow', 'redraw'),
buttonrow('asm.lines', 'e!asm.lines', 'redraw'),

2
shlr/www/m/app.js
View File

File diff suppressed because one or more lines are too long