[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] target/arm: fix incorrect current EL bug in aarch32 exception
From: |
Peter Maydell |
Subject: |
[PULL 6/6] target/arm: fix incorrect current EL bug in aarch32 exception emulation |
Date: |
Mon, 30 Mar 2020 14:36:48 +0100 |
From: Changbin Du <address@hidden>
The arm_current_el() should be invoked after mode switching. Otherwise, we
get a wrong current EL value, since current EL is also determined by
current mode.
Fixes: 4a2696c0d4 ("target/arm: Set PAN bit as required on exception entry")
Signed-off-by: Changbin Du <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/helper.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index b7b6887241d..163c91a1ccd 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -9172,7 +9172,6 @@ static void take_aarch32_exception(CPUARMState *env, int
new_mode,
/* Change the CPU state so as to actually take the exception. */
switch_mode(env, new_mode);
- new_el = arm_current_el(env);
/*
* For exceptions taken to AArch32 we must clear the SS bit in both
@@ -9184,6 +9183,10 @@ static void take_aarch32_exception(CPUARMState *env, int
new_mode,
env->condexec_bits = 0;
/* Switch to the new mode, and to the correct instruction set. */
env->uncached_cpsr = (env->uncached_cpsr & ~CPSR_M) | new_mode;
+
+ /* This must be after mode switching. */
+ new_el = arm_current_el(env);
+
/* Set new mode endianness */
env->uncached_cpsr &= ~CPSR_E;
if (env->cp15.sctlr_el[new_el] & SCTLR_EE) {
--
2.20.1
- [PULL 0/6] target-arm queue, Peter Maydell, 2020/03/30
- [PULL 2/6] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row mirror address, Peter Maydell, 2020/03/30
- [PULL 1/6] hw/arm/orangepi: check for potential NULL pointer when calling blk_is_available, Peter Maydell, 2020/03/30
- [PULL 3/6] docs/conf.py: Raise ConfigError for bad Sphinx Python version, Peter Maydell, 2020/03/30
- [PULL 4/6] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path, Peter Maydell, 2020/03/30
- [PULL 5/6] hw/arm/xlnx-zynqmp.c: Add missing error-propagation code, Peter Maydell, 2020/03/30
- [PULL 6/6] target/arm: fix incorrect current EL bug in aarch32 exception emulation,
Peter Maydell <=
- Re: [PULL 0/6] target-arm queue, Peter Maydell, 2020/03/30