aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-02-14 17:05:45 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-02-14 17:05:45 +0000
commit336bad333000ca95b4c32a32bccd0b79f0a4b8cb (patch)
tree5b9152a174f1b0db987a1263c508aa35e7d23622
parentfc9487e5fe73b8e1e0b8ef49f755a9e2aaf53d02 (diff)
downloadqemu-arm-336bad333000ca95b4c32a32bccd0b79f0a4b8cb.tar.gz
target/arm: Check aa32_pan in take_aarch32_exception(), not aa64_pan
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. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target/arm/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c
index eec3876610..d4ed52981f 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -8858,7 +8858,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)) {