diff options
| author | Richard Henderson | 2019-10-23 17:00:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-10-24 18:16:28 +0200 |
| commit | 7b2625eba208b634aa1a86642f085be10f65961a (patch) | |
| tree | 6896e82ade96b7033efe972714187ff1f484f2f1 | |
| parent | target/arm: Rebuild hflags at MSR writes (diff) | |
| download | qemu-7b2625eba208b634aa1a86642f085be10f65961a.tar.gz qemu-7b2625eba208b634aa1a86642f085be10f65961a.tar.xz qemu-7b2625eba208b634aa1a86642f085be10f65961a.zip | |
target/arm: Rebuild hflags at CPSR writes
Continue setting, but not relying upon, env->hflags.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20191023150057.25731-19-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/op_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index ccc2cecb46..b529d6c1bf 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -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 */ |