mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-23 03:45:14 +00:00
target/arm: check TGE and E2H flags for EL0 pauth traps
According to ARM ARM we should only trap from the EL1&0 regime. Backports commit a7469a3c1edc7687d7d25967bc2c0280de202bca from qemu
This commit is contained in:
parent
01e1e7a3a0
commit
76ca1cd732
|
@ -371,7 +371,10 @@ static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
|
|||
if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
|
||||
uint64_t hcr = arm_hcr_el2_eff(env);
|
||||
bool trap = !(hcr & HCR_API);
|
||||
/* FIXME: ARMv8.1-VHE: trap only applies to EL1&0 regime. */
|
||||
if (el == 0) {
|
||||
/* Trap only applies to EL1&0 regime. */
|
||||
trap &= (hcr & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE);
|
||||
}
|
||||
/* FIXME: ARMv8.3-NV: HCR_NV trap takes precedence for ERETA[AB]. */
|
||||
if (trap) {
|
||||
pauth_trap(env, 2, ra);
|
||||
|
|
Loading…
Reference in a new issue