Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-12 07:26:42 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Implement asm.str.lea instead of hardcode the option ##disasm

Browse Source
This commit is contained in:
radare 2019-02-12 18:00:28 +01:00 committed by GitHub
parent 624282086a
commit cbe3b38229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libr/core/cconfig.c
View File

@ -2704,9 +2704,10 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("emu.lazy", "false", "Do not emulate all instructions with aae (optimization)");
SETPREF ("emu.stack", "false", "Create a temporary fake stack when emulating in disasm (asm.emu)");
SETCB ("emu.str", "false", &cb_emustr, "Show only strings if any in the asm.emu output");
SETPREF ("emu.stroff", "false", "Always show offset when printing asm.emu strings");
SETPREF ("emu.strinv", "true", "Color-invert asm.emu strings");
SETPREF ("emu.strflag", "true", "Also show flag (if any) for asm.emu string");
SETPREF ("emu.str.lea", "true", "Disable this in ARM64 code to remove some false positives");
SETPREF ("emu.str.off", "false", "Always show offset when printing asm.emu strings");
SETPREF ("emu.str.inv", "true", "Color-invert emu.str strings");
SETPREF ("emu.str.flag", "true", "Also show flag (if any) for asm.emu string");
SETPREF ("emu.write", "false", "Allow asm.emu to modify memory (WARNING)");
SETPREF ("emu.ssa", "false", "Perform SSA checks and show the ssa reg names as comments");
n = NODECB ("emu.skip", "ds", &cb_emuskip);

18
libr/core/disasm.c
View File

@ -123,6 +123,7 @@ typedef struct {
bool show_emu_strflag;
bool show_emu_stack;
bool show_emu_write;
bool show_emu_strlea;
bool show_emu_ssa;
bool show_section;
int show_section_col;
@ -639,9 +640,10 @@ static RDisasmState * ds_init(RCore *core) {
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, "emu.str");
ds->show_emu_stroff = r_config_get_i (core->config, "emu.stroff");
ds->show_emu_strinv = r_config_get_i (core->config, "emu.strinv");
ds->show_emu_strflag = r_config_get_i (core->config, "emu.strflag");
ds->show_emu_stroff = r_config_get_i (core->config, "emu.str.off");
ds->show_emu_strinv = r_config_get_i (core->config, "emu.str.inv");
ds->show_emu_strflag = r_config_get_i (core->config, "emu.str.flag");
ds->show_emu_strlea = r_config_get_i (core->config, "emu.str.lea");
ds->show_emu_write = r_config_get_i (core->config, "emu.write");
ds->show_emu_ssa = r_config_get_i (core->config, "emu.ssa");
ds->show_emu_stack = r_config_get_i (core->config, "emu.stack");
@ -3978,12 +3980,10 @@ static int myregwrite(RAnalEsil *esil, const char *name, ut64 *val) {
if (!ds) {
return 0;
}
// TODO Add an option for this?
if (!strstr (ds->core->anal->cur->arch, "x86")) {
if (ds->analop.type == R_ANAL_OP_TYPE_LEA) {
// reduce false positives in emu.str=true when loading strings via adrp+add
return 0;
}
if (!ds->show_emu_strlea && ds->analop.type == R_ANAL_OP_TYPE_LEA) {
// useful for ARM64
// reduce false positives in emu.str=true when loading strings via adrp+add
return 0;
}
ds->esil_likely = true;
if (ds->show_emu_ssa) {