target/ppc: Split out BookE xlate cases before checking real mode
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 <npiggin@gmail.com> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
f3f66a3157
commit
279fe98d0d
@ -1175,6 +1175,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);
|
||||
|
||||
@ -1195,13 +1202,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);
|
||||
|
Loading…
Reference in New Issue
Block a user