OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Mask CPSR_J when Jazelle is not enabled

Browse Source 
The J bit signals Jazelle mode, and so of course is RES0
when the feature is not enabled.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200208125816.14954-7-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-02-08 12:58:02 +00:00 committed by Peter Maydell
parent 4f9584ed4b
commit f062d1447f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/arm/internals.h
View File

@ -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, static inline uint32_t aarch32_cpsr_valid_mask(uint64_t features,
const ARMISARegisters *id) 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) { if ((features >> ARM_FEATURE_V4T) & 1) {
valid |= CPSR_T; valid |= CPSR_T;
@ -1078,6 +1078,9 @@ static inline uint32_t aarch32_cpsr_valid_mask(uint64_t features,
if ((features >> ARM_FEATURE_THUMB2) & 1) { if ((features >> ARM_FEATURE_THUMB2) & 1) {
valid |= CPSR_IT; valid |= CPSR_IT;
} }
if (isar_feature_jazelle(id)) {
valid |= CPSR_J;
}
return valid; return valid;
} }