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

Added 'agR' and 'agA' global references and data references graphs #10150

Merged
merged 3 commits into from May 22, 2018
Merged

Added 'agR' and 'agA' global references and data references graphs #10150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a471c82
Added agA global graph and agR global graph
cyanpencil May 20, 2018
3816697
Added r_str_trunc_ellipsis() to truncate node titles too long
cyanpencil May 21, 2018
8452114
Updated ag? help
cyanpencil May 21, 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
3 changes: 0 additions & 3 deletions libr/core/canal.c
View file
Open in desktop
Expand Up @@ -1729,9 +1729,6 @@ R_API void r_core_anal_datarefs(RCore *core, ut64 addr) {
r_cons_printf ("age %s %s\n", me, dst);
}
}
if (!found) {
eprintf ("No data refs in this function.\n");
}
r_list_free (refs);
} else {
eprintf ("Not in a function. Use 'df' to define it.\n");
Expand Down
64 changes: 63 additions & 1 deletion libr/core/cmd_anal.c
View file
Open in desktop
Expand Up @@ -388,6 +388,9 @@ static const char *help_msg_ag[] = {
"aga", "[format] [fcn addr]", "Data references graph",
"agd", "[format] [fcn addr]", "Diff graph",
"agi", "[format]", "Imports graph",
"agC", "[format]", "Global callgraph",
"agR", "[format]", "Global references graph",
"agA", "[format]", "Global data references graph",
"agg", "[format]", "Custom graph",
"ag-", "", "Clear the custom graph",
"agn", "[?] title body", "Add a node to the custom graph",
Expand Down Expand Up @@ -5894,11 +5897,12 @@ static void cmd_anal_graph(RCore *core, const char *input) {
case ' ':
case 0: {
core->graph->is_callgraph = true;
char *cmd = r_str_newf ("ag-; .agc* %lld; agg%c;", UT64_MAX, input[1]);
char *cmd = r_str_newf ("ag-; .agC*; agg%c;", input[1]);
if (cmd && *cmd) {
r_core_cmd0 (core, cmd);
}
free (cmd);
core->graph->is_callgraph = false;
break;
}
case 'J':
Expand Down Expand Up @@ -5951,6 +5955,34 @@ static void cmd_anal_graph(RCore *core, const char *input) {
break;
}
break;
case 'R': // "agR" global refs
switch (input[1]) {
case 'v':
case 't':
case 'd':
case 'J':
case 'j':
case 'g':
case 'k':
case 'w':
case ' ':
case 0: {
r_core_cmdf (core, "ag-; .agR*; agg%c;", input[1]);
break;
}
case '*': {
RListIter *it;
RAnalFunction *fcn;
r_list_foreach (core->anal->fcns, it, fcn) {
r_core_anal_coderefs (core, fcn->addr);
}
break;
}
default:
eprintf ("Usage: see ag?\n");
break;
}
break;
case 'x': // agx "cross refs"
switch (input[1]) {
case 'v':
Expand Down Expand Up @@ -6018,12 +6050,14 @@ static void cmd_anal_graph(RCore *core, const char *input) {
if (cmd && *cmd) {
r_core_cmd0 (core, cmd);
}
core->graph->is_callgraph = false;
free (cmd);
break;
}
case 0:
core->graph->is_callgraph = true;
r_core_cmd0 (core, "ag-; .agc* $$; agg;");
core->graph->is_callgraph = false;
break;
case 'g': {
ut64 addr = input[2] ? r_num_math (core->num, input + 2): core->offset;
Expand Down Expand Up @@ -6095,6 +6129,34 @@ static void cmd_anal_graph(RCore *core, const char *input) {
break;
}
break;
case 'A': // "agA" global data refs
switch (input[1]) {
case 'v':
case 't':
case 'd':
case 'J':
case 'j':
case 'g':
case 'k':
case 'w':
case ' ':
case 0: {
r_core_cmdf (core, "ag-; .agA*; agg%c;", input[1]);
break;
}
case '*': {
RListIter *it;
RAnalFunction *fcn;
r_list_foreach (core->anal->fcns, it, fcn) {
r_core_anal_datarefs (core, fcn->addr);
}
break;
}
default:
eprintf ("Usage: see ag?\n");
break;
}
break;
case 'd': // "agd"
switch (input[1]) {
case 'v':
Expand Down
16 changes: 11 additions & 5 deletions libr/core/graph.c
View file
Open in desktop
Expand Up @@ -3317,15 +3317,16 @@ R_API RANode *r_agraph_add_node(const RAGraph *g, const char *title, const char
if (!res) {
return NULL;
}
res->title = title? strdup (title): strdup ("");

res->title = title? r_str_trunc_ellipsis (title, 255) : strdup ("");
res->body = body? strdup (body): strdup ("");
res->layer = -1;
res->pos_in_layer = -1;
res->is_dummy = false;
res->is_reversed = false;
res->klass = -1;
res->gnode = r_graph_add_node (g->graph, res);
sdb_num_set (g->nodes, title, (ut64) (size_t) res, 0);
sdb_num_set (g->nodes, res->title, (ut64) (size_t) res, 0);
if (res->title) {
char *s, *estr, *b;
size_t len;
Expand All @@ -3345,15 +3346,17 @@ R_API RANode *r_agraph_add_node(const RAGraph *g, const char *title, const char
}

R_API bool r_agraph_del_node(const RAGraph *g, const char *title) {
RANode *an, *res = r_agraph_get_node (g, title);
char *title_trunc = r_str_trunc_ellipsis (title, 255);
RANode *an, *res = r_agraph_get_node (g, title_trunc);
free (title_trunc);
const RList *innodes;
RGraphNode *gn;
RListIter *it;

if (!res) {
return false;
}
sdb_set (g->nodes, title, NULL, 0);
sdb_set (g->nodes, res->title, NULL, 0);
sdb_array_remove (g->db, "agraph.nodes", res->title, 0);
sdb_set (g->db, sdb_fmt ("agraph.nodes.%s", res->title), NULL, 0);
sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.body", res->title), 0, 0);
Expand Down Expand Up @@ -3426,7 +3429,10 @@ R_API RANode *r_agraph_get_first_node(const RAGraph *g) {
}

R_API RANode *r_agraph_get_node(const RAGraph *g, const char *title) {
return (RANode *) (size_t) sdb_num_get (g->nodes, title, NULL);
char *title_trunc = title ? r_str_trunc_ellipsis (title, 255) : NULL;
RANode *node = (RANode *) (size_t) sdb_num_get (g->nodes, title_trunc, NULL);
free (title_trunc);
return node;
}

R_API void r_agraph_add_edge(const RAGraph *g, RANode *a, RANode *b) {
Expand Down
1 change: 1 addition & 0 deletions libr/include/r_util/r_str.h
View file
Open in desktop
Expand Up @@ -67,6 +67,7 @@ R_API bool r_str_is_printable_incl_newlines(const char *str);
R_API char *r_str_appendlen(char *ptr, const char *string, int slen);
R_API char *r_str_newf(const char *fmt, ...);
R_API char *r_str_newlen(const char *str, int len);
R_API char *r_str_trunc_ellipsis(const char *str, int len);
R_API const char *r_str_bool(int b);
R_API const char *r_str_ansi_chrn(const char *str, int n);
R_API int r_str_ansi_len(const char *str);
Expand Down
11 changes: 11 additions & 0 deletions libr/util/str.c
View file
Open in desktop
Expand Up @@ -652,6 +652,17 @@ R_API char *r_str_newlen(const char *str, int len) {
return buf;
}

R_API char *r_str_trunc_ellipsis(const char *str, int len) {
char *buf;
if (strlen (str) < len) {
buf = strdup (str);
} else {
buf = r_str_newlen (str, len);
strcpy (buf + len - 4, "...");
}
return buf;
}

// Returns a new heap-allocated string that matches the format-string
// specification.
R_API char *r_str_newf(const char *fmt, ...) {
Expand Down