@samitouri / QOSamiQemu / commits / 3559e61ebb

target/arm: use syndrome helpers in arm_cpu_do_interrupt_aarch32_hyp

One more step towards dropping 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-17-alex.bennee@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Alex Bennée committed Apr 22, 2026 at 13:52 UTC 3559e61ebb995c3320d6172fb408f4958b4403ba
1 file changed +2 -2
target/arm/helper.c
+2 -2
@@ -8844,9 +8844,9 @@ static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs)
8844 */
8845 if (cs->exception_index == EXCP_PREFETCH_ABORT ||
8846 (cs->exception_index == EXCP_DATA_ABORT &&
8847 - !(env->exception.syndrome & ARM_EL_ISV)) ||
8847 + !FIELD_EX32(env->exception.syndrome, SYNDROME, IL)) ||
8848 syn_get_ec(env->exception.syndrome) == EC_UNCATEGORIZED) {
8849 - env->exception.syndrome &= ~ARM_EL_IL;
8849 + env->exception.syndrome = FIELD_DP32(env->exception.syndrome, SYNDROME, IL, 0);
8850 }
8851 }
8852 env->cp15.esr_el[2] = env->exception.syndrome;