Commit cc80ed3524 for qemu.org
commit cc80ed352482478443a421b8228a13c7e88b9ef5
Author: Richard Henderson <richard.henderson@linaro.org>
Date: Wed Aug 26 10:41:55 2026 -0700
target/arm: Remove DO_ZPZZ_AH_FP from translate-sme.c
Expand the macro at each use site.
Merge the two arrays and index by fpcr_ah.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20260826174213.614571-9-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
index 347eeb4602..6e984d02f8 100644
--- a/target/arm/tcg/translate-sve.c
+++ b/target/arm/tcg/translate-sve.c
@@ -4425,19 +4425,6 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve, gen_gvec_fpst_arg_zzz,
*** SVE Floating Point Arithmetic - Predicated Group
*/
-#define DO_ZPZZ_AH_FP(NAME, FEAT, name, ah_name) \
- static gen_helper_gvec_4_ptr * const name##_zpzz_fns[4] = { \
- NULL, gen_helper_##name##_h, \
- gen_helper_##name##_s, gen_helper_##name##_d \
- }; \
- static gen_helper_gvec_4_ptr * const name##_ah_zpzz_fns[4] = { \
- NULL, gen_helper_##ah_name##_h, \
- gen_helper_##ah_name##_s, gen_helper_##ah_name##_d \
- }; \
- TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz, \
- s->fpcr_ah ? name##_ah_zpzz_fns[a->esz] : \
- name##_zpzz_fns[a->esz], a)
-
#define DO_ZPZZ_AH_FP_B16(NAME, FEAT, name, ah_name) \
static gen_helper_gvec_4_ptr * const name##_zpzz_fns[4] = { \
gen_helper_##name##_b16, gen_helper_##name##_h, \
@@ -4499,7 +4486,14 @@ static gen_helper_gvec_4_ptr * const sve_fminnum_fns[4] = {
TRANS_FEAT(FMINNM_zpzz, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz,
sve_fminnum_fns[a->esz], a)
-DO_ZPZZ_AH_FP(FABD, aa64_sme_or_sve, sve_fabd, sve_ah_fabd)
+static gen_helper_gvec_4_ptr * const sve_fabd_zpzz_fns[4][2] = {
+ { NULL, NULL },
+ { gen_helper_sve_fabd_h, gen_helper_sve_ah_fabd_h },
+ { gen_helper_sve_fabd_s, gen_helper_sve_ah_fabd_s },
+ { gen_helper_sve_fabd_d, gen_helper_sve_ah_fabd_d },
+};
+TRANS_FEAT(FABD, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz,
+ sve_fabd_zpzz_fns[a->esz][s->fpcr_ah], a)
static gen_helper_gvec_4_ptr * const sve_fscalbn_zpzz_fns[4] = {
NULL,
@@ -8144,8 +8138,23 @@ static gen_helper_gvec_4_ptr * const sve_fminnmp_zpzz_fns[4] = {
TRANS_FEAT(FMINNMP, aa64_sme_or_sve2, gen_gvec_fpst_arg_zpzz,
sve_fminnmp_zpzz_fns[a->esz], a)
-DO_ZPZZ_AH_FP(FMAXP, aa64_sme_or_sve2, sve2_fmaxp_zpzz, sve2_ah_fmaxp_zpzz)
-DO_ZPZZ_AH_FP(FMINP, aa64_sme_or_sve2, sve2_fminp_zpzz, sve2_ah_fminp_zpzz)
+static gen_helper_gvec_4_ptr * const sve_fmaxp_zpzz_fns[4][2] = {
+ { NULL, NULL },
+ { gen_helper_sve2_fmaxp_zpzz_h, gen_helper_sve2_ah_fmaxp_zpzz_h },
+ { gen_helper_sve2_fmaxp_zpzz_s, gen_helper_sve2_ah_fmaxp_zpzz_s },
+ { gen_helper_sve2_fmaxp_zpzz_d, gen_helper_sve2_ah_fmaxp_zpzz_d },
+};
+TRANS_FEAT(FMAXP, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz,
+ sve_fmaxp_zpzz_fns[a->esz][s->fpcr_ah], a)
+
+static gen_helper_gvec_4_ptr * const sve_fminp_zpzz_fns[4][2] = {
+ { NULL, NULL },
+ { gen_helper_sve2_fminp_zpzz_h, gen_helper_sve2_ah_fminp_zpzz_h },
+ { gen_helper_sve2_fminp_zpzz_s, gen_helper_sve2_ah_fminp_zpzz_s },
+ { gen_helper_sve2_fminp_zpzz_d, gen_helper_sve2_ah_fminp_zpzz_d },
+};
+TRANS_FEAT(FMINP, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz,
+ sve_fminp_zpzz_fns[a->esz][s->fpcr_ah], a)
static bool do_fmmla(DisasContext *s, arg_rrrr_esz *a,
gen_helper_gvec_4_ptr *fn)