WIP: Actually, not just type trace

libr/anal/anal.c

@@ -128,6 +128,98 @@ 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;
+	}
+	*val = r_reg_get_value (((RAnal *)user)->reg, ri);
+	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 bool anal_esil_reg_alias (void *user, const char *name, const char *alias) {
+	int alias_type = r_reg_alias_fromstring (alias);
+	if (alias_type < 0) {
+		return false;
+	}
+	return r_reg_alias_setname (((RAnal *)user)->reg, alias_type, name);
+}
+
+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,
+	.reg_alias = anal_esil_reg_alias
+};
+
+static bool anal_esil_set_bits (void *user, int bits) {
+	return r_anal_set_triplet ((RAnal *)user, NULL, NULL, bits);
+}
+
+static REsilUtilInterface anal_esil_util_if = {
+	.set_bits = anal_esil_set_bits
+};
+#endif
+
 // Take nullable RArchConfig as argument?
 R_API RAnal *r_anal_new(void) {
 	int i;
@@ -176,7 +268,14 @@ 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.reg = anal;
+	anal_esil_mem_if.mem = anal;
+	anal_esil_util_if.user = anal;
+	anal->esil = r_esil_new_ex (4096, 0, 1, &anal_esil_reg_if, &anal_esil_mem_if, &anal_esil_util_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

@@ -1551,7 +1551,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);
@@ -1641,7 +1645,11 @@ 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;
 	}

libr/anal/p/anal_tp.c

@@ -1159,6 +1159,14 @@ static ut32 tt_reg_size(void *reg, const char *name) {
 	return size;
 }
 
+static bool tt_reg_alias(void *reg, const char *name, const char *alias) {
+	int alias_type = r_reg_alias_fromstring (alias);
+	if (alias_type < 0) {
+		return false;
+	}
+	return r_reg_alias_setname (reg, alias_type, name);
+}
+
 static bool tt_mem_read(void *mem, ut64 addr, ut8 *buf, int len) {
 	TPState *tps = (TPState *)mem;
 	if (tps->anal->iob.read_at) {
@@ -1306,14 +1314,15 @@ static TPState *tps_init(RAnal *anal) {
 	tps->reg_if.reg_read = tt_reg_read;
 	tps->reg_if.reg_write = (REsilRegWrite)r_reg_setv;
 	tps->reg_if.reg_size = tt_reg_size;
+	tps->reg_if.reg_alias = tt_reg_alias;
 	tps->mem_if.mem = tps;
 	tps->mem_if.mem_read = tt_mem_read;
 	tps->mem_if.mem_write = tt_mem_write;
 	ut64 sp = tps->stack_base + stack_size - (stack_size % align) - align * 8;
 	// todo: this probably needs some boundary checks
 	r_reg_setv (reg, "SP", sp);
 	r_reg_setv (reg, "BP", sp);
-	if (!r_esil_init (&tps->esil, 4096, false, anal->config->bits, &tps->reg_if, &tps->mem_if)) {
+	if (!r_esil_init (&tps->esil, 4096, false, anal->config->bits, &tps->reg_if, &tps->mem_if, NULL)) {
 		r_reg_free (reg);
 		if (anal->iob.fd_close) {
 			anal->iob.fd_close (io, tps->stack_fd);