Message ID | 20180508173152.29327-11-edgar.iglesias@gmail.com |
---|---|
State | New |
Headers | show |
Series | target-microblaze: Add support for Extended Addressing | expand |
On 05/08/2018 10:31 AM, Edgar E. Iglesias wrote: > + if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM) > + && mmu_idx != MMU_NOMMU_IDX) { For future cleanup, the first condition should be moved to cpu_mmu_index (the second condition is already there). At which point here you need check nothing but mmu_idx. r~
On Wed, May 09, 2018 at 01:51:31PM -0700, Richard Henderson wrote: > On 05/08/2018 10:31 AM, Edgar E. Iglesias wrote: > > + if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM) > > + && mmu_idx != MMU_NOMMU_IDX) { > > For future cleanup, the first condition should be moved to cpu_mmu_index (the > second condition is already there). At which point here you need check nothing > but mmu_idx. Thanks, I've added a followup patch that does this. Cheers, Edgar
diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index a9f4ca93e3..261dcc74c7 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -58,7 +58,8 @@ int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int prot; /* Translate if the MMU is available and enabled. */ - if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM)) { + if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM) + && mmu_idx != MMU_NOMMU_IDX) { uint32_t vaddr, paddr; struct microblaze_mmu_lookup lu;