target/arm: use syndrome helpers to query VNCR bit
These are only valid for data abort syndromes. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20260422125250.1303100-22-alex.bennee@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Alex Bennée committed
Apr 22, 2026 at 13:52 UTC
3ebe35694b8ce5945cee5653e8ef3e8db0d8bcba
1 file changed
+2
-2
target/arm/tcg/tlb_helper.c
+2
-2
@@ -48,7 +48,7 @@ static inline uint64_t merge_syn_data_abort(uint32_t template_syn,
48
* ST64BV, or ST64BV0 insns report syndrome info even for stage-1
49
* faults and regardless of the target EL.
50
*/
51
- if (template_syn & ARM_EL_VNCR) {
51
+ if (FIELD_EX32(template_syn, DABORT_ISS, VNCR)) {
52
/*
53
* FEAT_NV2 faults on accesses via VNCR_EL2 are a special case:
54
* they are always reported as "same EL", even though we are going
@@ -190,7 +190,7 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr,
190
* because we masked that out in disas_set_insn_syndrome())
191
*/
192
bool is_vncr = (access_type != MMU_INST_FETCH) &&
193
- (env->exception.syndrome & ARM_EL_VNCR);
193
+ FIELD_EX32(env->exception.syndrome, DABORT_ISS, VNCR);
194
195
if (is_vncr) {
196
/* FEAT_NV2 faults on accesses via VNCR_EL2 go to EL2 */