diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2013-03-12 00:31:13 +0000 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-03-22 15:28:48 +0100 |
commit | f2ad6be83bc284d6c7677bdca879db38d4fdccd5 (patch) | |
tree | d21c133405513ec10ae6c37fad121142f81463d2 /target-ppc/mmu_helper.c | |
parent | 25de24ab838be5801d5cc13b8a347922a3770fa5 (diff) | |
download | qemu-f2ad6be83bc284d6c7677bdca879db38d4fdccd5.zip qemu-f2ad6be83bc284d6c7677bdca879db38d4fdccd5.tar.gz qemu-f2ad6be83bc284d6c7677bdca879db38d4fdccd5.tar.bz2 |
target-ppc: Disentangle hash mmu versions of cpu_get_phys_page_debug()
cpu_get_phys_page_debug() is a trivial wrapper around
get_physical_address(). But even the signature of
get_physical_address() has some things we'd like to clean up on a
per-mmu basis, so this patch moves the test on mmu model out to
cpu_get_phys_page_debug(), moving the version for 64-bit hash MMUs out
to mmu-hash64.c and the version for 32-bit hash MMUs to mmu-hash32.c
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/mmu_helper.c')
-rw-r--r-- | target-ppc/mmu_helper.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 287334f..818f1b5 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -1310,11 +1310,6 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, #endif switch (env->mmu_model) { - case POWERPC_MMU_32B: - case POWERPC_MMU_601: - ret = ppc_hash32_get_physical_address(env, ctx, eaddr, rw, access_type); - break; - case POWERPC_MMU_SOFT_6xx: case POWERPC_MMU_SOFT_74xx: if (real_mode) { @@ -1331,14 +1326,6 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, } break; -#if defined(TARGET_PPC64) - case POWERPC_MMU_64B: - case POWERPC_MMU_2_06: - case POWERPC_MMU_2_06d: - ret = ppc_hash64_get_physical_address(env, ctx, eaddr, rw, access_type); - break; -#endif - case POWERPC_MMU_SOFT_4xx: case POWERPC_MMU_SOFT_4xx_Z: if (real_mode) { @@ -1383,6 +1370,22 @@ hwaddr cpu_get_phys_page_debug(CPUPPCState *env, target_ulong addr) { mmu_ctx_t ctx; + switch (env->mmu_model) { +#if defined(TARGET_PPC64) + case POWERPC_MMU_64B: + case POWERPC_MMU_2_06: + case POWERPC_MMU_2_06d: + return ppc_hash64_get_phys_page_debug(env, addr); +#endif + + case POWERPC_MMU_32B: + case POWERPC_MMU_601: + return ppc_hash32_get_phys_page_debug(env, addr); + + default: + ; + } + if (unlikely(get_physical_address(env, &ctx, addr, 0, ACCESS_INT) != 0)) { return -1; } |