yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-09 01:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/sparc: Handle bus errors in mmu_probe()

Browse source 
Convert the mmu_probe() function to using address_space_ldl()
rather than ldl_phys(), so we can explicitly detect memory
transaction failures.

This makes no practical difference at the moment, because
ldl_phys() will return 0 on a transaction failure, and we
treat transaction failures and 0 PDEs identically. However
the spec says that MMU probe operations are supposed to
update the fault status registers, and if we ever implement
that we'll want to distinguish the difference. For the
moment, just add a TODO comment about the bug.

Backports commit d86a9ad33c75ed795f09fb43243d0acecd583f24 from qemu
This commit is contained in:
Peter Maydell 2019-11-20 13:37:45 -05:00 committed by Lioncash
parent 0d6cada970
commit 7d2ca16d7f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
qemu/target/sparc/mmu_helper.c
View file

@ -285,11 +285,20 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev)
CPUState *cs = env_cpu(env);
hwaddr pde_ptr;
uint32_t pde;
MemTxResult result;
/*
* TODO: MMU probe operations are supposed to set the fault
* status registers, but we don't do this.
*/
/* Context base + context number */
pde_ptr = (hwaddr)(env->mmuregs[1] << 4) +
(env->mmuregs[2] << 2);
pde = ldl_phys(cs->as, pde_ptr);
pde = address_space_ldl(cs->as, pde_ptr, MEMTXATTRS_UNSPECIFIED, &result);
if (result != MEMTX_OK) {
return 0;
}
switch (pde & PTE_ENTRYTYPE_MASK) {
default:
@ -302,7 +311,11 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev)
return pde;
}
pde_ptr = ((address >> 22) & ~3) + ((pde & ~3) << 4);
pde = ldl_phys(cs->as, pde_ptr);
pde = address_space_ldl(cs->as, pde_ptr,
MEMTXATTRS_UNSPECIFIED, &result);
if (result != MEMTX_OK) {
return 0;
}
switch (pde & PTE_ENTRYTYPE_MASK) {
default:
@ -316,7 +329,11 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev)
return pde;
}
pde_ptr = ((address & 0xfc0000) >> 16) + ((pde & ~3) << 4);
pde = ldl_phys(cs->as, pde_ptr);
pde = address_space_ldl(cs->as, pde_ptr,
MEMTXATTRS_UNSPECIFIED, &result);
if (result != MEMTX_OK) {
return 0;
}
switch (pde & PTE_ENTRYTYPE_MASK) {
default:
@ -330,7 +347,11 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev)
return pde;
}
pde_ptr = ((address & 0x3f000) >> 10) + ((pde & ~3) << 4);
pde = ldl_phys(cs->as, pde_ptr);
pde = address_space_ldl(cs->as, pde_ptr,
MEMTXATTRS_UNSPECIFIED, &result);
if (result != MEMTX_OK) {
return 0;
}
switch (pde & PTE_ENTRYTYPE_MASK) {
default: