yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-26 20:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/mips: Tidy control flow in mips_cpu_handle_mmu_fault

Browse source 
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.

Backports commit e38f4eb63020075432cb77bf48398187809cf4a3 from qemu
This commit is contained in:
Richard Henderson 2019-05-16 17:15:31 -04:00 committed by Lioncash
parent f175e89ca2
commit 49cb8cfe5b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/target/mips/helper.c
View file

@ -902,11 +902,8 @@ 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)) {
/* /*
@ -925,18 +922,14 @@ 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;
return ret;
} }
} }
} }
#endif #endif
#endif #endif
raise_mmu_exception(env, address, rw, ret); raise_mmu_exception(env, address, rw, ret);
ret = 1; return 1;
}
return ret;
} }
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)