Expand the macro at each use site. Merge the two arrays and index by fpcr_ah.
Signed-off-by: Richard Henderson <[email protected]> --- target/arm/tcg/translate-sve.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 59a4f9a59b..62610e0394 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4415,19 +4415,6 @@ TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve, gen_gvec_fpst_arg_zzz, *** SVE Floating Point Arithmetic - Predicated Group */ -#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, \ - gen_helper_##name##_s, gen_helper_##name##_d \ - }; \ - static gen_helper_gvec_4_ptr * const name##_ah_zpzz_fns[4] = { \ - gen_helper_##ah_name##_b16, 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) - static gen_helper_gvec_4_ptr * const sve_fadd_zpzz_fns[4] = { gen_helper_sve_fadd_b16, gen_helper_sve_fadd_h, @@ -4455,8 +4442,23 @@ static gen_helper_gvec_4_ptr * const sve_fmul_zpzz_fns[4] = { TRANS_FEAT(FMUL_zpzz, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz, sve_fmul_zpzz_fns[a->esz], a) -DO_ZPZZ_AH_FP_B16(FMIN_zpzz, aa64_sme_or_sve, sve_fmin, sve_ah_fmin) -DO_ZPZZ_AH_FP_B16(FMAX_zpzz, aa64_sme_or_sve, sve_fmax, sve_ah_fmax) +static gen_helper_gvec_4_ptr * const sve_fmin_fns[4][2] = { + { gen_helper_sve_fmin_b16, gen_helper_sve_ah_fmin_b16 }, + { gen_helper_sve_fmin_h, gen_helper_sve_ah_fmin_h }, + { gen_helper_sve_fmin_s, gen_helper_sve_ah_fmin_s }, + { gen_helper_sve_fmin_d, gen_helper_sve_ah_fmin_d }, +}; +TRANS_FEAT(FMIN_zpzz, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz, + sve_fmin_fns[a->esz][s->fpcr_ah], a) + +static gen_helper_gvec_4_ptr * const sve_fmax_fns[4][2] = { + { gen_helper_sve_fmax_b16, gen_helper_sve_ah_fmax_b16 }, + { gen_helper_sve_fmax_h, gen_helper_sve_ah_fmax_h }, + { gen_helper_sve_fmax_s, gen_helper_sve_ah_fmax_s }, + { gen_helper_sve_fmax_d, gen_helper_sve_ah_fmax_d }, +}; +TRANS_FEAT(FMAX_zpzz, aa64_sme_or_sve, gen_gvec_fpst_arg_zpzz, + sve_fmax_fns[a->esz][s->fpcr_ah], a) static gen_helper_gvec_4_ptr * const sve_fmaxnum_fns[4] = { gen_helper_sve_fmaxnum_b16, -- 2.43.0
