Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-07 13:51:16 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Improvements for repeated Vd

Browse Source
This commit is contained in:
pancake 2018-12-15 12:39:09 +01:00
parent 2f176bdc61
commit 4a83ba9dc0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libr/core/disasm.c
View File

@ -526,7 +526,6 @@ static RDisasmState * ds_init(RCore *core) {
if (!ds) {
return NULL;
}
ds->asm_hint_pos = r_config_get_i (core->config, "asm.hint.pos");
ds->core = core;
ds->strip = r_config_get (core->config, "asm.strip");
ds->pal_comment = core->cons->pal.comment;
@ -674,7 +673,8 @@ static RDisasmState * ds_init(RCore *core) {
ds->show_usercomments = r_config_get_i (core->config, "asm.usercomments");
ds->asm_hint_jmp = r_config_get_i (core->config, "asm.hint.jmp");
ds->asm_hint_lea = r_config_get_i (core->config, "asm.hint.lea");
ds->asm_hints = r_config_get_i (core->config, "asm.hints");
ds->asm_hint_pos = r_config_get_i (core->config, "asm.hint.pos");
ds->asm_hints = r_config_get_i (core->config, "asm.hints"); // only for cdiv wtf
ds->show_slow = r_config_get_i (core->config, "asm.slow");
ds->show_calls = r_config_get_i (core->config, "asm.calls");
ds->show_family = r_config_get_i (core->config, "asm.family");
@ -3327,9 +3327,6 @@ static void ds_print_core_vmode(RDisasmState *ds, int pos) {
if (!core->vmode) {
return;
}
if (!ds->asm_hints) {
return;
}
if (ds->asm_hint_lea) {
RAnalMetaItem *mi = r_meta_find (ds->core->anal, ds->at, R_META_TYPE_ANY, R_META_WHERE_HERE);
if (mi && mi->from) {

14
libr/core/vmenus.c
View File

@ -2913,6 +2913,7 @@ R_API void r_core_visual_define(RCore *core, const char *args, int distance) {
r_cons_printf ("\r%s\n", lines[i]);
}
r_cons_flush ();
int wordsize = 0;
// get ESC+char, return 'hjkl' char
repeat:
if (*args) {
@ -2923,6 +2924,7 @@ repeat:
}
onemoretime:
wordsize = 4;
switch (ch) {
case 'F':
{
@ -2960,24 +2962,28 @@ onemoretime:
rep = plen / 2;
}
define_data_ntimes (core, off, rep, R_BYTE_DATA);
wordsize = 1;
break;
case 'B':
if (plen != core->blocksize) {
rep = plen;
}
define_data_ntimes (core, off, rep, R_WORD_DATA);
wordsize = 2;
break;
case 'w':
if (plen != core->blocksize) {
rep = plen / 4;
}
define_data_ntimes (core, off, rep, R_DWORD_DATA);
wordsize = 4;
break;
case 'W':
if (plen != core->blocksize) {
rep = plen / 8;
}
define_data_ntimes (core, off, rep, R_QWORD_DATA);
wordsize = 8;
break;
case 'm':
{
@ -3189,6 +3195,7 @@ onemoretime:
ntotal += n;
}
} while (ntotal < plen);
wordsize = ntotal;
}
break;
case 's':
@ -3232,6 +3239,7 @@ onemoretime:
}
r_name_filter (name, n + 10);
r_flag_set (core->flags, name, off, n);
wordsize = n;
free (name);
}
break;
@ -3240,8 +3248,8 @@ onemoretime:
r_meta_add (core->anal, R_META_TYPE_DATA, off, off+plen, "");
break;
case 'c': // TODO: check
r_meta_cleanup (core->anal, off, off+plen);
r_meta_add (core->anal, R_META_TYPE_CODE, off, off+plen, "");
r_meta_cleanup (core->anal, off, off + plen);
r_meta_add (core->anal, R_META_TYPE_CODE, off, off + plen, "");
break;
case 'u':
r_core_anal_undefine (core, off);
@ -3353,7 +3361,7 @@ onemoretime:
}
if (distance > 0) {
distance--;
off += 4; //
off += wordsize;
goto onemoretime;
}
}