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

add afoj and afdj (#15254) ##anal

Browse Source
This commit is contained in:
Cyrill Leutwiler 2019-10-12 23:17:32 +02:00 committed by radare
parent b83d03abca
commit 2298b49f73
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libr/core/cmd_anal.c
View File

@ -2850,15 +2850,30 @@ static int cmd_anal_fcn(RCore *core, const char *input) {
addr = core->offset; addr = core->offset;
} }
RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, 0); RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, 0);
if (fcn) { if (input[2] == 'j') { // afdj
if (fcn->addr != addr) { PJ *pj = pj_new ();
r_cons_printf ("%s + %d\n", fcn->name, if (!pj) {
(int)(addr - fcn->addr)); return false;
} else {
r_cons_println (fcn->name);
} }
pj_o (pj);
if (fcn) {
pj_ks (pj, "name", fcn->name);
pj_ki (pj, "offset", (int)(addr - fcn->addr));
}
pj_end (pj);
r_cons_println (pj_string (pj));
pj_free (pj);
} else { } else {
eprintf ("afd: Cannot find function\n"); if (fcn) {
if (fcn->addr != addr) {
r_cons_printf ("%s + %d\n", fcn->name,
(int)(addr - fcn->addr));
} else {
r_cons_println (fcn->name);
}
} else {
eprintf ("afd: Cannot find function\n");
}
} }
} }
break; break;
@ -2962,10 +2977,24 @@ static int cmd_anal_fcn(RCore *core, const char *input) {
eprintf ("Usage: afo[?sj] ([name|offset])\n"); eprintf ("Usage: afo[?sj] ([name|offset])\n");
break; break;
case 'j': case 'j':
{
RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
PJ *pj = pj_new ();
if (!pj) {
return false;
}
pj_o (pj);
if (fcn) {
pj_ki (pj, "address", fcn->addr);
}
pj_end (pj);
r_cons_println (pj_string (pj));
pj_free (pj);
}
break;
case '\0': case '\0':
{ {
ut64 addr = core->offset; RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, R_ANAL_FCN_TYPE_NULL);
if (fcn) { if (fcn) {
r_cons_printf ("0x%08" PFMT64x "\n", fcn->addr); r_cons_printf ("0x%08" PFMT64x "\n", fcn->addr);
} }