Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for every output format for callgraph (agc and agC) #10103

Merged
merged 2 commits into from May 15, 2018
Merged

Support for every output format for callgraph (agc and agC) #10103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b09f8d
Support for every output format for callgraph (agc)
cyanpencil May 15, 2018
25d40d8
Refactored R_CALLGRAPH_* into R_GRAPH_*
cyanpencil May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
182 changes: 78 additions & 104 deletions libr/core/canal.c
View file
Open in desktop
Expand Up @@ -1748,13 +1748,9 @@ R_API void r_core_anal_codexrefs(RCore *core, ut64 addr) {
free (me);
}

#define FMT_NO 0
#define FMT_GV 1
#define FMT_JS 2
R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
RAnalFunction fakefr = R_EMPTY;
const char *font = r_config_get (core->config, "graph.font");
const char *format = r_config_get (core->config, "graph.format");
int is_html = r_cons_singleton ()->is_html;
bool refgraph = r_config_get_i (core->config, "graph.refs");
int first, first2, showhdr = 0;
Expand All @@ -1763,24 +1759,18 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
const int usenames = 1;
RAnalFunction *fcni;
RAnalRef *fcnr;
bool isGML = !strcmp (format, "gml");

bool gmlFcnGraph = false;
if (!strcmp (format, "gmlfcn")) {
isGML = true;
gmlFcnGraph = true;
}
ut64 from = r_config_get_i (core->config, "graph.from");
ut64 to = r_config_get_i (core->config, "graph.to");

if (fmt == 2) {
if (fmt == R_GRAPH_FORMAT_JSON) {
r_cons_printf ("[");
}
if (fmt == 1 && isGML) {
if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
r_cons_printf ("graph\n[\n"
"hierarchic\t1\n"
"label\t\"\"\n"
"directed\t1\n");
"hierarchic 1\n"
"label \"\"\n"
"directed 1\n");
}
first = 0;
ut64 base = UT64_MAX;
Expand All @@ -1802,17 +1792,17 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
RList *refs = r_anal_fcn_get_refs_sorted (core->anal, fcni);
if (!fmt) {
r_cons_printf ("0x%08"PFMT64x"\n", fcni->addr);
} else if (fmt == 1 && isGML) {
} else if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
RFlagItem *flag = r_flag_get_i (core->flags, fcni->addr);
if (iteration == 0) {
char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, fcni->addr);
r_cons_printf ("\tnode [\n"
"\t\tid\t%"PFMT64d"\n"
"\t\tlabel\t\"%s\"\n"
"\t]\n", fcni->addr - base, msg);
r_cons_printf (" node [\n"
" id %"PFMT64d"\n"
" label \"%s\"\n"
" ]\n", fcni->addr - base, msg);
free (msg);
}
} else if (fmt == 2) {
} else if (fmt == R_GRAPH_FORMAT_JSON) {
if (hideempty && !r_list_length (refs)) {
r_list_free (refs);
continue;
Expand Down Expand Up @@ -1843,91 +1833,71 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
}
}
if (!is_html && !showhdr) {
if (fmt == 1) {
if (isGML) {
/*
r_cons_printf ("Creator \"radare2\"\n"
"Version \"2.14\"\n"
"graph\n[\n"
"hierarchic\t1\n"
"label\t\"\"\n"
"directed\t1\n");
*/
} else {
const char * gv_edge = r_config_get (core->config, "graph.gv.edge");
const char * gv_node = r_config_get (core->config, "graph.gv.node");
const char * gv_grph = r_config_get (core->config, "graph.gv.graph");
const char * gv_spline = r_config_get (core->config, "graph.gv.spline");
if (!gv_edge || !*gv_edge) {
gv_edge = "arrowhead=\"normal\"";
}
if (!gv_node || !*gv_node) {
gv_node = "fillcolor=gray style=filled shape=box";
}
if (!gv_grph || !*gv_grph) {
gv_grph = "bgcolor=white";
}
if (!gv_spline || !*gv_spline) {
gv_spline = "splines=\"ortho\"";
}
r_cons_printf ("digraph code {\n"
"\tgraph [%s fontname=\"%s\" %s];\n"
"\tnode [%s];\n"
"\tedge [%s];\n", gv_grph, font, gv_spline,
gv_node, gv_edge);
if (fmt == R_GRAPH_FORMAT_DOT) {
const char * gv_edge = r_config_get (core->config, "graph.gv.edge");
const char * gv_node = r_config_get (core->config, "graph.gv.node");
const char * gv_grph = r_config_get (core->config, "graph.gv.graph");
const char * gv_spline = r_config_get (core->config, "graph.gv.spline");
if (!gv_edge || !*gv_edge) {
gv_edge = "arrowhead=\"normal\"";
}
if (!gv_node || !*gv_node) {
gv_node = "fillcolor=gray style=filled shape=box";
}
if (!gv_grph || !*gv_grph) {
gv_grph = "bgcolor=white";
}
if (!gv_spline || !*gv_spline) {
gv_spline = "splines=\"ortho\"";
}
r_cons_printf ("digraph code {\n"
"graph [%s fontname=\"%s\" %s];\n"
"node [%s];\n"
"edge [%s];\n", gv_grph, font, gv_spline,
gv_node, gv_edge);
}
showhdr = 1;
}
// TODO: display only code or data refs?
RFlagItem *flag = r_flag_get_i (core->flags, fcnr->addr);
if (fmt == 1) {
if (isGML) {
if (iteration == 0) {
if (gmlFcnGraph) {
char *msg = flag? strdup(flag->name): r_str_newf ("0x%08"PFMT64x, fcnr->addr);
r_cons_printf ("\tnode [\n"
"\t\tid\t%"PFMT64d"\n"
"\t\tlabel\t\"%s\"\n"
"\t]\n", fcnr->addr - base, msg
);
r_cons_printf ("\tedge [\n"
"\t\tsource %"PFMT64d"\n"
"\t\ttarget %"PFMT64d"\n"
"\t]\n", fcni->addr-base, fcnr->addr-base
);
free (msg);
}
} else {
r_cons_printf ("\tedge [\n"
"\t\tsource %"PFMT64d"\n"
"\t\ttarget %"PFMT64d"\n"
/*
"graphics\n"
"[\n"
" fill \"%s\"\n"
" targetArrow \"standard\"\n"
"]\n"
*/
"\t]\n", fcni->addr-base, fcnr->addr-base //, "#000000"
if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
if (iteration == 0) {
if (fmt == R_GRAPH_FORMAT_GMLFCN) {
char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, fcnr->addr);
r_cons_printf (" node [\n"
" id %"PFMT64d"\n"
" label \"%s\"\n"
" ]\n", fcnr->addr - base, msg
);
r_cons_printf (" edge [\n"
" source %"PFMT64d"\n"
" target %"PFMT64d"\n"
" ]\n", fcni->addr-base, fcnr->addr-base
);
free (msg);
}
} else {
if (flag && flag->name) {
r_cons_printf ("\t\"0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"\" "
"[label=\"%s\" color=\"%s\" URL=\"%s/0x%08"PFMT64x"\"];\n",
fcni->addr, fcnr->addr, flag->name,
(fcnr->type==R_ANAL_REF_TYPE_CODE ||
fcnr->type==R_ANAL_REF_TYPE_CALL)?"green":"red",
flag->name, fcnr->addr);
r_cons_printf ("\t\"0x%08"PFMT64x"\" "
"[label=\"%s\""
" URL=\"%s/0x%08"PFMT64x"\"];\n",
fcnr->addr, flag->name,
flag->name, fcnr->addr);
}
r_cons_printf (" edge [\n"
" source %"PFMT64d"\n"
" target %"PFMT64d"\n"
" ]\n", fcni->addr-base, fcnr->addr-base //, "#000000"
);
}
} else if (fmt == 2) {
} else if (fmt == R_GRAPH_FORMAT_DOT) {
if (flag && flag->name) {
r_cons_printf (" \"0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"\" "
"[label=\"%s\" color=\"%s\" URL=\"%s/0x%08"PFMT64x"\"];\n",
fcni->addr, fcnr->addr, flag->name,
(fcnr->type==R_ANAL_REF_TYPE_CODE ||
fcnr->type==R_ANAL_REF_TYPE_CALL)?"green":"red",
flag->name, fcnr->addr);
r_cons_printf (" \"0x%08"PFMT64x"\" "
"[label=\"%s\""
" URL=\"%s/0x%08"PFMT64x"\"];\n",
fcnr->addr, flag->name,
flag->name, fcnr->addr);
}
} else if (fmt == R_GRAPH_FORMAT_JSON) {
if (fr) {
RList *refs1 = r_anal_fcn_get_refs_sorted (core->anal, fr);
if (!hideempty || (hideempty && r_list_length (refs1) > 0)) {
Expand All @@ -1952,20 +1922,24 @@ R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
}
}
r_list_free (refs);
if (fmt == 2) {
if (fmt == R_GRAPH_FORMAT_JSON) {
r_cons_printf ("]}");
}
}
if (iteration == 0 && fmt == 1 && isGML) {
if (iteration == 0 && fmt == R_GRAPH_FORMAT_GML) {
iteration++;
if (!gmlFcnGraph) {
goto repeat;
}
goto repeat;
}
if (showhdr && fmt == 1) {
r_cons_printf ("%s\n", isGML? "]": "}");
if (iteration == 0 && fmt == R_GRAPH_FORMAT_GMLFCN) {
iteration++;
}
if (showhdr && (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN)) {
r_cons_printf ("]\n");
}
if (fmt == R_GRAPH_FORMAT_DOT) {
r_cons_printf ("}\n");
}
if (fmt == 2) {
if (fmt == R_GRAPH_FORMAT_JSON) {
r_cons_printf ("]\n");
}
}
Expand Down
1 change: 0 additions & 1 deletion libr/core/cconfig.c
View file
Open in desktop
Expand Up @@ -2811,7 +2811,6 @@ R_API int r_core_config_init(RCore *core) {
/* graph */
SETPREF ("graph.comments", "true", "Show disasm comments in graph");
SETPREF ("graph.cmtright", "false", "Show comments at right");
SETCB ("graph.format", "dot", &cb_graphformat, "Specify output format for graphs (dot, gml, gmlfcn)");
SETPREF ("graph.refs", "false", "Graph references in callgraphs (.agc*;aggi)");
SETI ("graph.edges", 2, "0=no edges, 1=simple edges, 2=avoid collisions");
SETI ("graph.layout", 0, "Graph layout (0=vertical, 1=horizontal)");
Expand Down
87 changes: 75 additions & 12 deletions libr/core/cmd_anal.c
View file
Open in desktop
Expand Up @@ -5890,7 +5890,38 @@ static void cmd_anal_graph(RCore *core, const char *input) {
}
break;
case 'C': // "agC"
r_core_anal_callgraph (core, UT64_MAX, input[1] == 'j'? 2 : 1);
switch (input[1]) {
case 'v':
case 't':
case 'k':
case 'w':
case ' ':
case 0: {
core->graph->is_callgraph = true;
char *cmd = r_str_newf ("ag-; .agc* %lld; agg%c;", UT64_MAX, input[1]);
if (cmd && *cmd) {
r_core_cmd0 (core, cmd);
}
free (cmd);
break;
}
case 'J':
case 'j':
r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_JSON);
break;
case 'g':
r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_GML);
break;
case 'd':
r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_DOT);
break;
case '*':
r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_CMD);
break;
default:
eprintf ("Usage: see ag?\n");
break;
}
break;
case 'r': // agr "refs"
switch (input[1]) {
Expand Down Expand Up @@ -5957,17 +5988,49 @@ static void cmd_anal_graph(RCore *core, const char *input) {
}
break;
case 'c': // "agc"
if (input[1] == '*') {
ut64 addr = input[2]? r_num_math (core->num, input + 2): UT64_MAX;
r_core_anal_callgraph (core, addr, '*');
} else if (input[1] == 'j') {
ut64 addr = input[2]? r_num_math (core->num, input + 2): UT64_MAX;
r_core_anal_callgraph (core, addr, 2);
} else if (input[1] == ' ') {
ut64 addr = input[2]? r_num_math (core->num, input + 1): UT64_MAX;
r_core_anal_callgraph (core, addr, 1);
} else {
eprintf ("|ERROR| Usage: agc[j*] ([addr])\n");
switch (input[1]) {
case 'v':
case 't':
case 'k':
case 'w':
case ' ': {
core->graph->is_callgraph = true;
char *cmd = r_str_newf ("ag-; .agc* %lld; agg%c;",
input[2] ? r_num_math (core->num, input + 2) : core->offset, input[1]);
if (cmd && *cmd) {
r_core_cmd0 (core, cmd);
}
free (cmd);
break;
}
case 0:
core->graph->is_callgraph = true;
r_core_cmd0 (core, "ag-; .agc* $$; agg;");
break;
case 'g': {
ut64 addr = input[2]? r_num_math (core->num, input + 1): core->offset;
r_core_anal_callgraph (core, addr, R_GRAPH_FORMAT_GMLFCN);
break;
}
case 'd': {
ut64 addr = input[2]? r_num_math (core->num, input + 1): core->offset;
r_core_anal_callgraph (core, addr, R_GRAPH_FORMAT_DOT);
break;
}
case 'J':
case 'j': {
ut64 addr = input[2]? r_num_math (core->num, input + 2): core->offset;
r_core_anal_callgraph (core, addr, R_GRAPH_FORMAT_JSON);
break;
}
case '*': {
ut64 addr = input[2]? r_num_math (core->num, input + 2): core->offset;
r_core_anal_callgraph (core, addr, R_GRAPH_FORMAT_CMD);
break;
}
default:
eprintf ("Usage: see ag?\n");
break;
}
break;
case 'j': // "agj"
Expand Down
7 changes: 7 additions & 0 deletions libr/include/r_core.h
View file
Open in desktop
Expand Up @@ -45,6 +45,13 @@ R_LIB_VERSION_HEADER(r_core);
#define R_CORE_ANAL_KEYVALUE 16
#define R_CORE_ANAL_JSON_FORMAT_DISASM 32

#define R_GRAPH_FORMAT_NO 0
#define R_GRAPH_FORMAT_GMLFCN 1
#define R_GRAPH_FORMAT_JSON 2
#define R_GRAPH_FORMAT_GML 3
#define R_GRAPH_FORMAT_DOT 4
#define R_GRAPH_FORMAT_CMD 5

///
#define R_CONS_COLOR_DEF(x, def) ((core->cons && core->cons->pal.x)? core->cons->pal.x: def)
#define R_CONS_COLOR(x) R_CONS_COLOR_DEF (x, "")
Expand Down