target/ppc: Drop cases for unimplemented MPC8xx MMU
Drop MPC8xx cases from get_physical_address_wtlb() and ppc_jumbo_xlate(). The default case would still catch this and abort the same way and there is still a warning about it in ppc_tlb_invalidate_all() which is called in ppc_cpu_reset_hold() so likely we never get here but to make sure add a case to ppc_xlate() to the same effect. 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
fef517cd8a
commit
cfd5c12832
@ -1219,10 +1219,6 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx,
|
||||
ret = mmubooke206_get_physical_address(env, ctx, eaddr, access_type,
|
||||
mmu_idx);
|
||||
break;
|
||||
case POWERPC_MMU_MPC8xx:
|
||||
/* XXX: TODO */
|
||||
cpu_abort(env_cpu(env), "MPC8xx MMU model is not implemented\n");
|
||||
break;
|
||||
case POWERPC_MMU_REAL:
|
||||
if (real_mode) {
|
||||
ret = check_physical(env, ctx, eaddr, access_type);
|
||||
@ -1353,8 +1349,6 @@ static bool ppc_jumbo_xlate(PowerPCCPU *cpu, vaddr eaddr,
|
||||
env->spr[SPR_BOOKE_DEAR] = eaddr;
|
||||
env->spr[SPR_BOOKE_ESR] = mmubooke206_esr(mmu_idx, MMU_DATA_LOAD);
|
||||
break;
|
||||
case POWERPC_MMU_MPC8xx:
|
||||
cpu_abort(cs, "MPC8xx MMU model is not implemented\n");
|
||||
case POWERPC_MMU_REAL:
|
||||
cpu_abort(cs, "PowerPC in real mode should never raise "
|
||||
"any MMU exceptions\n");
|
||||
@ -1427,9 +1421,6 @@ static bool ppc_jumbo_xlate(PowerPCCPU *cpu, vaddr eaddr,
|
||||
env->spr[SPR_40x_ESR] = 0x00000000;
|
||||
}
|
||||
break;
|
||||
case POWERPC_MMU_MPC8xx:
|
||||
/* XXX: TODO */
|
||||
cpu_abort(cs, "MPC8xx MMU model is not implemented\n");
|
||||
case POWERPC_MMU_BOOKE206:
|
||||
booke206_update_mas_tlb_miss(env, eaddr, access_type, mmu_idx);
|
||||
/* fall through */
|
||||
@ -1539,7 +1530,8 @@ bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
|
||||
case POWERPC_MMU_32B:
|
||||
return ppc_hash32_xlate(cpu, eaddr, access_type, raddrp,
|
||||
psizep, protp, mmu_idx, guest_visible);
|
||||
|
||||
case POWERPC_MMU_MPC8xx:
|
||||
cpu_abort(env_cpu(&cpu->env), "MPC8xx MMU model is not implemented\n");
|
||||
default:
|
||||
return ppc_jumbo_xlate(cpu, eaddr, access_type, raddrp,
|
||||
psizep, protp, mmu_idx, guest_visible);
|
||||
|
Loading…
Reference in New Issue
Block a user