Commit 3823b9db authored by Julian Brown's avatar Julian Brown Committed by Peter Maydell
Browse files

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: default avatarJulian Brown <julian@codesourcery.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 3bc4b52c

target-arm/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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