target/arm: use syndrome helpers in merge_syn_data_abort
One more step to removing the old defines. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20260422125250.1303100-21-alex.bennee@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Alex Bennée committed
Apr 22, 2026 at 13:52 UTC
f5fc9e119d98c15b32e5d52d88d73472235db891
1 file changed
+1
-1
target/arm/tcg/tlb_helper.c
+1
-1
@@ -56,7 +56,7 @@ static inline uint64_t merge_syn_data_abort(uint32_t template_syn,
56
*/
57
assert(!fi->stage2);
58
syn = syn_data_abort_vncr(fi->ea, is_write, fsc);
59
- } else if (!(template_syn & ARM_EL_ISV) || target_el != 2
59
+ } else if (!FIELD_EX32(template_syn, DABORT_ISS, ISV) || target_el != 2
60
|| fi->s1ptw || !fi->stage2) {
61
syn = syn_data_abort_no_iss(same_el, 0,
62
fi->ea, 0, fi->s1ptw, is_write, fsc);