Type trace

libr/anal/anal.c

@@ -69,6 +69,84 @@ static void r_meta_item_free(void *_item) {
 	}
 }
 
+#if USE_NEW_ESIL
+static bool anal_esil_mem_switch (void *mem, ut32 idx) {
+	RAnal *anal = mem;
+	if (!anal || !anal->iob.init) {
+		R_LOG_WARN ("anal->iob is not setup");
+		return false;
+	}
+	return anal->iob.bank_use (anal->iob.io, idx);
+}
+
+static bool anal_esil_mem_read (void *mem, ut64 addr, ut8 *buf, int len) {
+	RAnal *anal = mem;
+	if (!anal || !anal->iob.init) {
+		R_LOG_WARN ("anal->iob is not setup");
+		return false;
+	}
+	return anal->iob.read_at (anal->iob.io, addr, buf, len);
+}
+
+static bool anal_esil_mem_write (void *mem, ut64 addr, const ut8 *buf, int len) {
+	RAnal *anal = mem;
+	if (!anal || !anal->iob.init) {
+		R_LOG_WARN ("anal->iob is not setup");
+		return false;
+	}
+	return anal->iob.write_at (anal->iob.io, addr, buf, len);
+}
+
+REsilMemInterface anal_esil_mem_if = {
+	.mem_switch = anal_esil_mem_switch,
+	.mem_read = anal_esil_mem_read,
+	.mem_write = anal_esil_mem_write
+};
+
+static bool anal_esil_is_reg (void *user, const char *name) {
+	RRegItem *ri = r_reg_get (((RAnal *)user)->reg, name, -1);
+	if (!ri) {
+		return false;
+	}
+	r_unref (ri);
+	return true;
+}
+
+static bool anal_esil_reg_read(void *user, const char *name, ut64 *val) {
+	RRegItem *ri = r_reg_get (((RAnal *)user)->reg, name, -1);
+	if (!ri) {
+		return false;
+	}
+	ut64 v = r_reg_get_value (((RAnal *)user)->reg, ri);
+	if (val) {
+		*val = v;
+	}
+	r_unref (ri);
+	return true;
+}
+
+static bool anal_esil_reg_write (void *user, const char *name, ut64 val) {
+	return r_reg_setv (((RAnal *)user)->reg, name, val);
+}
+
+static ut32 anal_esil_reg_size (void *user, const char *name) {
+	RRegItem *ri = r_reg_get (((RAnal *)user)->reg, name, -1);
+	if (!ri) {
+		return 0;
+	}
+	const ut32 size = ri->size;
+	r_unref (ri);
+	return size;
+}
+
+static REsilRegInterface anal_esil_reg_if = {
+	.is_reg = anal_esil_is_reg,
+	.reg_read = anal_esil_reg_read,
+	.reg_write = anal_esil_reg_write,
+	.reg_size = anal_esil_reg_size
+};
+#endif
+
 // Take nullable RArchConfig as argument?
 R_API RAnal *r_anal_new(void) {
 	int i;
@@ -113,7 +191,13 @@ R_API RAnal *r_anal_new(void) {
 	anal->sdb_classes_attrs = sdb_ns (anal->sdb_classes, "attrs", 1);
 	anal->zign_path = strdup ("");
 	anal->cb_printf = (PrintfCallback) printf;
+#if USE_NEW_ESIL
+	anal_esil_reg_if.user = anal;
+	anal_esil_mem_if.user = anal;
+	anal->esil = r_esil_new_ex (4096, 0, 1, &anal_esil_reg_if, &anal_esil_mem_if);
+#else
 	anal->esil = r_esil_new (4096, 0, 1);
+#endif
 	anal->esil->anal = anal;
 	(void)r_anal_pin_init (anal);
 	(void)r_anal_xrefs_init (anal);

libr/anal/esil_dfg.c

@@ -1554,7 +1554,11 @@ R_API RAnalEsilDFG *r_anal_esil_dfg_new(RAnal* anal, bool use_map_info, bool use
 		free (dfg);
 		return NULL;
 	}
+#if USE_NEW_ESIL
+	dfg->esil = r_esil_new_simple (1, anal->reg, &anal->iob);
+#else
 	dfg->esil = r_esil_new (4096, 0, 1);
+#endif
 	if (!dfg->esil) {
 		r_reg_free (dfg->reg);
 		free (dfg);
@@ -1644,13 +1648,17 @@ R_API void r_anal_esil_dfg_free(RAnalEsilDFG *dfg) {
 R_API RAnalEsilDFG *r_anal_esil_dfg_expr(RAnal *anal, RAnalEsilDFG * R_NULLABLE dfg, const char *expr,
 	bool use_map_info, bool use_maps) {
 	R_RETURN_VAL_IF_FAIL (anal && expr, NULL);
+#if USE_NEW_ESIL
+	REsil *esil = r_esil_new_simple (1, anal->reg, &anal->iob);
+#else
 	REsil *esil = r_esil_new (4096, 0, 1);
+#endif
 	if (!esil) {
 		return NULL;
 	}
 	esil->anal = anal;
 
-	RAnalEsilDFG *edf = dfg ? dfg : r_anal_esil_dfg_new (anal, use_map_info, use_maps);
+	RAnalEsilDFG *edf = dfg? dfg: r_anal_esil_dfg_new (anal, use_map_info, use_maps);
 	if (!edf) {
 		r_esil_free (esil);
 		return NULL;