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

target/mips: Tidy control flow in mips_cpu_handle_mmu_fault 

Since the only non-negative TLBRET_* value is TLBRET_MATCH,
the subsequent test for ret < 0 is useless.  Use early return
to allow subsequent blocks to be unindented.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-05-01 22:38:44 -07:00
parent 995ffde962
commit e38f4eb630
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
target/mips/helper.c
View File

@ -915,41 +915,35 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,
tlb_set_page(cs, address & TARGET_PAGE_MASK, tlb_set_page(cs, address & TARGET_PAGE_MASK,
physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, physical & TARGET_PAGE_MASK, prot | PAGE_EXEC,
mmu_idx, TARGET_PAGE_SIZE); mmu_idx, TARGET_PAGE_SIZE);
ret = 0; return 0;
} else if (ret < 0) }
#endif
{
#if !defined(CONFIG_USER_ONLY)
#if !defined(TARGET_MIPS64) #if !defined(TARGET_MIPS64)
if ((ret == TLBRET_NOMATCH) && (env->tlb->nb_tlb > 1)) { if ((ret == TLBRET_NOMATCH) && (env->tlb->nb_tlb > 1)) {
/* /*
* Memory reads during hardware page table walking are performed * Memory reads during hardware page table walking are performed
* as if they were kernel-mode load instructions. * as if they were kernel-mode load instructions.
*/ */
int mode = (env->hflags & MIPS_HFLAG_KSU); int mode = (env->hflags & MIPS_HFLAG_KSU);
bool ret_walker; bool ret_walker;
env->hflags &= ~MIPS_HFLAG_KSU; env->hflags &= ~MIPS_HFLAG_KSU;
ret_walker = page_table_walk_refill(env, address, rw, mmu_idx); ret_walker = page_table_walk_refill(env, address, rw, mmu_idx);
env->hflags |= mode; env->hflags |= mode;
if (ret_walker) { if (ret_walker) {
ret = get_physical_address(env, &physical, &prot, ret = get_physical_address(env, &physical, &prot,
address, rw, access_type, mmu_idx); address, rw, access_type, mmu_idx);
if (ret == TLBRET_MATCH) { if (ret == TLBRET_MATCH) {
tlb_set_page(cs, address & TARGET_PAGE_MASK, tlb_set_page(cs, address & TARGET_PAGE_MASK,
physical & TARGET_PAGE_MASK, prot | PAGE_EXEC, physical & TARGET_PAGE_MASK, prot | PAGE_EXEC,
mmu_idx, TARGET_PAGE_SIZE); mmu_idx, TARGET_PAGE_SIZE);
ret = 0; return 0;
return ret;
}
} }
} }
#endif
#endif
raise_mmu_exception(env, address, rw, ret);
ret = 1;
} }
#endif
#endif
return ret; raise_mmu_exception(env, address, rw, ret);
return 1;
} }
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)