Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-03 11:50:02 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

asm.varsub(_only) 🠢 asm.var.sub(only) (#10080)

Browse Source 
* asm.varsub_only 🠢 asm.var.subonly

* asm.varsub 🠢 asm.var.sub
This commit is contained in:
Khairul Azhar Kasmiran 2018-05-12 16:54:54 +08:00 committed by radare
parent 4364aa3bf0
commit f271f86a38
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/core/cconfig.c
View File

@ -2474,7 +2474,7 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("asm.linesright", "false", "Show lines before opcode instead of offset");
SETPREF ("asm.lineswide", "false", "Put a space between lines");
SETICB ("asm.lineswidth", 7, &cb_asmlineswidth, "Number of columns for program flow arrows");
SETICB ("asm.minvalsub", 0x100, &cb_asmminvalsub, "Minimum value to substitute in instructions (asm.varsub)");
SETICB ("asm.minvalsub", 0x100, &cb_asmminvalsub, "Minimum value to substitute in instructions (asm.var.sub)");
SETPREF ("asm.middle", "false", "Allow disassembling jumps in the middle of an instruction");
SETPREF ("asm.noisy", "true", "Show comments considered noisy but possibly useful");
SETPREF ("asm.offset", "true", "Show offsets at disassembly");
@ -2498,9 +2498,9 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("asm.capitalize", "false", "Use camelcase at disassembly");
SETPREF ("asm.vars", "true", "Show local function variables in disassembly");
SETPREF ("asm.varxs", "false", "Show accesses of local variables");
SETPREF ("asm.varsub", "true", "Substitute variables in disassembly");
SETPREF ("asm.var.sub", "true", "Substitute variables in disassembly");
SETI ("asm.varsum", 0, "Show variables summary instead of full list in disasm (0, 1, 2)");
SETPREF ("asm.varsub_only", "true", "Substitute the entire variable expression with the local variable name (e.g. [local10h] instead of [ebp+local10h])");
SETPREF ("asm.var.subonly", "true", "Substitute the entire variable expression with the local variable name (e.g. [local10h] instead of [ebp+local10h])");
SETPREF ("asm.relsub", "true", "Substitute pc relative expressions in disasm");
SETPREF ("asm.cmt.fold", "false", "Fold comments, toggle with Vz");
SETPREF ("asm.family", "false", "Show family name in disasm");

8
libr/core/cmd_anal.c
View File

@ -5147,10 +5147,10 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
r_cons_printf ("0x%" PFMT64x "\n", ref->addr);
}
} else if (input[1] == 'j') { // "axtj"
bool asm_varsub = r_config_get_i (core->config, "asm.varsub");
bool asm_varsub = r_config_get_i (core->config, "asm.var.sub");
core->parser->pseudo = r_config_get_i (core->config, "asm.pseudo");
core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
r_cons_printf ("[");
r_list_foreach (list, iter, ref) {
r_core_read_at (core, ref->addr, buf, size);
@ -5209,10 +5209,10 @@ static bool cmd_anal_refs(RCore *core, const char *input) {
char str[512];
RAnalFunction *fcn;
char *comment;
bool asm_varsub = r_config_get_i (core->config, "asm.varsub");
bool asm_varsub = r_config_get_i (core->config, "asm.var.sub");
core->parser->pseudo = r_config_get_i (core->config, "asm.pseudo");
core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
if (core->parser->relsub) {
core->parser->relsub_addr = addr;
}

4
libr/core/disasm.c
View File

@ -590,9 +590,9 @@ static RDisasmState * ds_init(RCore *core) {
ds->filter = r_config_get_i (core->config, "asm.filter");
ds->interactive = r_config_get_i (core->config, "scr.interactive");
ds->jmpsub = r_config_get_i (core->config, "asm.jmpsub");
ds->varsub = r_config_get_i (core->config, "asm.varsub");
ds->varsub = r_config_get_i (core->config, "asm.var.sub");
core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
core->parser->retleave_asm = NULL;
ds->show_vars = r_config_get_i (core->config, "asm.vars");
ds->show_varsum = r_config_get_i (core->config, "asm.varsum");