yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-23 02:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Check aa32_pan in take_aarch32_exception(), not aa64_pan

Browse source 
In take_aarch32_exception(), we know we are dealing with a CPU that
has AArch32, so the right isar_feature test is aa32_pan, not aa64_pan.

Backports commit f8af1143ef93954e77cf59e09b5e004dafbd64fd from qemu
This commit is contained in:
Peter Maydell 2020-03-21 18:09:04 -04:00 committed by Lioncash
parent e63f70f980
commit 778fcd9562
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8633,7 +8633,7 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode,
env->elr_el[2] = env->regs[15];
} else {
/* CPSR.PAN is normally preserved preserved unless... */
if (cpu_isar_feature(aa64_pan, env_archcpu(env))) {
if (cpu_isar_feature(aa32_pan, env_archcpu(env))) {
switch (new_el) {
case 3:
if (!arm_is_secure_below_el3(env)) {