On Thu May 2, 2024 at 9:43 AM AEST, BALATON Zoltan wrote:
> BookE does not have real mode so split off and handle it first in
> get_physical_address_wtlb() before checking for real mode for other
> MMU models.
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
>
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> target/ppc/mmu_common.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index a069e4083f..24a9b9ef19 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -1191,6 +1191,13 @@ int get_physical_address_wtlb(CPUPPCState *env,
> mmu_ctx_t *ctx,
> int ret = -1;
> bool real_mode;
>
> + if (env->mmu_model == POWERPC_MMU_BOOKE) {
> + return mmubooke_get_physical_address(env, ctx, eaddr, access_type);
> + } else if (env->mmu_model == POWERPC_MMU_BOOKE206) {
> + return mmubooke206_get_physical_address(env, ctx, eaddr, access_type,
> + mmu_idx);
> + }
> +
> real_mode = (type == ACCESS_CODE) ? !FIELD_EX64(env->msr, MSR, IR)
> : !FIELD_EX64(env->msr, MSR, DR);
>
> @@ -1211,13 +1218,6 @@ int get_physical_address_wtlb(CPUPPCState *env,
> mmu_ctx_t *ctx,
> ret = mmu40x_get_physical_address(env, ctx, eaddr, access_type);
> }
> break;
> - case POWERPC_MMU_BOOKE:
> - ret = mmubooke_get_physical_address(env, ctx, eaddr, access_type);
> - break;
> - case POWERPC_MMU_BOOKE206:
> - ret = mmubooke206_get_physical_address(env, ctx, eaddr, access_type,
> - mmu_idx);
> - break;
> case POWERPC_MMU_REAL:
> if (real_mode) {
> ret = check_physical(env, ctx, eaddr, access_type);
