X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=gen-icount.h;h=5fb3829781595029508156ea16e4d73ed4e9f92e;hb=88ca9f047bf8df20ae0a6305d99cbad1e893777f;hp=172b2bc7d7c32ebe854cc5e70ae5a75b374ea65a;hpb=dd5d6fe913b458463aecb3abd6dca049e5d5b0c6;p=qemu.git

diff --git a/gen-icount.h b/gen-icount.h
index 172b2bc7d..5fb382978 100644
--- a/gen-icount.h
+++ b/gen-icount.h
@@ -1,24 +1,19 @@
-/* Helpewrs for instruction counting code genration.  */
+#include "qemu-timer.h"
+
+/* Helpers for instruction counting code generation.  */
 
 static TCGArg *icount_arg;
 static int icount_label;
 
 static inline void gen_icount_start(void)
 {
-    TCGv count;
+    TCGv_i32 count;
 
     if (!use_icount)
         return;
 
     icount_label = gen_new_label();
-    /* FIXME: This generates lousy code.  We can't use tcg_new_temp because
-       count needs to live over the conditional branch.  To workaround this
-       we allow the target to supply a convenient register temporary.  */
-#ifndef ICOUNT_TEMP
-    count = tcg_temp_local_new(TCG_TYPE_I32);
-#else
-    count = ICOUNT_TEMP;
-#endif
+    count = tcg_temp_local_new_i32();
     tcg_gen_ld_i32(count, cpu_env, offsetof(CPUState, icount_decr.u32));
     /* This is a horrid hack to allow fixing up the value later.  */
     icount_arg = gen_opparam_ptr + 1;
@@ -26,9 +21,7 @@ static inline void gen_icount_start(void)
 
     tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, icount_label);
     tcg_gen_st16_i32(count, cpu_env, offsetof(CPUState, icount_decr.u16.low));
-#ifndef ICOUNT_TEMP
-    tcg_temp_free(count);
-#endif
+    tcg_temp_free_i32(count);
 }
 
 static void gen_icount_end(TranslationBlock *tb, int num_insns)
@@ -36,21 +29,20 @@ static void gen_icount_end(TranslationBlock *tb, int num_insns)
     if (use_icount) {
         *icount_arg = num_insns;
         gen_set_label(icount_label);
-        tcg_gen_exit_tb((long)tb + 2);
+        tcg_gen_exit_tb((tcg_target_long)tb + 2);
     }
 }
 
-static void inline gen_io_start(void)
+static inline void gen_io_start(void)
 {
-    TCGv tmp = tcg_const_i32(1);
+    TCGv_i32 tmp = tcg_const_i32(1);
     tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));
-    tcg_temp_free(tmp);
+    tcg_temp_free_i32(tmp);
 }
 
 static inline void gen_io_end(void)
 {
-    TCGv tmp = tcg_const_i32(0);
+    TCGv_i32 tmp = tcg_const_i32(0);
     tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));
-    tcg_temp_free(tmp);
+    tcg_temp_free_i32(tmp);
 }
-