On Thu May 2, 2024 at 9:43 AM AEST, BALATON Zoltan wrote:
> The real mode handling is identical in the remaining switch cases.
> Split off these common real mode cases into a separate conditional to
> leave only the else branches in the switch that are different.
>
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> target/ppc/mmu_common.c | 34 +++++++++-------------------------
> 1 file changed, 9 insertions(+), 25 deletions(-)
>
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index 24a9b9ef19..3132030baa 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -1188,7 +1188,6 @@ int get_physical_address_wtlb(CPUPPCState *env,
> mmu_ctx_t *ctx,
> MMUAccessType access_type, int type,
> int mmu_idx)
> {
> - int ret = -1;
> bool real_mode;
>
> if (env->mmu_model == POWERPC_MMU_BOOKE) {
> @@ -1200,38 +1199,23 @@ int get_physical_address_wtlb(CPUPPCState *env,
> mmu_ctx_t *ctx,
>
> real_mode = (type == ACCESS_CODE) ? !FIELD_EX64(env->msr, MSR, IR)
> : !FIELD_EX64(env->msr, MSR, DR);
> + if (real_mode && (env->mmu_model == POWERPC_MMU_SOFT_6xx ||
> + env->mmu_model == POWERPC_MMU_SOFT_4xx ||
> + env->mmu_model == POWERPC_MMU_REAL)) {
> + return check_physical(env, ctx, eaddr, access_type);
> + }
>
> switch (env->mmu_model) {
> case POWERPC_MMU_SOFT_6xx:
> - if (real_mode) {
> - ret = check_physical(env, ctx, eaddr, access_type);
> - } else {
> - ret = mmu6xx_get_physical_address(env, ctx, eaddr, access_type,
> - type);
> - }
> - break;
> -
> + return mmu6xx_get_physical_address(env, ctx, eaddr, access_type,
> type);
> case POWERPC_MMU_SOFT_4xx:
> - if (real_mode) {
> - ret = check_physical(env, ctx, eaddr, access_type);
> - } else {
> - ret = mmu40x_get_physical_address(env, ctx, eaddr, access_type);
> - }
> - break;
> + return mmu40x_get_physical_address(env, ctx, eaddr, access_type);
> case POWERPC_MMU_REAL:
> - if (real_mode) {
> - ret = check_physical(env, ctx, eaddr, access_type);
> - } else {
> - cpu_abort(env_cpu(env),
> - "PowerPC in real mode do not do any translation\n");
> - }
> - return -1;
> + cpu_abort(env_cpu(env),
> + "PowerPC in real mode do not do any translation\n");
> default:
> cpu_abort(env_cpu(env), "Unknown or invalid MMU model\n");
> - return -1;
> }
> -
> - return ret;
> }
>
> static void booke206_update_mas_tlb_miss(CPUPPCState *env, target_ulong
> address,
