Commit 7b2625eb authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target/arm: Rebuild hflags at CPSR writes 



Continue setting, but not relying upon, env->hflags.

Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20191023150057.25731-19-richard.henderson@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 69d66864

target/arm/op_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ uint32_t HELPER(usat16)(CPUARMState *env, uint32_t x, uint32_t shift) 
void HELPER(setend)(CPUARMState *env)

{

    env->uncached_cpsr ^= CPSR_E;

    arm_rebuild_hflags(env);

}



/* Function checks whether WFx (WFI/WFE) instructions are set up to be trapped.
@@ -387,6 +388,8 @@ uint32_t HELPER(cpsr_read)(CPUARMState *env) 
void HELPER(cpsr_write)(CPUARMState *env, uint32_t val, uint32_t mask)

{

    cpsr_write(env, val, mask, CPSRWriteByInstr);

    /* TODO: Not all cpsr bits are relevant to hflags.  */

    arm_rebuild_hflags(env);

}



/* Write the CPSR for a 32-bit exception return */