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

Sdbize graphs. Using the new 'agk' command

Browse Source
This commit is contained in:
pancake 2014-04-27 02:48:42 +02:00
parent 0f14e3352c
commit d9ff886e41
4 changed files with 117 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libr/anal/fcn.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2010-2013 - nibble, pancake */
/* radare - LGPL - Copyright 2010-2014 - nibble, pancake */
#include <r_anal.h>
#include <r_util.h>
@ -9,6 +9,18 @@
#define EXISTS(x,y...) snprintf (key, sizeof(key)-1,x,##y),sdb_exists(DB,key)
#define SETKEY(x,y...) snprintf (key, sizeof (key)-1, x,##y);
R_API const char *r_anal_fcn_type_tostring(int type) {
switch (type) {
case R_ANAL_FCN_TYPE_NULL: return "null";
case R_ANAL_FCN_TYPE_FCN: return "fcn";
case R_ANAL_FCN_TYPE_LOC: return "loc";
case R_ANAL_FCN_TYPE_SYM: return "sym";
case R_ANAL_FCN_TYPE_IMP: return "imp";
case R_ANAL_FCN_TYPE_ROOT: return "root";
}
return "unk";
}
R_API RAnalFunction *r_anal_fcn_new() {
RAnalFunction *fcn = R_NEW0 (RAnalFunction);
if (!fcn) return NULL;

120
libr/core/anal.c
View File

@ -155,13 +155,36 @@ static char *r_core_anal_graph_label(RCore *core, RAnalBlock *bb, int opts) {
static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
int is_html = r_cons_singleton ()->is_html;
int is_json = opts & R_CORE_ANAL_JSON;
int is_keva = opts & R_CORE_ANAL_KEYVALUE;
struct r_anal_bb_t *bbi;
RListIter *iter;
int left = 300;
int count = 0;
int top = 0;
char *str;
Sdb *DB = NULL;
if (is_keva) {
char ns[64];
DB = sdb_ns (core->anal->sdb, "graph");
snprintf (ns, sizeof (ns), "fcn.0x%08"PFMT64x, fcn->addr);
DB = sdb_ns (DB, ns);
}
#define fmt(x,y...) snprintf (x,sizeof(x),##y)
if (is_keva) {
char *ename = sdb_encode ((const ut8*)fcn->name, -1);
sdb_set (DB, "name", fcn->name, 0);
sdb_set (DB, "ename", ename, 0);
free (ename);
if (fcn->nargs>0)
sdb_num_set (DB, "nargs", fcn->nargs, 0);
sdb_num_set (DB, "size", fcn->size, 0);
if (fcn->stack>0)
sdb_num_set (DB, "stack", fcn->stack, 0);
sdb_set (DB, "pos", "0,0", 0); // needs to run layout
sdb_set (DB, "type", r_anal_fcn_type_tostring (fcn->type), 0);
} else
if (is_json) {
// TODO: show vars, refs and xrefs
r_cons_printf ("{\"name\":\"%s\"", fcn->name);
@ -177,11 +200,18 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
}
r_list_foreach (fcn->bbs, iter, bbi) {
count ++;
if (is_keva) {
char key[128];
char val[128];
snprintf (key, sizeof (key), "bb.0x%08"PFMT64x".size", bbi->addr);
sdb_num_set (DB, key, bbi->size, 0); // bb.<addr>.size=<num>
sdb_array_push_num (DB, "bbs", bbi->addr, 0);
} else
if (is_json) {
if (count>1)
r_cons_printf (",");
r_cons_printf ("{\"offset\":%"PFMT64d",\"size\":%"PFMT64d, bbi->addr, bbi->size);
if (bbi->jump != -1)
if (bbi->jump != UT64_MAX)
r_cons_printf (",\"jump\":%"PFMT64d, bbi->jump);
if (bbi->fail != -1)
r_cons_printf (",\"fail\":%"PFMT64d, bbi->fail);
@ -193,7 +223,22 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
r_cons_printf ("}");
continue;
}
if (bbi->jump != -1) {
if (bbi->jump != UT64_MAX) {
if (is_keva) {
char key[128];
char val[128];
snprintf (key, sizeof (key), "bb.0x%08"PFMT64x".to", bbi->addr);
if (bbi->fail != UT64_MAX) {
fmt (val, "0x%08"PFMT64x, bbi->jump);
} else {
fmt (val, "0x%08"PFMT64x ",0x%08"PFMT64x, bbi->jump, bbi->fail);
}
// bb.<addr>.to=<jump>,<fail>
sdb_set (DB, key, val, 0);
} else
if (is_json) {
// do nothing here
} else
if (is_html) {
r_cons_printf ("<div class=\"connector _0x%08"PFMT64x" _0x%08"PFMT64x"\">\n"
" <img class=\"connector-end\" src=\"img/arrow.gif\" /></div>\n",
@ -203,7 +248,10 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
bbi->fail != -1 ? "green" : "blue");
r_cons_flush ();
}
if ( bbi->fail != -1) {
if (bbi->fail != -1) {
if (is_keva) {
// already done in the previous block
} else
if (is_html) {
r_cons_printf ("<div class=\"connector _0x%08"PFMT64x" _0x%08"PFMT64x"\">\n"
" <img class=\"connector-end\" src=\"img/arrow.gif\"/></div>\n",
@ -215,7 +263,9 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
if (bbi->switch_op) {
RAnalCaseOp *caseop;
RListIter *iter;
RList *jmp_list = NULL;
if (is_keva) {
// Nothing to do here
} else
if (is_html) {
r_cons_printf ("<div class=\"connector _0x%08"PFMT64x" _0x%08"PFMT64x"\">\n"
" <img class=\"connector-end\" src=\"img/arrow.gif\"/></div>\n",
@ -226,12 +276,20 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
r_list_foreach (bbi->switch_op->cases, iter, caseop) {
if (caseop) {
if (is_keva) {
char key[128];
fmt (key, "bb.0x%08"PFMT64x".switch.%"PFMT64d,
bbi->addr, caseop->value);
sdb_num_set (DB, key, caseop->jump, 0);
fmt (key, "bb.0x%08"PFMT64x".switch", bbi->addr);
sdb_array_add_num (DB, key, caseop->value, 0);
} else
if (is_html) {
r_cons_printf ("<div class=\"connector _0x%08"PFMT64x" _0x%08"PFMT64x"\">\n"
" <img class=\"connector-end\" src=\"img/arrow.gif\"/></div>\n",
caseop->addr, caseop->addr);
} else r_cons_printf ("\t\"0x%08"PFMT64x"_0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"_0x%08"PFMT64x"\" "
"[color=\"red\"];\n", fcn->addr, caseop->addr, fcn->addr, caseop->jump);
" <img class=\"connector-end\" src=\"img/arrow.gif\"/></div>\n",
caseop->addr, caseop->jump);
} else r_cons_printf ("\t\"0x%08"PFMT64x"_0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"_0x%08"PFMT64x"\" "
"[color=\"red\"];\n", fcn->addr, caseop->addr, fcn->addr, caseop->jump);
r_cons_flush ();
}
}
@ -242,15 +300,34 @@ static void r_core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
const char *difftype = bbi->diff? (\
bbi->diff->type==R_ANAL_DIFF_TYPE_MATCH? "lightgray":
bbi->diff->type==R_ANAL_DIFF_TYPE_UNMATCH? "yellow": "red"): "black";
r_cons_printf (" \"0x%08"PFMT64x"_0x%08"PFMT64x"\" [color=\"%s\","
" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
fcn->addr, bbi->addr,
difftype, str,
fcn->name, bbi->addr);
const char *diffname = bbi->diff? (\
bbi->diff->type==R_ANAL_DIFF_TYPE_MATCH? "match":
bbi->diff->type==R_ANAL_DIFF_TYPE_UNMATCH? "unmatch": "new"): "unk";
if (is_keva) {
sdb_set (DB, "diff", diffname, 0);
sdb_set (DB, "label", str, 0);
} else if (is_json) {
// nothing
} else {
r_cons_printf (" \"0x%08"PFMT64x"_0x%08"PFMT64x"\" [color=\"%s\","
" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
fcn->addr, bbi->addr,
difftype, str,
fcn->name, bbi->addr);
}
} else {
if (is_keva) {
// nothing
//sdb_set (DB, "");
} else
if (is_json) {
// nothing
} else
if (is_html) {
r_cons_printf ("<p class=\"block draggable\" style=\"top: %dpx; left: %dpx; width: 400px;\" id=\"_0x%08"PFMT64x"\">\n"
"%s</p>\n", top, left, bbi->addr, str);
r_cons_printf ("<p class=\"block draggable\" style=\""
"top: %dpx; left: %dpx; width: 400px;\" id=\""
"_0x%08"PFMT64x"\">\n%s</p>\n",
top, left, bbi->addr, str);
left = left? 0: 600;
if (!left) top += 250;
} else
@ -919,6 +996,7 @@ R_API int r_core_anal_graph(RCore *core, ut64 addr, int opts) {
const char *font = r_config_get (core->config, "graph.font");
int is_html = r_cons_singleton ()->is_html;
int is_json = opts & R_CORE_ANAL_JSON;
int is_keva = opts & R_CORE_ANAL_KEYVALUE;
int reflines, bytes, dwarf;
RAnalFunction *fcni;
RListIter *iter;
@ -934,11 +1012,11 @@ R_API int r_core_anal_graph(RCore *core, ut64 addr, int opts) {
r_config_set_i (core->config, "asm.lines", 0);
r_config_set_i (core->config, "asm.bytes", 0);
r_config_set_i (core->config, "asm.dwarf", 0);
if (!is_html && !is_json)
r_cons_printf ("digraph code {\n"
"\tgraph [bgcolor=white];\n"
"\tnode [color=lightgray, style=filled shape=box"
" fontname=\"%s\" fontsize=\"8\"];\n", font);
if (!is_html && !is_json && !is_keva)
r_cons_printf ("digraph code {\n"
"\tgraph [bgcolor=white];\n"
"\tnode [color=lightgray, style=filled shape=box"
" fontname=\"%s\" fontsize=\"8\"];\n", font);
if (is_json)
r_cons_printf ("[");
r_cons_flush ();
@ -951,7 +1029,7 @@ R_API int r_core_anal_graph(RCore *core, ut64 addr, int opts) {
if (addr != 0) break;
}
}
if (!is_html && !is_json) r_cons_printf ("}\n");
if (!is_keva && !is_html && !is_json) r_cons_printf ("}\n");
if (is_json)
r_cons_printf ("]\n");
r_cons_flush ();

4
libr/core/cmd_anal.c
View File

@ -758,6 +758,9 @@ static int cmd_anal(void *data, const char *input) {
case 'j':
r_core_anal_graph (core, r_num_math (core->num, input+2), R_CORE_ANAL_JSON);
break;
case 'k':
r_core_anal_graph (core, r_num_math (core->num, input+2), R_CORE_ANAL_KEYVALUE);
break;
case 'l':
r_core_anal_graph (core, r_num_math (core->num, input+2), R_CORE_ANAL_GRAPHLINES);
break;
@ -799,6 +802,7 @@ static int cmd_anal(void *data, const char *input) {
"|Usage: ag[?f]\n"
"| ag [addr] ; Output graphviz code (bb at addr and children)\n"
"| agj [addr] ; Idem, but in JSON format\n"
"| agk [addr] ; Idem, but in SDB key-value format\n"
"| aga [addr] ; Idem, but only addresses\n"
"| agc [addr] ; Output graphviz call graph of function\n"
"| agd [fcn name] ; Output graphviz code of diffed function\n"

1
libr/include/r_anal.h
View File

@ -901,6 +901,7 @@ R_API int r_anal_set_big_endian(RAnal *anal, int boolean);
R_API char *r_anal_strmask (RAnal *anal, const char *data);
R_API void r_anal_trace_bb(RAnal *anal, ut64 addr);
R_API RAnalFunction *r_anal_get_fcn_at(RAnal *anal, ut64 addr);
R_API const char *r_anal_fcn_type_tostring(int type);
/* bb.c */
R_API RAnalBlock *r_anal_bb_new();