Re: [PATCH v16 75/99] target/arm: make is_aa64 and arm_el_is_aa64 a macro for !TARGET_AARCH64

[Richard Henderson]

On 6/4/21 8:52 AM, Alex Bennée wrote:
> From: Claudio Fontana <cfontana@suse.de>
>
> when TARGET_AARCH64 is not defined, it is helpful to make
> is_aa64() and arm_el_is_aa64 macros defined to "false".
>
> This way we can make more code TARGET_AARCH64-only.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   target/arm/cpu.h | 37 ++++++++++++++++++++++++-------------
>   1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index b9b9bd8b01..8614948543 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -1060,6 +1060,11 @@ void aarch64_sve_narrow_vq(CPUARMState *env, unsigned 
> vq);
>   void aarch64_sve_change_el(CPUARMState *env, int old_el,
>                              int new_el, bool el0_a64);
>   
> +static inline bool is_a64(CPUARMState *env)
> +{
> +    return env->aarch64;
> +}
> +
>   /*
>    * SVE registers are encoded in KVM's memory in an endianness-invariant 
> format.
>    * The byte at offset i from the start of the in-memory representation 
> contains
> @@ -1089,7 +1094,10 @@ static inline void aarch64_sve_narrow_vq(CPUARMState 
> *env, unsigned vq) { }
>   static inline void aarch64_sve_change_el(CPUARMState *env, int o,
>                                            int n, bool a)
>   { }
> -#endif
> +
> +#define is_a64(env) ((void)env, false)

In theory, parenthesis are required around the env expansion.

> +#define arm_el_is_aa64(env, el) ((void)env, (void)el, false)

Likewise.  Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~