[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/20] target/arm: Mask CPSR_J when Jazelle is not enabled
From: |
Richard Henderson |
Subject: |
[PATCH v4 06/20] target/arm: Mask CPSR_J when Jazelle is not enabled |
Date: |
Sat, 8 Feb 2020 12:58:02 +0000 |
The J bit signals Jazelle mode, and so of course is RES0
when the feature is not enabled.
Signed-off-by: Richard Henderson <address@hidden>
---
v4: Split out from aarch32_cpsr_valid_mask creation in previous patch.
---
target/arm/internals.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 4d4896fcdc..0569c96fd9 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1064,7 +1064,7 @@ static inline bool arm_mmu_idx_is_stage1_of_2(ARMMMUIdx
mmu_idx)
static inline uint32_t aarch32_cpsr_valid_mask(uint64_t features,
const ARMISARegisters *id)
{
- uint32_t valid = CPSR_M | CPSR_AIF | CPSR_IL | CPSR_NZCV | CPSR_J;
+ uint32_t valid = CPSR_M | CPSR_AIF | CPSR_IL | CPSR_NZCV;
if ((features >> ARM_FEATURE_V4T) & 1) {
valid |= CPSR_T;
@@ -1078,6 +1078,9 @@ static inline uint32_t aarch32_cpsr_valid_mask(uint64_t
features,
if ((features >> ARM_FEATURE_THUMB2) & 1) {
valid |= CPSR_IT;
}
+ if (isar_feature_jazelle(id)) {
+ valid |= CPSR_J;
+ }
return valid;
}
--
2.20.1
- [PATCH v4 00/20] target/arm: Implement PAN, ATS1E1, UAO, Richard Henderson, 2020/02/08
- [PATCH v4 01/20] target/arm: Add arm_mmu_idx_is_stage1_of_2, Richard Henderson, 2020/02/08
- [PATCH v4 03/20] target/arm: Add isar_feature tests for PAN + ATS1E1, Richard Henderson, 2020/02/08
- [PATCH v4 04/20] target/arm: Move LOR regdefs to file scope, Richard Henderson, 2020/02/08
- [PATCH v4 02/20] target/arm: Add mmu_idx for EL1 and EL2 w/ PAN enabled, Richard Henderson, 2020/02/08
- [PATCH v4 05/20] target/arm: Split out aarch32_cpsr_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 06/20] target/arm: Mask CPSR_J when Jazelle is not enabled,
Richard Henderson <=
- [PATCH v4 08/20] target/arm: Use aarch32_cpsr_valid_mask in helper_exception_return, Richard Henderson, 2020/02/08
- [PATCH v4 07/20] target/arm: Replace CPSR_ERET_MASK with aarch32_cpsr_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 09/20] target/arm: Remove CPSR_RESERVED, Richard Henderson, 2020/02/08
- [PATCH v4 10/20] target/arm: Introduce aarch64_pstate_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 11/20] target/arm: Update MSR access for PAN, Richard Henderson, 2020/02/08
- [PATCH v4 12/20] target/arm: Update arm_mmu_idx_el for PAN, Richard Henderson, 2020/02/08
- [PATCH v4 13/20] target/arm: Enforce PAN semantics in get_S1prot, Richard Henderson, 2020/02/08
- [PATCH v4 14/20] target/arm: Set PAN bit as required on exception entry, Richard Henderson, 2020/02/08