Re: [Qemu-devel] [PATCH v4 12/35] cputlb: Tidy some macros

["Alex Bennée" <alex.bennee@linaro.org>]

Richard Henderson <rth@twiddle.net> writes:

> TGT_LE and TGT_BE are not size dependent and do not need to be
> redefined.  The others are no longer used at all.
>
> Signed-off-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  cputlb.c           |  8 ++++++++
>  softmmu_template.h | 22 ----------------------
>  2 files changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/cputlb.c b/cputlb.c
> index 1bee47d..82cf46e 100644
> --- a/cputlb.c
> +++ b/cputlb.c
> @@ -585,6 +585,14 @@ void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx,
>      }
>  }
>
> +#ifdef TARGET_WORDS_BIGENDIAN
> +# define TGT_BE(X)  (X)
> +# define TGT_LE(X)  BSWAP(X)
> +#else
> +# define TGT_BE(X)  BSWAP(X)
> +# define TGT_LE(X)  (X)
> +#endif
> +
>  #define MMUSUFFIX _mmu
>
>  #define DATA_SIZE 1
> diff --git a/softmmu_template.h b/softmmu_template.h
> index 035ffc8..4a2b665 100644
> --- a/softmmu_template.h
> +++ b/softmmu_template.h
> @@ -78,14 +78,6 @@
>  # define BSWAP(X)  (X)
>  #endif
>
> -#ifdef TARGET_WORDS_BIGENDIAN
> -# define TGT_BE(X)  (X)
> -# define TGT_LE(X)  BSWAP(X)
> -#else
> -# define TGT_BE(X)  BSWAP(X)
> -# define TGT_LE(X)  (X)
> -#endif
> -
>  #if DATA_SIZE == 1
>  # define helper_le_ld_name  glue(glue(helper_ret_ld, USUFFIX), MMUSUFFIX)
>  # define helper_be_ld_name  helper_le_ld_name
> @@ -102,14 +94,6 @@
>  # define helper_be_st_name  glue(glue(helper_be_st, SUFFIX), MMUSUFFIX)
>  #endif
>
> -#ifdef TARGET_WORDS_BIGENDIAN
> -# define helper_te_ld_name  helper_be_ld_name
> -# define helper_te_st_name  helper_be_st_name
> -#else
> -# define helper_te_ld_name  helper_le_ld_name
> -# define helper_te_st_name  helper_le_st_name
> -#endif
> -
>  #ifndef SOFTMMU_CODE_ACCESS
>  static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env,
>                                                size_t mmu_idx, size_t index,
> @@ -441,15 +425,9 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
>  #undef USUFFIX
>  #undef SSUFFIX
>  #undef BSWAP
> -#undef TGT_BE
> -#undef TGT_LE
> -#undef CPU_BE
> -#undef CPU_LE
>  #undef helper_le_ld_name
>  #undef helper_be_ld_name
>  #undef helper_le_lds_name
>  #undef helper_be_lds_name
>  #undef helper_le_st_name
>  #undef helper_be_st_name
> -#undef helper_te_ld_name
> -#undef helper_te_st_name


--
Alex Bennée