Skip to content

Heapless strings for the emulation stack ##esil #25471

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

Open
trufae wants to merge 1 commit into
base: master
Choose a base branch
from
+296 −556
Open

Heapless strings for the emulation stack ##esil #25471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 20 additions & 60 deletions libr/anal/esil_dfg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ static RGraphNode *_edf_mem_get(RAnalEsilDFG *dfg, ut64 addr, ut32 size) {
return mem_node;
}

static RGraphNode *_edf_const_get(RAnalEsilDFG *dfg, char *const_value) {
static RGraphNode *_edf_const_get(RAnalEsilDFG *dfg, const char *const_value) {
RGraphNode *orig_value_gnode = r_graph_add_node (dfg->flow, r_anal_esil_dfg_node_new (dfg, const_value));
RAnalEsilDFGNode *value_node = r_anal_esil_dfg_node_new (dfg, const_value);
value_node->type = R_ANAL_ESIL_DFG_TAG_CONST;
Expand Down Expand Up @@ -692,7 +692,7 @@ static void edf_sf_constraint(RStrBuf *result, const char *new_node_str) {
}

static bool edf_sf(REsil *esil) {
char *bitsize = r_esil_pop (esil);
const char *bitsize = r_esil_pop (esil);
R_LOG_INFO ("bitsize not yet implemented for sf (%s)", bitsize);
return edf_use_new_push_1 (esil, "$s", edf_sf_constraint);
}
Expand Down Expand Up @@ -726,19 +726,15 @@ static bool edf_bf(REsil *esil) {
static bool _edf_consume_2_set_reg(REsil *esil, const bool use_origin) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *dst = r_esil_pop (esil);
char *src = r_esil_pop (esil);
const char *dst = r_esil_pop (esil);
const char *src = r_esil_pop (esil);

if (!src || !dst) {
free (dst);
free (src);
return false;
}

int dst_type = r_esil_get_parm_type (esil, dst);
if (dst_type == R_ESIL_PARM_INVALID) {
free (dst);
free (src);
return false;
}

Expand All @@ -756,15 +752,12 @@ static bool _edf_consume_2_set_reg(REsil *esil, const bool use_origin) {
RGraphNode *old_dst_node = dst_node;

if (!src_node || !dst_node) {
free (src);
free (dst);
return false;
}

RAnalEsilDFGNode *eop_node = r_anal_esil_dfg_node_new (edf, src);
r_strbuf_appendf (eop_node->content, ",%s,%s", dst, op_string);
eop_node->type = R_ANAL_ESIL_DFG_TAG_GENERATIVE;
free (src);

RGraphNode *op_node = r_graph_add_node (edf->flow, eop_node);
r_graph_add_edge (edf->flow, dst_node, op_node);
Expand All @@ -788,7 +781,6 @@ static bool _edf_consume_2_set_reg(REsil *esil, const bool use_origin) {
r_graph_add_edge (edf->flow, op_node, dst_node);
_edf_reg_set (edf, dst, dst_node);
edf->cur = dst_node;
free (dst);
return true;
}

Expand All @@ -804,7 +796,7 @@ static bool edf_consume_2_set_reg(REsil *esil) {
static bool edf_pop(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *src = r_esil_pop (esil);
const char *src = r_esil_pop (esil);
if (!src) {
return false;
}
Expand All @@ -818,13 +810,11 @@ static bool edf_pop(REsil *esil) {
src_node = _edf_var_get (edf, src);
}
if (!src_node) {
free (src);
return false;
}
RAnalEsilDFGNode *eop_node = r_anal_esil_dfg_node_new (edf, src);
r_strbuf_appendf (eop_node->content, ",%s", op_string);
eop_node->type = R_ANAL_ESIL_DFG_TAG_GENERATIVE;
free (src);
RGraphNode *op_node = r_graph_add_node (edf->flow, eop_node);
r_graph_add_edge (edf->flow, src_node, op_node);
return true;
Expand All @@ -833,7 +823,7 @@ static bool edf_pop(REsil *esil) {
#if 1
// TODO: kill DUP
static bool edf_dup(REsil *esil) {
char *src = r_esil_pop (esil);
const char *src = r_esil_pop (esil);
if (!src) {
return false;
}
Expand Down Expand Up @@ -880,11 +870,9 @@ static bool edf_dup(REsil *esil) {
static bool edf_consume_2_push_1(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *src[2] = { r_esil_pop (esil), r_esil_pop (esil) };
const char *src[2] = { r_esil_pop (esil), r_esil_pop (esil) };

if (!src[0] || !src[1]) {
free (src[0]);
free (src[1]);
return false;
}
RAnalEsilDFGNode *eop_node = r_anal_esil_dfg_node_new (edf, src[1]);
Expand Down Expand Up @@ -918,9 +906,6 @@ static bool edf_consume_2_push_1(REsil *esil) {
r_graph_add_edge (edf->flow, src_node[i], op_node);
}

free (src[0]);
free (src[1]);

RAnalEsilDFGNode *result = r_anal_esil_dfg_node_new (edf, "result_");
result->type = R_ANAL_ESIL_DFG_TAG_RESULT;
if (const_result) {
Expand All @@ -937,7 +922,7 @@ static bool edf_consume_2_push_1(REsil *esil) {
static bool edf_consume_1_push_1(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *src = r_esil_pop (esil);
const char *src = r_esil_pop (esil);
if (!src) {
return false;
}
Expand Down Expand Up @@ -970,8 +955,6 @@ static bool edf_consume_1_push_1(REsil *esil) {
const_result = (eop_type == R_ESIL_OP_TYPE_MATH) & !! (ec_node->type & R_ANAL_ESIL_DFG_TAG_CONST);
}

free (src);

r_graph_add_edge (edf->flow, src_node, op_node);

RAnalEsilDFGNode *result = r_anal_esil_dfg_node_new (edf, "result_");
Expand Down Expand Up @@ -1015,7 +998,7 @@ static bool _edf_is_stack_or_mem_const_node(RAnalEsilDFG *dfg, RGraphNode *gnode
static bool edf_consume_1_get_mem_push_1(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *src = r_esil_pop (esil);
const char *src = r_esil_pop (esil);
if (!src) {
return false;
}
Expand Down Expand Up @@ -1065,20 +1048,17 @@ static bool edf_consume_1_get_mem_push_1(REsil *esil) {
// if (_edf_is_stack_or_mem_const_node (edf, src_node)) {
RStrBuf *expr = filter_gnode_expr (edf, src_node);
r_esil_parse (edf->esil, r_strbuf_get (expr));
char *src_addr_str = r_esil_pop (edf->esil);
const char *src_addr_str = r_esil_pop (edf->esil);
R_LOG_DEBUG ("resolved: %s => %s", r_strbuf_get (expr), src_addr_str);
r_strbuf_free (expr);
ut64 src_addr;
r_esil_get_parm (esil, src_addr_str, &src_addr);
free (src_addr_str);
r_esil_stack_free (edf->esil);
edf->iob.system (edf->iob.io, "reset");
mem_src_node = _edf_mem_get (edf, src_addr, mem_size);
}
}

free (src);

r_graph_add_edge (edf->flow, src_node, op_node);
if (mem_src_node) {
r_graph_add_edge (edf->flow, mem_src_node, op_node);
Expand All @@ -1101,12 +1081,10 @@ static bool edf_consume_1_get_mem_push_1(REsil *esil) {
static bool edf_consume_2_set_mem(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *dst = r_esil_pop (esil);
char *src = r_esil_pop (esil);
const char *dst = r_esil_pop (esil);
const char *src = r_esil_pop (esil);

if (!src || !dst) {
free (dst);
free (src);
return 0;
}

Expand Down Expand Up @@ -1167,11 +1145,10 @@ static bool edf_consume_2_set_mem(REsil *esil) {
if (((RAnalEsilDFGNode *)dst_node->data)->type & R_ANAL_ESIL_DFG_TAG_CONST) {
RStrBuf *expr = filter_gnode_expr (edf, dst_node);
r_esil_parse (edf->esil, r_strbuf_get (expr));
char *dst_addr_str = r_esil_pop (edf->esil);
const char *dst_addr_str = r_esil_pop (edf->esil);
R_LOG_DEBUG ("resolved: %s => %s", r_strbuf_get (expr), dst_addr_str);
r_strbuf_free (expr);
r_esil_get_parm (esil, dst_addr_str, &dst_addr);
free (dst_addr_str);
r_esil_stack_free (edf->esil);
edf->iob.system (edf->iob.io, "reset");
write_result = true;
Expand All @@ -1181,13 +1158,10 @@ static bool edf_consume_2_set_mem(REsil *esil) {
}

if (!src_node || !dst_node) {
free (src);
free (dst);
return false;
}

RAnalEsilDFGNode *eop_node = r_anal_esil_dfg_node_new (edf, src);
R_FREE (src);
r_strbuf_appendf (eop_node->content, ",%s,%s", dst, op_string);
eop_node->type = R_ANAL_ESIL_DFG_TAG_GENERATIVE;

Expand All @@ -1206,19 +1180,16 @@ static bool edf_consume_2_set_mem(REsil *esil) {
_edf_mem_set (edf, dst_addr, mem_size, dst_node);
}
r_graph_add_edge (edf->flow, op_node, dst_node);
free (dst);
return true;
}

static bool edf_consume_2_use_set_mem(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *dst = r_esil_pop (esil);
char *src = r_esil_pop (esil);
const char *dst = r_esil_pop (esil);
const char *src = r_esil_pop (esil);

if (!src || !dst) {
free (dst);
free (src);
return 0;
}

Expand Down Expand Up @@ -1279,11 +1250,10 @@ static bool edf_consume_2_use_set_mem(REsil *esil) {
if (((RAnalEsilDFGNode *)dst_node->data)->type & R_ANAL_ESIL_DFG_TAG_CONST) {
RStrBuf *expr = filter_gnode_expr (edf, dst_node);
r_esil_parse (edf->esil, r_strbuf_get (expr));
char *dst_addr_str = r_esil_pop (edf->esil);
const char *dst_addr_str = r_esil_pop (edf->esil);
R_LOG_DEBUG ("resolved: %s => %s", r_strbuf_get (expr), dst_addr_str);
r_strbuf_free (expr);
r_esil_get_parm (esil, dst_addr_str, &dst_addr);
free (dst_addr_str);
r_esil_stack_free (edf->esil);
edf->iob.system (edf->iob.io, "reset");
write_result = true;
Expand All @@ -1293,13 +1263,10 @@ static bool edf_consume_2_use_set_mem(REsil *esil) {
}

if (!src_node || !dst_node) {
free (src);
free (dst);
return false;
}

RAnalEsilDFGNode *eop_node = r_anal_esil_dfg_node_new (edf, src);
R_FREE (src);
r_strbuf_appendf (eop_node->content, ",%s,%s", dst, op_string);
eop_node->type = R_ANAL_ESIL_DFG_TAG_GENERATIVE;

Expand Down Expand Up @@ -1328,17 +1295,15 @@ static bool edf_consume_2_use_set_mem(REsil *esil) {
dst_node = r_graph_add_node (edf->flow, result);
}
r_graph_add_edge (edf->flow, op_node, dst_node);
free (dst);
return true;
}

static bool edf_consume_1_set_mem(REsil *esil) {
const char *op_string = esil->current_opstr;
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *dst = r_esil_pop (esil);
const char *dst = r_esil_pop (esil);

if (!dst) {
free (dst);
return 0;
}

Expand Down Expand Up @@ -1389,11 +1354,10 @@ static bool edf_consume_1_set_mem(REsil *esil) {
if (((RAnalEsilDFGNode *)dst_node->data)->type & R_ANAL_ESIL_DFG_TAG_CONST) {
RStrBuf *expr = filter_gnode_expr (edf, dst_node);
r_esil_parse (edf->esil, r_strbuf_get (expr));
char *dst_addr_str = r_esil_pop (edf->esil);
const char *dst_addr_str = r_esil_pop (edf->esil);
R_LOG_DEBUG ("resolved: %s => %s", r_strbuf_get (expr), dst_addr_str);
r_strbuf_free (expr);
r_esil_get_parm (esil, dst_addr_str, &dst_addr);
free (dst_addr_str);
r_esil_stack_free (edf->esil);
edf->iob.system (edf->iob.io, "reset");
write_result = true;
Expand All @@ -1403,7 +1367,6 @@ static bool edf_consume_1_set_mem(REsil *esil) {
}

if (!dst_node) {
free (dst);
return false;
}

Expand Down Expand Up @@ -1434,7 +1397,6 @@ static bool edf_consume_1_set_mem(REsil *esil) {
dst_node = r_graph_add_node (edf->flow, result);
}
r_graph_add_edge (edf->flow, op_node, dst_node);
free (dst);
return true;
}

Expand All @@ -1461,7 +1423,7 @@ static bool edf_use_new_push_1(REsil *esil, const char *op_string, AddConstraint

static bool edf_consume_1_use_old_new_push_1(REsil *esil, const char *op_string, AddConstraintStringConsume1UseOldNewCB cb) {
RAnalEsilDFG *edf = (RAnalEsilDFG *)esil->user;
char *src = r_esil_pop (esil);
const char *src = r_esil_pop (esil);

if (!src) {
return false;
Expand All @@ -1481,7 +1443,6 @@ static bool edf_consume_1_use_old_new_push_1(REsil *esil, const char *op_string,
} else {
src_node = _edf_var_get (edf, src);
}
free (src);

r_graph_add_edge (edf->flow, src_node, op_node);

Expand Down Expand Up @@ -2032,7 +1993,7 @@ R_API void r_anal_esil_dfg_fold_const(RAnal *anal, RAnalEsilDFG *dfg) {

// running filtered const-expression in esil
r_esil_parse (esil, r_strbuf_get (filtered));
char *reduced_const = r_esil_pop (esil);
const char *reduced_const = r_esil_pop (esil);
r_strbuf_free (filtered);

// this part needs some explanation:
Expand Down Expand Up @@ -2063,7 +2024,6 @@ R_API void r_anal_esil_dfg_fold_const(RAnal *anal, RAnalEsilDFG *dfg) {
gnode = (RGraphNode *)r_queue_dequeue (dfg->todo);
enode = (RAnalEsilDFGNode *)gnode->data;
r_strbuf_set (enode->content, reduced_const);
free (reduced_const);

while (!r_queue_is_empty (dfg->todo)) {
gnode = (RGraphNode *)r_queue_dequeue (dfg->todo);
Expand Down
6 changes: 2 additions & 4 deletions libr/arch/p/avr/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2011-2025 - pancake, Roc Valles, condret, killabyte */
/* radare - LGPL - Copyright 2011-2026 - pancake, Roc Valles, condret, killabyte */

#if 0
http://www.atmel.com/images/atmel-0856-avr-instruction-set-manual.pdf
Expand Down Expand Up @@ -237,12 +237,10 @@ static CPU_CONST *const_by_name(CPU_MODEL *cpu, int type, char *c) {
}

static int __esil_pop_argument(REsil *esil, ut64 *v) {
char *t = r_esil_pop (esil);
const char *t = r_esil_pop (esil);
if (!t || !r_esil_get_parm (esil, t, v)) {
free (t);
return false;
}
free (t);
return true;
}

Expand Down
3 changes: 1 addition & 2 deletions libr/arch/p/gb/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,12 +686,11 @@ static inline void gb_anal_cb_srl(RAnalOp *op, const ut8 data) {

static bool gb_custom_daa(REsil *esil) {
R_RETURN_VAL_IF_FAIL (esil, false);
char *v = r_esil_pop (esil);
const char *v = r_esil_pop (esil);
ut64 n;
if (!v || !r_esil_get_parm (esil, v, &n)) {
return false;
}
R_FREE (v);
ut8 val = (ut8)n;
if (R_UNLIKELY (!r_esil_reg_read (esil, "H", &n, NULL))) {
return false;
Expand Down
Loading
Loading