On Thu, May 3, 2018 at 2:31 AM Edgar E. Iglesias <edgar.igles...@gmail.com>
wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
> We already have a CPU property to control if a core has
> an MMU or not. Remove USE_MMU PVR checks in favor of
> looking at the property.
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> target/microblaze/helper.c | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
> diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c
> index 387d4aca5a..a9f4ca93e3 100644
> --- a/target/microblaze/helper.c
> +++ b/target/microblaze/helper.c
> @@ -54,21 +54,11 @@ int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr
address, int size, int rw,
> MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
> CPUMBState *env = &cpu->env;
> unsigned int hit;
> - unsigned int mmu_available;
> int r = 1;
> int prot;
> - mmu_available = 0;
> - if (cpu->cfg.use_mmu) {
> - mmu_available = 1;
> - if ((cpu->cfg.pvr == C_PVR_FULL) &&
> - (env->pvr.regs[11] & PVR11_USE_MMU) != PVR11_USE_MMU) {
> - mmu_available = 0;
> - }
> - }
> -
> /* Translate if the MMU is available and enabled. */
> - if (mmu_available && (env->sregs[SR_MSR] & MSR_VM)) {
> + if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM)) {
> uint32_t vaddr, paddr;
> struct microblaze_mmu_lookup lu;
> --
> 2.14.1
