Re: [PATCH 10/84] accel/tcg: Widen plugin_gen_empty_mem_callback to i64

[Alex Bennée]

Richard Henderson <richard.henderson@linaro.org> writes:

> Since we do this inside gen_empty_mem_cb anyway, let's
> do this earlier inside tcg expansion.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  include/exec/plugin-gen.h |  4 ++--
>  accel/tcg/plugin-gen.c    |  9 +++------
>  tcg/tcg-op-ldst.c         | 28 ++++++++++++++++++++--------
>  3 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h
> index 5f5506f1cc..3af0168e65 100644
> --- a/include/exec/plugin-gen.h
> +++ b/include/exec/plugin-gen.h
> @@ -27,7 +27,7 @@ void plugin_gen_insn_start(CPUState *cpu, const struct 
> DisasContextBase *db);
>  void plugin_gen_insn_end(void);
>  
>  void plugin_gen_disable_mem_helpers(void);
> -void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info);
> +void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info);
>  
>  static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t 
> size)
>  {
> @@ -69,7 +69,7 @@ static inline void plugin_gen_tb_end(CPUState *cpu)
>  static inline void plugin_gen_disable_mem_helpers(void)
>  { }
>  
> -static inline void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info)
> +static inline void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t 
> info)
>  { }
>  
>  static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t 
> size)
> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
> index 55e892b684..34be1b940c 100644
> --- a/accel/tcg/plugin-gen.c
> +++ b/accel/tcg/plugin-gen.c
> @@ -124,23 +124,20 @@ static void gen_empty_inline_cb(void)
>      tcg_temp_free_i64(val);
>  }
>  
> -static void gen_empty_mem_cb(TCGv vaddr, uint32_t info)
> +static void gen_empty_mem_cb(TCGv_i64 addr, uint32_t info)

You bounced the name a few times in this series:

  445a4a2f14 accel/tcg: Widen plugin_gen_empty_mem_callback to i64
  modified   accel/tcg/plugin-gen.c
  @@ -127,3 +127,3 @@
  -static void gen_empty_mem_cb(TCGv vaddr, uint32_t info)
  +static void gen_empty_mem_cb(TCGv_i64 addr, uint32_t info)
   {
       TCGv_i32 cpu_index = tcg_temp_ebb_new_i32();

  8b99baa592 accel/tcg: Merge do_gen_mem_cb into caller
  modified   accel/tcg/plugin-gen.c
  @@ -148,3 +127,3 @@
  -static void gen_empty_mem_cb(TCGv addr, uint32_t info)
  +static void gen_empty_mem_cb(TCGv vaddr, uint32_t info)
   {
  -    do_gen_mem_cb(addr, info);
  +    TCGv_i32 cpu_index = tcg_temp_ebb_new_i32();

  38b47b19ec plugin-gen: add module for TCG-related code
  modified   accel/tcg/plugin-gen.c
  @@ -0,0 +145,3 @@
  +static void gen_empty_mem_cb(TCGv addr, uint32_t info)
  +{
  +    do_gen_mem_cb(addr, info);

Otherwise:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro