[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/51] target/arm: Rebuild hflags at CPSR writes
From: |
Peter Maydell |
Subject: |
[PULL 20/51] target/arm: Rebuild hflags at CPSR writes |
Date: |
Thu, 24 Oct 2019 17:26:53 +0100 |
From: Richard Henderson <address@hidden>
Continue setting, but not relying upon, env->hflags.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
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 ccc2cecb467..b529d6c1bf7 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 */
--
2.20.1
- [PULL 10/51] target/arm: Split out rebuild_hflags_aprofile, (continued)
- [PULL 10/51] target/arm: Split out rebuild_hflags_aprofile, Peter Maydell, 2019/10/24
- [PULL 07/51] target/arm: Split out rebuild_hflags_m32, Peter Maydell, 2019/10/24
- [PULL 14/51] target/arm: Add arm_rebuild_hflags, Peter Maydell, 2019/10/24
- [PULL 15/51] target/arm: Split out arm_mmu_idx_el, Peter Maydell, 2019/10/24
- [PULL 16/51] target/arm: Hoist store to cs_base in cpu_get_tb_cpu_state, Peter Maydell, 2019/10/24
- [PULL 12/51] target/arm: Simplify set of PSTATE_SS in cpu_get_tb_cpu_state, Peter Maydell, 2019/10/24
- [PULL 18/51] target/arm: Rebuild hflags at EL changes, Peter Maydell, 2019/10/24
- [PULL 13/51] target/arm: Hoist computation of TBFLAG_A32.VFPEN, Peter Maydell, 2019/10/24
- [PULL 17/51] target/arm: Add HELPER(rebuild_hflags_{a32, a64, m32}), Peter Maydell, 2019/10/24
- [PULL 19/51] target/arm: Rebuild hflags at MSR writes, Peter Maydell, 2019/10/24
- [PULL 20/51] target/arm: Rebuild hflags at CPSR writes,
Peter Maydell <=
- [PULL 21/51] target/arm: Rebuild hflags at Xscale SCTLR writes, Peter Maydell, 2019/10/24
- [PULL 22/51] target/arm: Rebuild hflags for M-profile, Peter Maydell, 2019/10/24
- [PULL 23/51] target/arm: Rebuild hflags for M-profile NVIC, Peter Maydell, 2019/10/24
- [PULL 24/51] linux-user/aarch64: Rebuild hflags for TARGET_WORDS_BIGENDIAN, Peter Maydell, 2019/10/24
- [PULL 25/51] linux-user/arm: Rebuild hflags for TARGET_WORDS_BIGENDIAN, Peter Maydell, 2019/10/24
- [PULL 26/51] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state, Peter Maydell, 2019/10/24
- [PULL 27/51] hw/net/fsl_etsec/etsec.c: Switch to transaction-based ptimer API, Peter Maydell, 2019/10/24
- [PULL 28/51] hw/timer/xilinx_timer.c: Switch to transaction-based ptimer API, Peter Maydell, 2019/10/24
- [PULL 29/51] hw/dma/xilinx_axidma.c: Switch to transaction-based ptimer API, Peter Maydell, 2019/10/24
- [PULL 30/51] hw/timer/slavio_timer: Remove useless check for NULL t->timer, Peter Maydell, 2019/10/24