[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 15/21] target-arm: A64: Forbid ERET to higher or
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v4 15/21] target-arm: A64: Forbid ERET to higher or unimplemented ELs |
Date: |
Fri, 23 May 2014 10:42:12 +1000 |
From: "Edgar E. Iglesias" <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
target-arm/op_helper.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index c2b4bf0..e95a7f4 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -389,6 +389,7 @@ void HELPER(exception_return)(CPUARMState *env)
unsigned int spsr_idx = aarch64_banked_spsr_index(1);
uint32_t spsr = env->banked_spsr[spsr_idx];
int new_el, i;
+ int cur_el = arm_current_pl(env);
if (env->pstate & PSTATE_SP) {
env->sp_el[1] = env->xregs[31];
@@ -410,8 +411,11 @@ void HELPER(exception_return)(CPUARMState *env)
env->regs[15] = env->elr_el[1] & ~0x1;
} else {
new_el = extract32(spsr, 2, 2);
- if (new_el > 1) {
- /* Return to unimplemented EL */
+ if (new_el > cur_el
+ || (new_el == 2 && !arm_feature(env, ARM_FEATURE_EL2))) {
+ /* Disallow return to an EL which is unimplemented or higher
+ * than the current one.
+ */
goto illegal_return;
}
if (extract32(spsr, 1, 1)) {
--
1.8.3.2
- [Qemu-devel] [PATCH v4 06/21] target-arm: Use a 1:1 mapping between EL and MMU index, (continued)
- [Qemu-devel] [PATCH v4 06/21] target-arm: Use a 1:1 mapping between EL and MMU index, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 07/21] target-arm: A64: Add SP entries for EL2 and 3, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 08/21] target-arm: A64: Add ELR entries for EL2 and 3, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 09/21] target-arm: Add SPSR entries for EL2/HYP and EL3/MON, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 10/21] target-arm: A64: Introduce aarch64_banked_spsr_index(), Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 12/21] target-arm: Add a feature flag for EL3, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 13/21] target-arm: Register EL2 versions of ELR and SPSR, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 11/21] target-arm: Add a feature flag for EL2, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 14/21] target-arm: Register EL3 versions of ELR and SPSR, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 15/21] target-arm: A64: Forbid ERET to higher or unimplemented ELs,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v4 16/21] target-arm: A64: Trap ERET from EL0 at translation time, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 17/21] target-arm: A64: Generalize ERET to various ELs, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 18/21] target-arm: A64: Generalize update_spsel for the various ELs, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 19/21] target-arm: Make vbar_write writeback to any CPREG, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 20/21] target-arm: A64: Register VBAR_EL2, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 21/21] target-arm: A64: Register VBAR_EL3, Edgar E. Iglesias, 2014/05/22
- Re: [Qemu-devel] [PATCH v4 00/21] target-arm: Preparations for A64 EL2 and 3, Peter Maydell, 2014/05/23