diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index 6cb47c34..7a7a5ea7 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_AARCH64_H
 #define UNICORN_AUTOGEN_AARCH64_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_aarch64
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_aarch64
 #define use_idiv_instructions_rt use_idiv_instructions_rt_aarch64
 #define tcg_target_deposit_valid tcg_target_deposit_valid_aarch64
 #define helper_power_down helper_power_down_aarch64
diff --git a/qemu/arm.h b/qemu/arm.h
index 5ab27471..80225bdd 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_ARM_H
 #define UNICORN_AUTOGEN_ARM_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_arm
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_arm
 #define use_idiv_instructions_rt use_idiv_instructions_rt_arm
 #define tcg_target_deposit_valid tcg_target_deposit_valid_arm
 #define helper_power_down helper_power_down_arm
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 0561817d..047f6358 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -8,6 +8,7 @@ import sys
 
 symbols = (
     'aarch64_tb_set_jmp_target',
+    'ppc_tb_set_jmp_target',
     'use_idiv_instructions_rt',
     'tcg_target_deposit_valid',
     'helper_power_down',
diff --git a/qemu/m68k.h b/qemu/m68k.h
index 9a265549..f40a8dc4 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_M68K_H
 #define UNICORN_AUTOGEN_M68K_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_m68k
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_m68k
 #define use_idiv_instructions_rt use_idiv_instructions_rt_m68k
 #define tcg_target_deposit_valid tcg_target_deposit_valid_m68k
 #define helper_power_down helper_power_down_m68k
diff --git a/qemu/mips.h b/qemu/mips.h
index 57bb375a..1b8e9e2b 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_MIPS_H
 #define UNICORN_AUTOGEN_MIPS_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_mips
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_mips
 #define use_idiv_instructions_rt use_idiv_instructions_rt_mips
 #define tcg_target_deposit_valid tcg_target_deposit_valid_mips
 #define helper_power_down helper_power_down_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index a6af4eeb..06b30666 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_MIPS64_H
 #define UNICORN_AUTOGEN_MIPS64_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_mips64
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_mips64
 #define use_idiv_instructions_rt use_idiv_instructions_rt_mips64
 #define tcg_target_deposit_valid tcg_target_deposit_valid_mips64
 #define helper_power_down helper_power_down_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index c453400d..87cc74c8 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_MIPS64EL_H
 #define UNICORN_AUTOGEN_MIPS64EL_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_mips64el
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_mips64el
 #define use_idiv_instructions_rt use_idiv_instructions_rt_mips64el
 #define tcg_target_deposit_valid tcg_target_deposit_valid_mips64el
 #define helper_power_down helper_power_down_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index 4ad7be8d..a8a3fb4f 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_MIPSEL_H
 #define UNICORN_AUTOGEN_MIPSEL_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_mipsel
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_mipsel
 #define use_idiv_instructions_rt use_idiv_instructions_rt_mipsel
 #define tcg_target_deposit_valid tcg_target_deposit_valid_mipsel
 #define helper_power_down helper_power_down_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 80520561..fd831d98 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_POWERPC_H
 #define UNICORN_AUTOGEN_POWERPC_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_powerpc
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_powerpc
 #define use_idiv_instructions_rt use_idiv_instructions_rt_powerpc
 #define tcg_target_deposit_valid tcg_target_deposit_valid_powerpc
 #define helper_power_down helper_power_down_powerpc
diff --git a/qemu/sparc.h b/qemu/sparc.h
index b3c6d853..fda21bf4 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_SPARC_H
 #define UNICORN_AUTOGEN_SPARC_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_sparc
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_sparc
 #define use_idiv_instructions_rt use_idiv_instructions_rt_sparc
 #define tcg_target_deposit_valid tcg_target_deposit_valid_sparc
 #define helper_power_down helper_power_down_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index c8860863..aaafd634 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_SPARC64_H
 #define UNICORN_AUTOGEN_SPARC64_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_sparc64
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_sparc64
 #define use_idiv_instructions_rt use_idiv_instructions_rt_sparc64
 #define tcg_target_deposit_valid tcg_target_deposit_valid_sparc64
 #define helper_power_down helper_power_down_sparc64
diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c
index e5fe9167..7715aa66 100644
--- a/qemu/tcg/tcg.c
+++ b/qemu/tcg/tcg.c
@@ -740,7 +740,7 @@ void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret,
             } else {
                 tcg_gen_ext32u_i64(s, temp, orig);
             }
-            args[i] = GET_TCGV_I64(s, temp);
+            args[i] = GET_TCGV_I64(temp);
         }
     }
 #endif /* TCG_TARGET_EXTEND_ARGS */
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index df86439d..71025141 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -2,6 +2,7 @@
 #ifndef UNICORN_AUTOGEN_X86_64_H
 #define UNICORN_AUTOGEN_X86_64_H
 #define aarch64_tb_set_jmp_target aarch64_tb_set_jmp_target_x86_64
+#define ppc_tb_set_jmp_target ppc_tb_set_jmp_target_x86_64
 #define use_idiv_instructions_rt use_idiv_instructions_rt_x86_64
 #define tcg_target_deposit_valid tcg_target_deposit_valid_x86_64
 #define helper_power_down helper_power_down_x86_64