From 944eea962be94b98f8f6f570f9c4eb3b58dc296d Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 7 Apr 2014 23:08:47 -0700 Subject: tcg: Push tcg-runtime routines into exec/helper-* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than special casing them, use the standard mechanisms for tcg helper generation. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/helper-gen.h | 1 + include/exec/helper-head.h | 12 ++++++++---- include/exec/helper-proto.h | 1 + include/exec/helper-tcg.h | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'include/exec') diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index f6d9ec3167..abde615e92 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -80,6 +80,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ } #include "helper.h" +#include "tcg-runtime.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h index 2cbae22b5f..0b5bd8398e 100644 --- a/include/exec/helper-head.h +++ b/include/exec/helper-head.h @@ -18,6 +18,8 @@ #ifndef DEF_HELPER_H #define DEF_HELPER_H 1 +#include "qemu/osdep.h" + #define HELPER(name) glue(helper_, name) #define GET_TCGV_i32 GET_TCGV_I32 @@ -32,10 +34,12 @@ #define dh_alias_s64 i64 #define dh_alias_f32 i32 #define dh_alias_f64 i64 -#if TARGET_LONG_BITS == 32 -#define dh_alias_tl i32 -#else -#define dh_alias_tl i64 +#ifdef TARGET_LONG_BITS +# if TARGET_LONG_BITS == 32 +# define dh_alias_tl i32 +# else +# define dh_alias_tl i64 +# endif #endif #define dh_alias_ptr ptr #define dh_alias_void void diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index 88d3543119..828951c609 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -27,6 +27,7 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ dh_ctype(t4), dh_ctype(t5)); #include "helper.h" +#include "tcg-runtime.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 9be5429fa1..0da6b9788a 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -24,6 +24,7 @@ DEF_HELPER_FLAGS_0(name, flags, ret) DEF_HELPER_FLAGS_0(name, flags, ret) #include "helper.h" +#include "tcg-runtime.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 -- cgit 1.4.1