From 711b8b9b1d0984e344a6953665e592f7a4acc88f Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Mon, 16 Jan 2023 15:03:17 +0100
Subject: [PATCH] Fix libafl_helper_table_add with new init_call_layout

---
 accel/tcg/translate-all.c | 4 ++--
 tcg/tcg.c                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index c071a6d22c..cf47152187 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -84,7 +84,7 @@ void libafl_gen_backdoor(target_ulong pc);
 static TCGHelperInfo libafl_exec_edge_hook_info = {
     .func = NULL, .name = "libafl_exec_edge_hook", \
     .flags = dh_callflag(void), \
-    .typemask = dh_typemask(void, 0) | dh_typemask(i64, 1)
+    .typemask = dh_typemask(void, 0) | dh_typemask(i64, 1) | dh_typemask(i64, 2)
 };
 
 struct libafl_edge_hook {
@@ -127,7 +127,7 @@ void libafl_add_edge_hook(uint64_t (*gen)(target_ulong src, target_ulong dst, ui
 static TCGHelperInfo libafl_exec_block_hook_info = {
     .func = NULL, .name = "libafl_exec_block_hook", \
     .flags = dh_callflag(void), \
-    .typemask = dh_typemask(void, 0) | dh_typemask(i64, 1)
+    .typemask = dh_typemask(void, 0) | dh_typemask(i64, 1) | dh_typemask(i64, 2)
 };
 
 struct libafl_block_hook {
diff --git a/tcg/tcg.c b/tcg/tcg.c
index f410375091..fa6fbbfb8a 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -773,6 +773,7 @@ static TCGTemp *tcg_global_reg_new_internal(TCGContext *s, TCGType type,
 
 void libafl_helper_table_add(TCGHelperInfo* info);
 void libafl_helper_table_add(TCGHelperInfo* info) {
+    init_call_layout(info);
     g_hash_table_insert(helper_table, (gpointer)info->func,
                         (gpointer)info);
 }