Re: [Qemu-devel] [PATCH 05/10] tcg: Inline tcg_gen_helperN

[Alex Bennée]

Richard Henderson <address@hidden> writes:

> Signed-off-by: Richard Henderson <address@hidden>

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

> ---
>  include/exec/helper-gen.h | 12 ++++++------
>  tcg/tcg-op.h              |  7 -------
>  2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h
> index abde615..208d1d2 100644
> --- a/include/exec/helper-gen.h
> +++ b/include/exec/helper-gen.h
> @@ -11,7 +11,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl0(ret)) \
>  { \
>    int sizemask; \
>    sizemask = dh_is_64bit(ret); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 0, 
> NULL); \
>  }
>  
>  #define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
> @@ -21,7 +21,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1
>    int sizemask = 0; \
>    dh_sizemask(ret, 0); \
>    dh_arg(t1, 1); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 1, 
> args); \
>  }
>  
>  #define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
> @@ -33,7 +33,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1
>    dh_sizemask(ret, 0); \
>    dh_arg(t1, 1); \
>    dh_arg(t2, 2); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 2, 
> args); \
>  }
>  
>  #define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
> @@ -46,7 +46,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1
>    dh_arg(t1, 1); \
>    dh_arg(t2, 2); \
>    dh_arg(t3, 3); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 3, args); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 3, 
> args); \
>  }
>  
>  #define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
> @@ -60,7 +60,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1
>    dh_arg(t2, 2); \
>    dh_arg(t3, 3); \
>    dh_arg(t4, 4); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 4, args); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 4, 
> args); \
>  }
>  
>  #define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
> @@ -76,7 +76,7 @@ static inline void glue(gen_helper_, 
> name)(dh_retvar_decl(ret) \
>    dh_arg(t3, 3); \
>    dh_arg(t4, 4); \
>    dh_arg(t5, 5); \
> -  tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 5, args); \
> +  tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 5, 
> args); \
>  }
>  
>  #include "helper.h"
> diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
> index f4367a0..719533a 100644
> --- a/tcg/tcg-op.h
> +++ b/tcg/tcg-op.h
> @@ -23,13 +23,6 @@
>   */
>  #include "tcg.h"
>  #include "exec/helper-proto.h"
> -
> -static inline void tcg_gen_helperN(void *func, int flags, int sizemask,
> -                                   TCGArg ret, int nargs, TCGArg *args)
> -{
> -    tcg_gen_callN(&tcg_ctx, func, flags, sizemask, ret, nargs, args);
> -}
> -
>  #include "exec/helper-gen.h"
>  
>  int gen_new_label(void);

-- 
Alex Bennée