target/arm: Update find_last_active for PREDDESC

Since b64ee454a4a0, all predicate operations should be
using these field macros for predicates.

Backports 2acbfbe4313daf43b6653ee5d82bcaeaa155e895
This commit is contained in:
Richard Henderson 2021-03-30 14:33:28 -04:00 committed by Lioncash
parent e7cec52fac
commit 452891c530
2 changed files with 6 additions and 7 deletions

View file

@ -2236,10 +2236,10 @@ void HELPER(sve_compact_d)(void *vd, void *vn, void *vg, uint32_t desc)
*/
int32_t HELPER(sve_last_active_element)(void *vg, uint32_t pred_desc)
{
intptr_t oprsz = extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2;
intptr_t esz = extract32(pred_desc, SIMD_DATA_SHIFT, 2);
intptr_t words = DIV_ROUND_UP(FIELD_EX32(pred_desc, PREDDESC, OPRSZ), 8);
intptr_t esz = FIELD_EX32(pred_desc, PREDDESC, ESZ);
return last_active_element(vg, DIV_ROUND_UP(oprsz, 8), esz);
return last_active_element(vg, words, esz);
}
void HELPER(sve_splice)(void *vd, void *vn, void *vm, void *vg, uint32_t desc)

View file

@ -2377,11 +2377,10 @@ static void find_last_active(DisasContext *s, TCGv_i32 ret, int esz, int pg)
TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv_ptr t_p = tcg_temp_new_ptr(tcg_ctx);
TCGv_i32 t_desc;
unsigned vsz = pred_full_reg_size(s);
unsigned desc;
unsigned desc = 0;
desc = vsz - 2;
desc = deposit32(desc, SIMD_DATA_SHIFT, 2, esz);
desc = FIELD_DP32(desc, PREDDESC, OPRSZ, pred_full_reg_size(s));
desc = FIELD_DP32(desc, PREDDESC, ESZ, esz);
tcg_gen_addi_ptr(tcg_ctx, t_p, tcg_ctx->cpu_env, pred_full_reg_offset(s, pg));
t_desc = tcg_const_i32(tcg_ctx, desc);