ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-microblaze: Consolidate MMU enabled checks 

Consolidate MMU enabled checks to cpu_mmu_index().
No functional changes.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
Edgar E. Iglesias 2018-05-15 23:44:28 +02:00
parent 923ce2e6af
commit d10367e035
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/microblaze/cpu.h
View File

@ -360,8 +360,10 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo,
static inline int cpu_mmu_index (CPUMBState *env, bool ifetch) static inline int cpu_mmu_index (CPUMBState *env, bool ifetch)
{ {
MicroBlazeCPU *cpu = mb_env_get_cpu(env);
/* Are we in nommu mode?. */ /* Are we in nommu mode?. */
if (!(env->sregs[SR_MSR] & MSR_VM)) { if (!(env->sregs[SR_MSR] & MSR_VM) || !cpu->cfg.use_mmu) {
return MMU_NOMMU_IDX; return MMU_NOMMU_IDX;
} }

6
target/microblaze/helper.c
View File

@ -58,8 +58,7 @@ int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,
int prot; int prot;
/* Translate if the MMU is available and enabled. */ /* Translate if the MMU is available and enabled. */
if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM) if (mmu_idx != MMU_NOMMU_IDX) {
&& mmu_idx != MMU_NOMMU_IDX) {
uint32_t vaddr, paddr; uint32_t vaddr, paddr;
struct microblaze_mmu_lookup lu; struct microblaze_mmu_lookup lu;
@ -270,9 +269,10 @@ hwaddr mb_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
CPUMBState *env = &cpu->env; CPUMBState *env = &cpu->env;
target_ulong vaddr, paddr = 0; target_ulong vaddr, paddr = 0;
struct microblaze_mmu_lookup lu; struct microblaze_mmu_lookup lu;
int mmu_idx = cpu_mmu_index(env, false);
unsigned int hit; unsigned int hit;
if (env->sregs[SR_MSR] & MSR_VM) { if (mmu_idx != MMU_NOMMU_IDX) {
hit = mmu_translate(&env->mmu, &lu, addr, 0, 0); hit = mmu_translate(&env->mmu, &lu, addr, 0, 0);
if (hit) { if (hit) {
vaddr = addr & TARGET_PAGE_MASK; vaddr = addr & TARGET_PAGE_MASK;