mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-01-14 17:15:36 +00:00
target/arm: Enforce PAN semantics in get_S1prot
If we have a PAN-enforcing mmu_idx, set prot == 0 if user_rw != 0. Backports commit 81636b70c226dc27d7ebc8dedbcec26166d23085 from qemu
This commit is contained in:
parent
41d03da852
commit
aad0621f96
qemu/target/arm
|
@ -9418,6 +9418,9 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64,
|
|||
if (is_user) {
|
||||
prot_rw = user_rw;
|
||||
} else {
|
||||
if (user_rw && regime_is_pan(env, mmu_idx)) {
|
||||
return 0;
|
||||
}
|
||||
prot_rw = simple_ap_to_rw_prot_is_user(ap, false);
|
||||
}
|
||||
|
||||
|
|
|
@ -895,6 +895,19 @@ static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx)
|
|||
}
|
||||
}
|
||||
|
||||
static inline bool regime_is_pan(CPUARMState *env, ARMMMUIdx mmu_idx)
|
||||
{
|
||||
switch (mmu_idx) {
|
||||
case ARMMMUIdx_Stage1_E1_PAN:
|
||||
case ARMMMUIdx_E10_1_PAN:
|
||||
case ARMMMUIdx_E20_2_PAN:
|
||||
case ARMMMUIdx_SE10_1_PAN:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/* Return the FSR value for a debug exception (watchpoint, hardware
|
||||
* breakpoint or BKPT insn) targeting the specified exception level.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue