X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=gen-icount.h;h=8879da633525f3ecfe78b64092f7b3cec6397067;hb=2caa9e9d2e0f356cc244bc41ce1d3e81663f6782;hp=d4524d6634624c0884424080835aad7b5d7ad12f;hpb=1d6198c3b01619151f3227c6461b3d53eeb711e5;p=qemu.git

diff --git a/gen-icount.h b/gen-icount.h
index d4524d663..8879da633 100644
--- a/gen-icount.h
+++ b/gen-icount.h
@@ -1,3 +1,5 @@
+#include "qemu-timer.h"
+
 /* Helpers for instruction counting code generation.  */
 
 static TCGArg *icount_arg;
@@ -11,14 +13,7 @@ static inline void gen_icount_start(void)
         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_i32();
-#else
-    count = ICOUNT_TEMP;
-#endif
     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_i32(count);
-#endif
 }
 
 static void gen_icount_end(TranslationBlock *tb, int num_insns)
@@ -40,7 +33,7 @@ static void gen_icount_end(TranslationBlock *tb, int num_insns)
     }
 }
 
-static void inline gen_io_start(void)
+static inline void gen_io_start(void)
 {
     TCGv_i32 tmp = tcg_const_i32(1);
     tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));