diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c index 90c660dfe9f7b..7d535ce18ff14 100644 --- a/libr/anal/fcn.c +++ b/libr/anal/fcn.c @@ -1082,7 +1082,7 @@ static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 len, int // if page have exec perms ut64 da = (ut64)r_read_ble32 (dd, R_ARCH_CONFIG_IS_BIG_ENDIAN (anal->config)); if (da != UT32_MAX && da != UT64_MAX && anal->iob.is_valid_offset (anal->iob.io, da, 0)) { - /// R2_590 - this must be CODE | READ , not CODE|DATA, but raises 10 fails + /// TODO: this must be CODE | READ , not CODE|DATA, but raises 10 fails // r_anal_xrefs_set (anal, op->addr, da, R_ANAL_REF_TYPE_CODE | R_ANAL_REF_TYPE_DATA); r_anal_xrefs_set (anal, op->addr, da, R_ANAL_REF_TYPE_ICOD | R_ANAL_REF_TYPE_EXEC); } else { @@ -1706,28 +1706,6 @@ R_API int r_anal_function(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 len, return ret; } -#if 0 -// XXX R2_590 - deprecate -R_API int r_anal_function_del_locs(RAnal *anal, ut64 addr) { - RListIter *iter, *iter2; - RAnalFunction *fcn, *f = r_anal_get_fcn_in (anal, addr, R_ANAL_FCN_TYPE_ROOT); - if (!f) { - return false; - } - r_list_foreach_safe (anal->fcns, iter, iter2, fcn) { - if (fcn->type != R_ANAL_FCN_TYPE_LOC) { - continue; - } - if (r_anal_function_contains (fcn, addr)) { - r_anal_function_delete (fcn); - break; - } - } - r_anal_function_del (anal, addr); - return true; -} -#endif - R_API int r_anal_function_del(RAnal *a, ut64 addr) { RAnalFunction *fcn = r_anal_get_function_at (a, addr); if (fcn) { diff --git a/libr/core/cmd_anal.inc.c b/libr/core/cmd_anal.inc.c index 9f27b368b0f88..24d793ee3d4e1 100644 --- a/libr/core/cmd_anal.inc.c +++ b/libr/core/cmd_anal.inc.c @@ -4743,7 +4743,6 @@ static int cmd_af(RCore *core, const char *input) { r_list_foreach_safe (core->anal->fcns, iter, iter2, f) { ut64 addr = f->addr; r_anal_del_jmprefs (core->anal, f); - // r_anal_function_del_locs (core->anal, f->addr); // r_anal_function_del (core->anal, addr); r_core_anal_undefine (core, addr); } @@ -4751,7 +4750,6 @@ static int cmd_af(RCore *core, const char *input) { ut64 addr = input[2] ? r_num_math (core->num, input + 2) : core->offset; - // r_anal_function_del_locs (core->anal, addr); // r_anal_function_del (core->anal, addr); r_core_anal_undefine (core, addr); } @@ -5845,7 +5843,6 @@ R_API void r_core_anal_undefine(RCore *core, ut64 off) { r_meta_del (core->anal, R_META_TYPE_ANY, r_anal_function_min_addr (f), r_anal_function_linear_size (f)); r_anal_function_del (core->anal, off); } - //r_anal_function_del_locs (core->anal, off); r_anal_delete_block_at (core->anal, off); char *abcmd = r_str_newf ("ab-0x%"PFMT64x, off); if (abcmd) { diff --git a/libr/include/r_anal.h b/libr/include/r_anal.h index 5eb9552d7eb49..de54f2bde1d72 100644 --- a/libr/include/r_anal.h +++ b/libr/include/r_anal.h @@ -1026,7 +1026,6 @@ R_API RAnalFunction *r_anal_get_function_byname(RAnal *anal, const char *name); R_API int r_anal_function(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 len, int reftype); R_API int r_anal_function_del(RAnal *anal, ut64 addr); -R_API int r_anal_function_del_locs(RAnal *anal, ut64 addr); R_API bool r_anal_function_add_bb(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 size, ut64 jump, ut64 fail, R_BORROW RAnalDiff *diff);