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

target/arm: Update arm_mmu_idx_el for PAN

Browse source 
Examine the PAN bit for EL1, EL2, and Secure EL1 to
determine if it applies.

Backports commit 66412260cc1bee60a22d96e4ad8569b85745fea4 from qemu
This commit is contained in:
Richard Henderson 2020-03-21 17:34:09 -04:00 committed by Lioncash
parent 35fab80c57
commit 41d03da852
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11766,13 +11766,22 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)
return ARMMMUIdx_E10_0;
case 1:
if (arm_is_secure_below_el3(env)) {
if (env->pstate & PSTATE_PAN) {
return ARMMMUIdx_SE10_1_PAN;
}
return ARMMMUIdx_SE10_1;
}
if (env->pstate & PSTATE_PAN) {
return ARMMMUIdx_E10_1_PAN;
}
return ARMMMUIdx_E10_1;
case 2:
/* TODO: ARMv8.4-SecEL2 */
/* Note that TGE does not apply at EL2. */
if ((env->cp15.hcr_el2 & HCR_E2H) && arm_el_is_aa64(env, 2)) {
if (env->pstate & PSTATE_PAN) {
return ARMMMUIdx_E20_2_PAN;
}
return ARMMMUIdx_E20_2;
}
return ARMMMUIdx_E2;