Re: [PATCH 09/33] target/hppa: Populate CPUClass.mmu_index

[Helge Deller <deller@gmx.de>]

On 1/30/24 00:30, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/hppa/cpu.h |  7 ++-----
>   target/hppa/cpu.c | 12 ++++++++++++
>   2 files changed, 14 insertions(+), 5 deletions(-)

Reviewed-by: Helge Deller <deller@gmx.de>




> diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
> index 6a153405d2..04439f247d 100644
> --- a/target/hppa/cpu.h
> +++ b/target/hppa/cpu.h
> @@ -281,16 +281,13 @@ static inline int HPPA_BTLB_ENTRIES(CPUHPPAState *env)
>       return hppa_is_pa20(env) ? 0 : PA10_BTLB_FIXED + PA10_BTLB_VARIABLE;
>   }
>
> +int hppa_cpu_mmu_index(CPUState *cs, bool ifetch);
>   static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)
>   {
>   #ifdef CONFIG_USER_ONLY
>       return MMU_USER_IDX;
>   #else
> -    if (env->psw & (ifetch ? PSW_C : PSW_D)) {
> -        return PRIV_P_TO_MMU_IDX(env->iaoq_f & 3, env->psw & PSW_P);
> -    }
> -    /* mmu disabled */
> -    return env->psw & PSW_W ? MMU_ABS_W_IDX : MMU_ABS_IDX;
> +    return hppa_cpu_mmu_index(env_cpu(env), ifetch);
>   #endif
>   }
>
> diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> index 3c019855b4..fbb37e541e 100644
> --- a/target/hppa/cpu.c
> +++ b/target/hppa/cpu.c
> @@ -94,6 +94,17 @@ static bool hppa_cpu_has_work(CPUState *cs)
>       return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
>   }
>
> +int hppa_cpu_mmu_index(CPUState *cs, bool ifetch)
> +{
> +    CPUHPPAState *env = cpu_env(cs);
> +
> +    if (env->psw & (ifetch ? PSW_C : PSW_D)) {
> +        return PRIV_P_TO_MMU_IDX(env->iaoq_f & 3, env->psw & PSW_P);
> +    }
> +    /* mmu disabled */
> +    return env->psw & PSW_W ? MMU_ABS_W_IDX : MMU_ABS_IDX;
> +}
> +
>   static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info)
>   {
>       info->mach = bfd_mach_hppa20;
> @@ -194,6 +205,7 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data)
>
>       cc->class_by_name = hppa_cpu_class_by_name;
>       cc->has_work = hppa_cpu_has_work;
> +    cc->mmu_index = hppa_cpu_mmu_index;
>       cc->dump_state = hppa_cpu_dump_state;
>       cc->set_pc = hppa_cpu_set_pc;
>       cc->get_pc = hppa_cpu_get_pc;