Re: [Qemu-devel] [PATCH 03/10] tcg: Push tcg-runtime routines into exec/helper-*

[Alex Bennée]

Richard Henderson <address@hidden> writes:

> Rather than special casing them, use the standard mechanisms
> for tcg helper generation.
>
> Signed-off-by: Richard Henderson <address@hidden>
> ---
>  include/exec/helper-gen.h   |  1 +
>  include/exec/helper-head.h  | 12 ++++++++----
>  include/exec/helper-proto.h |  1 +
>  include/exec/helper-tcg.h   |  1 +
>  tcg-runtime.c               | 40 +++++++++++++++++++++++++---------------
>  tcg/tcg-op.h                | 35 ++++++++++++++++++-----------------
>  tcg/tcg-runtime.h           | 30 +++++++++++++-----------------
>  tcg/tcg.c                   | 16 ----------------
>  tcg/tcg.h                   |  2 --
>  9 files changed, 67 insertions(+), 71 deletions(-)
>
> diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h
> index f6d9ec3..abde615 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 2cbae22..0b5bd83 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

This bit seems unrelated to the rest of the patch. In fact I can't see
any uses of the dh_alias_* in the code base although there is some
dh_alias() glue magic that could be throwing me off.

>  #endif
<snip>

Otherwise:

Reviewed-by: Alex Bennée <address@hidden>

-- 
Alex Bennée