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

target/arm: Correct MPU trace handling of write vs execute

Browse source 
Correct off-by-one bug in the PSMAv7 MPU tracing where it would print
a write access as "reading", an insn fetch as "writing", and a read
access as "execute".

Since we have an MMUAccessType enum now, we can make the code clearer
in the process by using that rather than the raw 0/1/2 values.

Backports commit 709e4407add7acacc593cb6cdac026558c9a8fb6 from qemu
This commit is contained in:
Peter Maydell 2018-03-04 01:13:13 -05:00 committed by Lioncash
parent b35fb57c84
commit 4dc69f4b26
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target/arm/helper.c
View file

@ -7826,8 +7826,8 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address,
phys_ptr, prot, fsr); phys_ptr, prot, fsr);
qemu_log_mask(CPU_LOG_MMU, "PMSAv7 MPU lookup for %s at 0x%08" PRIx32 qemu_log_mask(CPU_LOG_MMU, "PMSAv7 MPU lookup for %s at 0x%08" PRIx32
" mmu_idx %u -> %s (prot %c%c%c)\n", " mmu_idx %u -> %s (prot %c%c%c)\n",
access_type == 1 ? "reading" : access_type == MMU_DATA_LOAD ? "reading" :
(access_type == 2 ? "writing" : "execute"), (access_type == MMU_DATA_STORE ? "writing" : "execute"),
(uint32_t)address, mmu_idx, (uint32_t)address, mmu_idx,
ret ? "Miss" : "Hit", ret ? "Miss" : "Hit",
*prot & PAGE_READ ? 'r' : '-', *prot & PAGE_READ ? 'r' : '-',