Re: [Qemu-devel] [PATCH 08/18] tcg: Change memory offsets to intptr_t

[Aurelien Jarno <aurelien@aurel32.net>]

On Thu, Aug 22, 2013 at 09:58:39AM -0700, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/tcg.c | 16 +++++-----------
>  tcg/tcg.h |  8 +++-----
>  2 files changed, 8 insertions(+), 16 deletions(-)
> 
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index c23b23c..04f1727 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -380,7 +380,7 @@ TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name)
>  }
>  
>  static inline int tcg_global_mem_new_internal(TCGType type, int reg,
> -                                              tcg_target_long offset,
> +                                              intptr_t offset,
>                                                const char *name)
>  {
>      TCGContext *s = &tcg_ctx;
> @@ -440,21 +440,15 @@ static inline int tcg_global_mem_new_internal(TCGType type, int reg,
>      return idx;
>  }
>  
> -TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset,
> -                                const char *name)
> +TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name)
>  {
> -    int idx;
> -
> -    idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);
> +    int idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name);
>      return MAKE_TCGV_I32(idx);
>  }
>  
> -TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset,
> -                                const char *name)
> +TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name)
>  {
> -    int idx;
> -
> -    idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);
> +    int idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name);
>      return MAKE_TCGV_I64(idx);
>  }
>  
> diff --git a/tcg/tcg.h b/tcg/tcg.h
> index 6fb2126..5f5e535 100644
> --- a/tcg/tcg.h
> +++ b/tcg/tcg.h
> @@ -383,7 +383,7 @@ typedef struct TCGTemp {
>      int reg;
>      tcg_target_long val;
>      int mem_reg;
> -    tcg_target_long mem_offset;
> +    intptr_t mem_offset;
>      unsigned int fixed_reg:1;
>      unsigned int mem_coherent:1;
>      unsigned int mem_allocated:1;
> @@ -528,8 +528,7 @@ int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset);
>  void tcg_set_frame(TCGContext *s, int reg, intptr_t start, intptr_t size);
>  
>  TCGv_i32 tcg_global_reg_new_i32(int reg, const char *name);
> -TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset,
> -                                const char *name);
> +TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name);
>  TCGv_i32 tcg_temp_new_internal_i32(int temp_local);
>  static inline TCGv_i32 tcg_temp_new_i32(void)
>  {
> @@ -543,8 +542,7 @@ void tcg_temp_free_i32(TCGv_i32 arg);
>  char *tcg_get_arg_str_i32(TCGContext *s, char *buf, int buf_size, TCGv_i32 arg);
>  
>  TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name);
> -TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset,
> -                                const char *name);
> +TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name);
>  TCGv_i64 tcg_temp_new_internal_i64(int temp_local);
>  static inline TCGv_i64 tcg_temp_new_i64(void)
>  {
> -- 
> 1.8.1.4
> 
> 
> 

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net