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

Initial support for tab in visual debugger

Browse Source
This commit is contained in:
pancake 2016-02-25 10:28:54 +01:00
parent d9f4bce40b
commit eef4665242
4 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libr/core/cmd.c
View File

@ -1140,8 +1140,8 @@ static char *parse_tmp_evals(RCore *core, const char *str) {
RStrBuf *buf;
char *s = strdup (str);
buf = r_strbuf_new ("");
int i, argc = r_str_split(s, ',');
for (i = 0; i<argc; i++) {
int i, argc = r_str_split (s, ',');
for (i = 0; i < argc; i++) {
char *eq, *kv = (char *)r_str_word_get0 (s, i);
if (!kv) break;
eq = strchr (kv, '=');
@ -1200,7 +1200,15 @@ static int r_core_cmd_subst(RCore *core, char *cmd) {
// TODO: store in core->cmdtimes to speedup ?
cmdrep = r_config_get (core->config, "cmd.times");
orep = rep;
int ocur_enabled = core->print->cur_enabled;
while (rep-- && *cmd) {
core->print->cur_enabled = false;
if (ocur_enabled && core->seltab >= 0) {
if (core->seltab == core->curtab) {
core->print->cur_enabled = true;
}
}
char *cr = strdup (cmdrep);
ret = r_core_cmd_subst_i (core, cmd, colon);
if (ret && *cmd=='q') {
@ -1218,6 +1226,7 @@ static int r_core_cmd_subst(RCore *core, char *cmd) {
}
free (cr);
}
core->print->cur_enabled = ocur_enabled;
if (colon && colon[1]) {
for (++colon; *colon==';'; colon++);
r_core_cmd_subst (core, colon);

11
libr/core/cmd_help.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2015 - pancake */
/* radare - LGPL - Copyright 2009-2016 - pancake */
static const char* findBreakChar(const char *s) {
while (*s) {
@ -8,6 +8,7 @@ static const char* findBreakChar(const char *s) {
}
return s;
}
static char *filter_flags(RCore *core, const char *msg) {
const char *dollar, *end;
char *word, *buf = NULL;
@ -56,6 +57,14 @@ static int cmd_help(void *data, const char *input) {
RList *tmp;
switch (input[0]) {
case '0':
core->curtab = 0;
break;
case '1':
if (core->curtab < 0)
core->curtab = 0;
core->curtab ++;
break;
case ':':
{
RListIter *iter;

47
libr/core/visual.c
View File

@ -10,7 +10,7 @@ static int blocksize = 0;
static int autoblocksize = 1;
static void r_core_visual_refresh (RCore *core);
#define debugfmt_default "f tmp;sr SP;pxw 64;dr=;s-;s tmp;f-tmp;pd $r"
#define debugfmt_default "?0;f tmp;sr SP;pxw 64;?1;dr=;?1;s-;s tmp;f-tmp;pd $r"
static const char *printfmt[] = {
"x", "pd $r",
debugfmt_default,
@ -1005,17 +1005,25 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
}
break;
case 9: // tab
{ // XXX: unify diff mode detection
ut64 f = r_config_get_i (core->config, "diff.from");
ut64 t = r_config_get_i (core->config, "diff.to");
if (f == t && f == 0) {
core->print->col = core->print->col==1? 2: 1;
core->curtab = 0;
if (core->printidx == 2) {
core->print->cur = 0;
core->seltab ++;
if (core->seltab>2) {
core->seltab = 0;
}
} else {
ut64 delta = offset - f;
r_core_seek (core, t+delta, 1);
r_config_set_i (core->config, "diff.from", t);
r_config_set_i (core->config, "diff.to", f);
}
core->seltab = 0;
ut64 f = r_config_get_i (core->config, "diff.from");
ut64 t = r_config_get_i (core->config, "diff.to");
if (f == t && f == 0) {
core->print->col = core->print->col==1? 2: 1;
} else {
ut64 delta = offset - f;
r_core_seek (core, t+delta, 1);
r_config_set_i (core->config, "diff.from", t);
r_config_set_i (core->config, "diff.to", f);
}
}
break;
case 'a':
@ -1886,6 +1894,7 @@ static void r_core_visual_refresh (RCore *core) {
}
r_cons_flush ();
r_cons_print_clear ();
//core->curtab = 0;
vi = r_config_get (core->config, "cmd.cprompt");
if (vi && *vi) {
@ -1923,8 +1932,7 @@ static void r_core_visual_refresh (RCore *core) {
r_core_cmd (core, vcmd, 0);
} else {
core->screen_bounds = 1LL;
if (zoom) r_core_cmd0 (core, "pz");
else r_core_cmd0 (core, printfmt[PIDX]);
r_core_cmd0 (core, zoom? "pz": printfmt[PIDX]);
}
if (core->screen_bounds != 1LL) {
r_cons_printf ("[0x%08"PFMT64x"..0x%08"PFMT64x"]\n",
@ -1939,6 +1947,8 @@ static void r_core_visual_refresh (RCore *core) {
r_cons_reset ();
}
core->cons->blankline = true;
core->curtab = 0; // which command are we focusing
//core->seltab = 0; // user selected tab
}
R_API int r_core_visual(RCore *core, const char *input) {
@ -1984,11 +1994,11 @@ R_API int r_core_visual(RCore *core, const char *input) {
const int delta = r_config_get_i (core->config, "stack.delta");
const int bytes = r_config_get_i (core->config, "stack.bytes");
if (cmdvhex && *cmdvhex) {
snprintf (debugstr, sizeof(debugstr),
"f tmp;sr SP;%s;%s;s-;"
snprintf (debugstr, sizeof (debugstr),
"?0;f tmp;sr SP;%s;?1;%s;?1;s-;"
"s tmp;f-tmp;pd $r", cmdvhex,
ref? "drr": "dr=");
debugstr[sizeof(debugstr)-1]=0;
debugstr[sizeof (debugstr)-1]=0;
} else {
const char *pxw;
if (ref) {
@ -2003,8 +2013,9 @@ R_API int r_core_visual(RCore *core, const char *input) {
}
}
snprintf (debugstr, sizeof (debugstr),
"f tmp;sr SP;%s %d@$$-%d;%s;s-;"
"s tmp;f-tmp;pd $r",
"?0;f tmp;sr SP;%s %d@$$-%d;"
"?1;%s;s-;"
"?1;s tmp;f-tmp;pd $r",
pxa? "pxa": pxw, size, delta,
ref? "drr": "dr=");
}

4
libr/include/r_core.h
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2015 - pancake */
/* radare - LGPL - Copyright 2009-2016 - pancake */
#ifndef R2_CORE_H
#define R2_CORE_H
@ -157,6 +157,8 @@ typedef struct r_core_t {
ut8 switch_file_view;
Sdb *sdb;
int incomment;
int curtab; // current tab
int seltab; // selected tab
int cmdremote;
char *lastsearch;
bool fixedblock;