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

get_phys_addr_pmsav7: Support AP=0b111 for v7M

Browse source 
For PMSAv7, the v7A/R Arm ARM defines that setting AP to 0b111
is an UNPREDICTABLE reserved combination. However, for v7M
this value is documented as having the same behaviour as 0b110:
read-only for both privileged and unprivileged. Accept this
value on an M profile core rather than treating it as a guest
error and a no-access page.

Backports commit 8638f1ad7403b63db880dadce38e6690b5d82b64 from qemu
This commit is contained in:
Peter Maydell 2018-03-06 08:51:52 -05:00 committed by Lioncash
parent bfd6d3e59b
commit fe9271d5bd
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8456,6 +8456,13 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,
case 6: case 6:
*prot |= PAGE_READ | PAGE_EXEC; *prot |= PAGE_READ | PAGE_EXEC;
break; break;
case 7:
/* for v7M, same as 6; for R profile a reserved value */
if (arm_feature(env, ARM_FEATURE_M)) {
*prot |= PAGE_READ | PAGE_EXEC;
break;
}
/* fall through */
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"DRACR[%d]: Bad value for AP bits: 0x%" "DRACR[%d]: Bad value for AP bits: 0x%"
@ -8474,6 +8481,13 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,
case 6: case 6:
*prot |= PAGE_READ | PAGE_EXEC; *prot |= PAGE_READ | PAGE_EXEC;
break; break;
case 7:
/* for v7M, same as 6; for R profile a reserved value */
if (arm_feature(env, ARM_FEATURE_M)) {
*prot |= PAGE_READ | PAGE_EXEC;
break;
}
/* fall through */
default: default:
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"DRACR[%d]: Bad value for AP bits: 0x%" "DRACR[%d]: Bad value for AP bits: 0x%"