[Xen-changelog] [qemu-xen master] Fix corruption of CPSR when SCTLR.EE is set

[patchbot@xxxxxxx]

commit 3823b9db77e753041c04c161ac9f4d4cfc661520
Author:     Julian Brown <julian@xxxxxxxxxxxxxxxx>
AuthorDate: Mon Nov 7 10:00:24 2016 +0000
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Nov 7 10:00:24 2016 +0000

    Fix corruption of CPSR when SCTLR.EE is set
    
    Fix a typo in arm_cpu_do_interrupt_aarch32 (OR'ing with ~CPSR_E
    instead of CPSR_E) which meant that when we took an interrupt with
    SCTLR.EE set we would corrupt the CPSR.
    
    Signed-off-by: Julian Brown <julian@xxxxxxxxxxxxxxxx>
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
---
 target-arm/helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 25b15dc..b5b65ca 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -6438,7 +6438,7 @@ static void arm_cpu_do_interrupt_aarch32(CPUState *cs)
     /* Set new mode endianness */
     env->uncached_cpsr &= ~CPSR_E;
     if (env->cp15.sctlr_el[arm_current_el(env)] & SCTLR_EE) {
-        env->uncached_cpsr |= ~CPSR_E;
+        env->uncached_cpsr |= CPSR_E;
     }
     env->daif |= mask;
     /* this is a lie, as the was no c1_sys on V4T/V5, but who cares
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog