Re: [PATCH v3 12/29] target/hppa: Prefer fast cpu_env() over slower CPU QOM cast macro

[Helge Deller]

On 1/29/24 17:44, Philippe Mathieu-Daudé wrote:
> Mechanical patch produced running the command documented
> in scripts/coccinelle/cpu_env.cocci_template header.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/hppa/cpu.c        | 8 ++------
>   target/hppa/int_helper.c | 8 ++------
>   target/hppa/mem_helper.c | 3 +--
>   3 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> index 14e17fa9aa..3200de0998 100644
> --- a/target/hppa/cpu.c
> +++ b/target/hppa/cpu.c
> @@ -106,11 +106,8 @@ void hppa_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
>                                     MMUAccessType access_type, int mmu_idx,
>                                     uintptr_t retaddr)
>   {
> -    HPPACPU *cpu = HPPA_CPU(cs);
> -    CPUHPPAState *env = &cpu->env;
> -
>       cs->exception_index = EXCP_UNALIGN;
> -    hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx));
> +    hppa_set_ior_and_isr(cpu_env(cs), addr, MMU_IDX_MMU_DISABLED(mmu_idx));
>
>       cpu_loop_exit_restore(cs, retaddr);
>   }
> @@ -145,8 +142,7 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error 
> **errp)
>   static void hppa_cpu_initfn(Object *obj)
>   {
>       CPUState *cs = CPU(obj);
> -    HPPACPU *cpu = HPPA_CPU(obj);
> -    CPUHPPAState *env = &cpu->env;
> +    CPUHPPAState *env = cpu_env(CPU(obj));

Here it can become cpu_env(cs) too.

The rest looks ok, so with that changed:
Reviewed-by: Helge Deller <deller@gmx.de>

Helge