[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults o
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm |
Date: |
Tue, 19 May 2015 19:33:23 +0100 |
If the SCTLR.UMA trap bit is set then attempts by EL0 to update
the PSTATE DAIF bits via "MSR DAIFSet, imm" and "MSR DAIFClr, imm"
instructions will raise an exception. We were failing to set
the syndrome information for this exception, which meant that
it would be reported as a repeat of whatever the previous
exception was. Set the correct syndrome information.
---
target-arm/op_helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 43e3457..5af4a0e 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -381,6 +381,9 @@ void HELPER(msr_i_pstate)(CPUARMState *env, uint32_t op,
uint32_t imm)
*/
if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UMA)) {
env->exception.target_el = exception_target_el(env);
+ env->exception.syndrome = syn_aa64_sysregtrap(0, extract32(op, 0, 3),
+ extract32(op, 3, 3), 4,
+ 0x1f, imm, 0);
raise_exception(env, EXCP_UDEF);
}
--
1.9.1
- [Qemu-devel] [PATCH 01/14] target-arm: Add exception target el infrastructure, (continued)
- [Qemu-devel] [PATCH 01/14] target-arm: Add exception target el infrastructure, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 13/14] target-arm: Don't halt on WFI unless we don't have any work, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 12/14] target-arm: Move TB flags down to fill gap, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 04/14] target-arm: Move setting of exception info into tlb_fill, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 02/14] target-arm: Extend helpers to route exceptions, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 06/14] target-arm: Make raise_exception() take syndrome and target EL, Peter Maydell, 2015/05/19
- [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm,
Peter Maydell <=
- Re: [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm, Edgar E. Iglesias, 2015/05/28
- Re: [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm, Peter Maydell, 2015/05/28
- Re: [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm, Peter Maydell, 2015/05/28
- Re: [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm, Edgar E. Iglesias, 2015/05/28
- Re: [Qemu-devel] [PATCH 03/14] target-arm: Set correct syndrome for faults on MSR DAIF*, imm, Peter Maydell, 2015/05/28
[Qemu-devel] [PATCH 09/14] target-arm: Add AArch64 CPTR registers, Peter Maydell, 2015/05/19
[Qemu-devel] [PATCH 14/14] target-arm: Add WFx instruction trap support, Peter Maydell, 2015/05/19
[Qemu-devel] [PATCH 11/14] target-arm: Extend FP checks to use an EL, Peter Maydell, 2015/05/19