aboutsummaryrefslogtreecommitdiff
path: root/target/ppc
diff options
context:
space:
mode:
authorBALATON Zoltan <balaton@eik.bme.hu>2024-05-13 01:27:43 +0200
committerNicholas Piggin <npiggin@gmail.com>2024-05-24 09:43:04 +1000
commit279fe98d0d3057daa4045faa6e2119288d7b7f07 (patch)
tree116f1dfb3645b6eed4f213ecdf6156eb50e2b9fb /target/ppc
parentf3f66a315714a0bf10c1b82df3324834c9b484fc (diff)
downloadqemu-279fe98d0d3057daa4045faa6e2119288d7b7f07.zip
qemu-279fe98d0d3057daa4045faa6e2119288d7b7f07.tar.gz
qemu-279fe98d0d3057daa4045faa6e2119288d7b7f07.tar.bz2
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>
Diffstat (limited to 'target/ppc')
-rw-r--r--target/ppc/mmu_common.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
index 03d9e6b..9f177b6 100644
--- a/target/ppc/mmu_common.c
+++ b/target/ppc/mmu_common.c
@@ -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);