yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 15:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Implement v8.1M PXN extension

Browse source 
In v8.1M the PXN architecture extension adds a new PXN bit to the
MPU_RLAR registers, which forbids execution of code in the region
from a privileged mode.

This is another feature which is just in the generic "in v8.1M" set
and has no ID register field indicating its presence.

Backports cad8e2e3160dd10371552fce6cd8c6e171503e13
This commit is contained in:
Peter Maydell 2021-03-03 17:50:24 -05:00 committed by Lioncash
parent b9c51dc19a
commit cfefada296
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11478,6 +11478,11 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
} else { } else {
uint32_t ap = extract32(env->pmsav8.rbar[secure][matchregion], 1, 2); uint32_t ap = extract32(env->pmsav8.rbar[secure][matchregion], 1, 2);
uint32_t xn = extract32(env->pmsav8.rbar[secure][matchregion], 0, 1); uint32_t xn = extract32(env->pmsav8.rbar[secure][matchregion], 0, 1);
bool pxn = false;
if (arm_feature(env, ARM_FEATURE_V8_1M)) {
pxn = extract32(env->pmsav8.rlar[secure][matchregion], 4, 1);
}
if (m_is_system_region(env, address)) { if (m_is_system_region(env, address)) {
/* System space is always execute never */ /* System space is always execute never */
@ -11485,7 +11490,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
} }
*prot = simple_ap_to_rw_prot(env, mmu_idx, ap); *prot = simple_ap_to_rw_prot(env, mmu_idx, ap);
if (*prot && !xn) { if (*prot && !xn && !(pxn && !is_user)) {
*prot |= PAGE_EXEC; *prot |= PAGE_EXEC;
} }
/* /*