From f271f86a389bc3c1d9bdb9079525e6efd4c340d1 Mon Sep 17 00:00:00 2001 From: Khairul Azhar Kasmiran Date: Sat, 12 May 2018 16:54:54 +0800 Subject: [PATCH] =?UTF-8?q?asm.varsub(=5Fonly)=20=F0=9F=A0=A2=20asm.var.su?= =?UTF-8?q?b(only)=20(#10080)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * asm.varsub_only 🠢 asm.var.subonly * asm.varsub 🠢 asm.var.sub --- libr/core/cconfig.c | 6 +++--- libr/core/cmd_anal.c | 8 ++++---- libr/core/disasm.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libr/core/cconfig.c b/libr/core/cconfig.c index a6130c40ce..df8b60b276 100644 --- a/libr/core/cconfig.c +++ b/libr/core/cconfig.c @@ -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"); diff --git a/libr/core/cmd_anal.c b/libr/core/cmd_anal.c index d097e1379a..e8d4344497 100644 --- a/libr/core/cmd_anal.c +++ b/libr/core/cmd_anal.c @@ -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; } diff --git a/libr/core/disasm.c b/libr/core/disasm.c index 3745771d74..d3103de091 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -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");