[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/36] target/arm: Update hflags in trans_CPS_v7m()
From: |
Peter Maydell |
Subject: |
[PULL 02/36] target/arm: Update hflags in trans_CPS_v7m() |
Date: |
Thu, 12 Mar 2020 16:44:25 +0000 |
For M-profile CPUs, the FAULTMASK value affects the CPU's MMU index
(it changes the NegPri bit). We update the hflags after calls
to the v7m_msr helper in trans_MSR_v7m() but forgot to do so
in trans_CPS_v7m().
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
target/arm/translate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 6259064ea7c..7f0154194cf 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -10590,7 +10590,7 @@ static bool trans_CPS(DisasContext *s, arg_CPS *a)
static bool trans_CPS_v7m(DisasContext *s, arg_CPS_v7m *a)
{
- TCGv_i32 tmp, addr;
+ TCGv_i32 tmp, addr, el;
if (!arm_dc_feature(s, ARM_FEATURE_M)) {
return false;
@@ -10613,6 +10613,9 @@ static bool trans_CPS_v7m(DisasContext *s, arg_CPS_v7m
*a)
gen_helper_v7m_msr(cpu_env, addr, tmp);
tcg_temp_free_i32(addr);
}
+ el = tcg_const_i32(s->current_el);
+ gen_helper_rebuild_hflags_m32(cpu_env, el);
+ tcg_temp_free_i32(el);
tcg_temp_free_i32(tmp);
gen_lookup_tb(s);
return true;
--
2.20.1
- [PULL 00/36] target-arm queue, Peter Maydell, 2020/03/12
- [PULL 01/36] hw/intc/armv7m_nvic: Rebuild hflags on reset, Peter Maydell, 2020/03/12
- [PULL 02/36] target/arm: Update hflags in trans_CPS_v7m(),
Peter Maydell <=
- [PULL 03/36] target/arm: Recalculate hflags correctly after writes to CONTROL, Peter Maydell, 2020/03/12
- [PULL 04/36] target/arm: Fix some comment typos, Peter Maydell, 2020/03/12
- [PULL 05/36] aspeed/smc: Add some tracing, Peter Maydell, 2020/03/12
- [PULL 06/36] aspeed/smc: Fix User mode select/unselect scheme, Peter Maydell, 2020/03/12
- [PULL 07/36] target/arm: Check addresses for disabled regimes, Peter Maydell, 2020/03/12
- [PULL 08/36] target/arm: Disable clean_data_tbi for system mode, Peter Maydell, 2020/03/12
- [PULL 09/36] hw/arm/cubieboard: make sure SOC object isn't leaked, Peter Maydell, 2020/03/12
- [PULL 11/36] hw/arm/fsl-imx25: Wire up USB controllers, Peter Maydell, 2020/03/12
- [PULL 10/36] hw/arm/fsl-imx25: Wire up eSDHC controllers, Peter Maydell, 2020/03/12
- [PULL 13/36] hw/arm: add Xunlong Orange Pi PC machine, Peter Maydell, 2020/03/12