target/arm: Move sve check into gen_gvec_fn_ppp

Combined with the check already present in gen_mov_p,
we can simplify some special cases in trans_AND_pppp
and trans_BIC_pppp.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220527181907.189259-80-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-05-27 11:18:32 -07:00 committed by Peter Maydell
parent 25aee7cc3b
commit 23e5fa5f90
1 changed files with 12 additions and 18 deletions

View File

@ -370,13 +370,16 @@ static void do_dupi_z(DisasContext *s, int rd, uint64_t word)
} }
/* Invoke a vector expander on three Pregs. */ /* Invoke a vector expander on three Pregs. */
static void gen_gvec_fn_ppp(DisasContext *s, GVecGen3Fn *gvec_fn, static bool gen_gvec_fn_ppp(DisasContext *s, GVecGen3Fn *gvec_fn,
int rd, int rn, int rm) int rd, int rn, int rm)
{ {
unsigned psz = pred_gvec_reg_size(s); if (sve_access_check(s)) {
gvec_fn(MO_64, pred_full_reg_offset(s, rd), unsigned psz = pred_gvec_reg_size(s);
pred_full_reg_offset(s, rn), gvec_fn(MO_64, pred_full_reg_offset(s, rd),
pred_full_reg_offset(s, rm), psz, psz); pred_full_reg_offset(s, rn),
pred_full_reg_offset(s, rm), psz, psz);
}
return true;
} }
/* Invoke a vector move on two Pregs. */ /* Invoke a vector move on two Pregs. */
@ -1317,19 +1320,13 @@ static bool trans_AND_pppp(DisasContext *s, arg_rprr_s *a)
}; };
if (!a->s) { if (!a->s) {
if (!sve_access_check(s)) {
return true;
}
if (a->rn == a->rm) { if (a->rn == a->rm) {
if (a->pg == a->rn) { if (a->pg == a->rn) {
do_mov_p(s, a->rd, a->rn); return do_mov_p(s, a->rd, a->rn);
} else {
gen_gvec_fn_ppp(s, tcg_gen_gvec_and, a->rd, a->rn, a->pg);
} }
return true; return gen_gvec_fn_ppp(s, tcg_gen_gvec_and, a->rd, a->rn, a->pg);
} else if (a->pg == a->rn || a->pg == a->rm) { } else if (a->pg == a->rn || a->pg == a->rm) {
gen_gvec_fn_ppp(s, tcg_gen_gvec_and, a->rd, a->rn, a->rm); return gen_gvec_fn_ppp(s, tcg_gen_gvec_and, a->rd, a->rn, a->rm);
return true;
} }
} }
return do_pppp_flags(s, a, &op); return do_pppp_flags(s, a, &op);
@ -1358,10 +1355,7 @@ static bool trans_BIC_pppp(DisasContext *s, arg_rprr_s *a)
}; };
if (!a->s && a->pg == a->rn) { if (!a->s && a->pg == a->rn) {
if (sve_access_check(s)) { return gen_gvec_fn_ppp(s, tcg_gen_gvec_andc, a->rd, a->rn, a->rm);
gen_gvec_fn_ppp(s, tcg_gen_gvec_andc, a->rd, a->rn, a->rm);
}
return true;
} }
return do_pppp_flags(s, a, &op); return do_pppp_flags(s, a, &op);
} }