[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 05/24] target/arm: Split out rebuild_hflags_m32
From: |
Richard Henderson |
Subject: |
[PATCH v9 05/24] target/arm: Split out rebuild_hflags_m32 |
Date: |
Wed, 23 Oct 2019 11:00:38 -0400 |
Create a function to compute the values of the TBFLAG_A32 bits
that will be cached, and are used by M-profile.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/helper.c | 45 ++++++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 4c65476d93..d4303420da 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11083,6 +11083,29 @@ static uint32_t rebuild_hflags_common_32(CPUARMState
*env, int fp_el,
return rebuild_hflags_common(env, fp_el, mmu_idx, flags);
}
+static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el,
+ ARMMMUIdx mmu_idx)
+{
+ uint32_t flags = 0;
+
+ if (arm_v7m_is_handler_mode(env)) {
+ flags = FIELD_DP32(flags, TBFLAG_A32, HANDLER, 1);
+ }
+
+ /*
+ * v8M always applies stack limit checks unless CCR.STKOFHFNMIGN
+ * is suppressing them because the requested execution priority
+ * is less than 0.
+ */
+ if (arm_feature(env, ARM_FEATURE_V8) &&
+ !((mmu_idx & ARM_MMU_IDX_M_NEGPRI) &&
+ (env->v7m.ccr[env->v7m.secure] & R_V7M_CCR_STKOFHFNMIGN_MASK))) {
+ flags = FIELD_DP32(flags, TBFLAG_A32, STACKCHECK, 1);
+ }
+
+ return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags);
+}
+
static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el,
ARMMMUIdx mmu_idx)
{
@@ -11168,7 +11191,13 @@ void cpu_get_tb_cpu_state(CPUARMState *env,
target_ulong *pc,
}
} else {
*pc = env->regs[15];
- flags = rebuild_hflags_common_32(env, fp_el, mmu_idx, 0);
+
+ if (arm_feature(env, ARM_FEATURE_M)) {
+ flags = rebuild_hflags_m32(env, fp_el, mmu_idx);
+ } else {
+ flags = rebuild_hflags_common_32(env, fp_el, mmu_idx, 0);
+ }
+
flags = FIELD_DP32(flags, TBFLAG_A32, THUMB, env->thumb);
flags = FIELD_DP32(flags, TBFLAG_A32, VECLEN, env->vfp.vec_len);
flags = FIELD_DP32(flags, TBFLAG_A32, VECSTRIDE, env->vfp.vec_stride);
@@ -11204,20 +11233,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env,
target_ulong *pc,
}
}
- if (arm_v7m_is_handler_mode(env)) {
- flags = FIELD_DP32(flags, TBFLAG_A32, HANDLER, 1);
- }
-
- /* v8M always applies stack limit checks unless CCR.STKOFHFNMIGN is
- * suppressing them because the requested execution priority is less than
0.
- */
- if (arm_feature(env, ARM_FEATURE_V8) &&
- arm_feature(env, ARM_FEATURE_M) &&
- !((mmu_idx & ARM_MMU_IDX_M_NEGPRI) &&
- (env->v7m.ccr[env->v7m.secure] & R_V7M_CCR_STKOFHFNMIGN_MASK))) {
- flags = FIELD_DP32(flags, TBFLAG_A32, STACKCHECK, 1);
- }
-
if (arm_feature(env, ARM_FEATURE_M_SECURITY) &&
FIELD_EX32(env->v7m.fpccr[M_REG_S], V7M_FPCCR, S) != env->v7m.secure) {
flags = FIELD_DP32(flags, TBFLAG_A32, FPCCR_S_WRONG, 1);
--
2.17.1
- [PATCH v9 03/24] target/arm: Split out rebuild_hflags_common_32, (continued)
- [PATCH v9 03/24] target/arm: Split out rebuild_hflags_common_32, Richard Henderson, 2019/10/23
- [PATCH v9 04/24] target/arm: Split arm_cpu_data_is_big_endian, Richard Henderson, 2019/10/23
- [PATCH v9 13/24] target/arm: Split out arm_mmu_idx_el, Richard Henderson, 2019/10/23
- [PATCH v9 07/24] target/arm: Split out rebuild_hflags_a32, Richard Henderson, 2019/10/23
- [PATCH v9 22/24] linux-user/aarch64: Rebuild hflags for TARGET_WORDS_BIGENDIAN, Richard Henderson, 2019/10/23
- [PATCH v9 09/24] target/arm: Hoist XSCALE_CPAR, VECLEN, VECSTRIDE in cpu_get_tb_cpu_state, Richard Henderson, 2019/10/23
- [PATCH v9 17/24] target/arm: Rebuild hflags at MSR writes, Richard Henderson, 2019/10/23
- [PATCH v9 12/24] target/arm: Add arm_rebuild_hflags, Richard Henderson, 2019/10/23
- [PATCH v9 19/24] target/arm: Rebuild hflags at Xscale SCTLR writes, Richard Henderson, 2019/10/23
- [PATCH v9 14/24] target/arm: Hoist store to cs_base in cpu_get_tb_cpu_state, Richard Henderson, 2019/10/23
- [PATCH v9 05/24] target/arm: Split out rebuild_hflags_m32,
Richard Henderson <=
- [PATCH v9 18/24] target/arm: Rebuild hflags at CPSR writes, Richard Henderson, 2019/10/23
- [PATCH v9 10/24] target/arm: Simplify set of PSTATE_SS in cpu_get_tb_cpu_state, Richard Henderson, 2019/10/23
- [PATCH v9 23/24] linux-user/arm: Rebuild hflags for TARGET_WORDS_BIGENDIAN, Richard Henderson, 2019/10/23
- [PATCH v9 15/24] target/arm: Add HELPER(rebuild_hflags_{a32, a64, m32}), Richard Henderson, 2019/10/23
- [PATCH v9 02/24] target/arm: Split out rebuild_hflags_a64, Richard Henderson, 2019/10/23
- [PATCH v9 08/24] target/arm: Split out rebuild_hflags_aprofile, Richard Henderson, 2019/10/23
- [PATCH v9 01/24] target/arm: Split out rebuild_hflags_common, Richard Henderson, 2019/10/23
- [PATCH v9 21/24] target/arm: Rebuild hflags for M-profile NVIC, Richard Henderson, 2019/10/23
- [PATCH v9 24/24] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state, Richard Henderson, 2019/10/23
- [PATCH v9 16/24] target/arm: Rebuild hflags at EL changes, Richard Henderson, 2019/10/23