This includes FMAXNMP, FADDP, FMAXP, FMINNMP, FMINP.
Signed-off-by: Alex Bennée
---
v2
- checkpatch fixes
---
target/arm/translate-a64.c | 208 +
1 file changed, 133 insertions(+), 75 deletions(-)
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 06fbf9df24..3a2be1e016 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -9813,6 +9813,7 @@ static void disas_simd_three_reg_same_fp16(DisasContext
*s, uint32_t insn)
int datasize, elements;
int pass;
TCGv_ptr fpst;
+bool pairwise = false;
if (!arm_dc_feature(s, ARM_FEATURE_V8_FP16)) {
unallocated_encoding(s);
@@ -9838,91 +9839,148 @@ static void
disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn)
datasize = is_q ? 128 : 64;
elements = datasize / 16;
+switch (fpopcode) {
+case 0x10: /* FMAXNMP */
+case 0x12: /* FADDP */
+case 0x16: /* FMAXP */
+case 0x18: /* FMINNMP */
+case 0x1e: /* FMINP */
+pairwise = true;
+break;
+}
+
fpst = get_fpstatus_ptr(true);
-for (pass = 0; pass < elements; pass++) {
+if (pairwise) {
+int maxpass = is_q ? 8 : 4;
TCGv_i32 tcg_op1 = tcg_temp_new_i32();
TCGv_i32 tcg_op2 = tcg_temp_new_i32();
-TCGv_i32 tcg_res = tcg_temp_new_i32();
+TCGv_i32 tcg_res[8];
-read_vec_element_i32(s, tcg_op1, rn, pass, MO_16);
-read_vec_element_i32(s, tcg_op2, rm, pass, MO_16);
+for (pass = 0; pass < maxpass; pass++) {
+int passreg = pass < (maxpass / 2) ? rn : rm;
+int passelt = (pass << 1) & (maxpass - 1);
-switch (fpopcode) {
-case 0x0: /* FMAXNM */
-gen_helper_advsimd_maxnumh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x1: /* FMLA */
-read_vec_element_i32(s, tcg_res, rd, pass, MO_16);
-gen_helper_advsimd_muladdh(tcg_res, tcg_op1, tcg_op2, tcg_res,
- fpst);
-break;
-case 0x2: /* FADD */
-gen_helper_advsimd_addh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x3: /* FMULX */
-gen_helper_advsimd_mulxh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x4: /* FCMEQ */
-gen_helper_advsimd_ceq_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x6: /* FMAX */
-gen_helper_advsimd_maxh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x7: /* FRECPS */
-gen_helper_recpsf_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x8: /* FMINNM */
-gen_helper_advsimd_minnumh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x9: /* FMLS */
- /* As usual for ARM, separate negation for fused multiply-add */
-tcg_gen_xori_i32(tcg_op1, tcg_op1, 0x8000);
-read_vec_element_i32(s, tcg_res, rd, pass, MO_16);
-gen_helper_advsimd_muladdh(tcg_res, tcg_op1, tcg_op2, tcg_res,
- fpst);
-break;
-case 0xa: /* FSUB */
-gen_helper_advsimd_subh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0xe: /* FMIN */
-gen_helper_advsimd_minh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0xf: /* FRSQRTS */
-gen_helper_rsqrtsf_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x13: /* FMUL */
-gen_helper_advsimd_mulh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x14: /* FCMGE */
-gen_helper_advsimd_cge_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x15: /* FACGE */
-gen_helper_advsimd_acge_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x17: /* FDIV */
-gen_helper_advsimd_divh(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x1a: /* FABD */
-gen_helper_advsimd_subh(tcg_res, tcg_op1, tcg_op2, fpst);
-gen_helper_advsimd_absh(tcg_res, tcg_res);
-break;
-case 0x1c: /* FCMGT */
-gen_helper_advsimd_cgt_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-case 0x1d: /* FACGT */
-gen_helper_advsimd_acgt_f16(tcg_res, tcg_op1, tcg_op2, fpst);
-break;
-default:
-fprintf(stderr, "%s: insn %#04x, fpop %#2x @ %#" PRIx64 "\n",
-__func__, insn, fpopcode, s->pc);
-g_assert_not_reached();
+read_vec_element_i32(s, tcg_op1, passreg, passelt, MO_16);
+read_vec_element_i32(s, tcg_op2, passreg, passelt + 1, MO_16);
+tcg_res[pass] = tcg_temp_new_i32();
+
+switch (fpopcode) {
+case 0x10: /* FMAXNMP */
+