[Valgrind-developers] vex: r2695: Implement VCVT.{S, U}32.F64 D[d], D[d], #frac_bits. Fixes #315738.

[<sv...@va...>]

sewardj	2013-03-06 08:34:04 +0000 (Wed, 06 Mar 2013)

  New Revision: 2695

  Log:
    Implement VCVT.{S,U}32.F64 D[d], D[d], #frac_bits.  Fixes #315738.

  Modified files:
    trunk/priv/guest_arm_toIR.c
    trunk/priv/host_arm_isel.c


  Modified: trunk/priv/guest_arm_toIR.c (+22 -2)
===================================================================
--- trunk/priv/guest_arm_toIR.c	2013-03-05 14:26:22 +00:00 (rev 2694)
+++ trunk/priv/guest_arm_toIR.c	2013-03-06 08:34:04 +00:00 (rev 2695)
@@ -12486,8 +12486,6 @@
          /* VCVT.F64.{S,U}32 D[d], D[d], #frac_bits */
          /* This generates really horrible code.  We could potentially
             do much better. */
-         IRTemp rmode = newTemp(Ity_I32);
-         assign(rmode, mkU32(Irrm_NEAREST)); // per the spec
          IRTemp src32 = newTemp(Ity_I32);
          assign(src32,  unop(Iop_ReinterpF32asI32, getFReg(2*d)));
          IRExpr* as_F64 = unop( unsyned ? Iop_I32UtoF64 : Iop_I32StoF64,
@@ -12504,6 +12502,28 @@
              unsyned ? 'u' : 's', d, d, frac_bits);
          goto decode_success_vfp;
       }
+      if (frac_bits >= 1 && frac_bits <= 32 && to_fixed && dp_op
+                                            && size == 32) {
+         /* VCVT.{S,U}32.F64 D[d], D[d], #frac_bits */
+         IRTemp srcF64 = newTemp(Ity_F64);
+         assign(srcF64, getDReg(d));
+         IRTemp scale = newTemp(Ity_F64);
+         assign(scale, unop(Iop_I32UtoF64, mkU32( 1 << (frac_bits-1) )));
+         IRTemp scaledF64 = newTemp(Ity_F64);
+         IRExpr* rm = mkU32(Irrm_NEAREST);
+         assign(scaledF64, triop(Iop_MulF64,
+                                 rm, mkexpr(srcF64),
+                                 triop(Iop_AddF64, rm, mkexpr(scale),
+                                                       mkexpr(scale))));
+         IRTemp rmode = newTemp(Ity_I32);
+         assign(rmode, mkU32(Irrm_ZERO)); // as per the spec
+         IRTemp asI32 = newTemp(Ity_I32);
+         assign(asI32, binop(unsyned ? Iop_F64toI32U : Iop_F64toI32S,
+                             mkexpr(rmode), mkexpr(scaledF64)));
+         putDRegI64(d, unop(unsyned ? Iop_32Uto64 : Iop_32Sto64,
+                            mkexpr(asI32)), condT);
+         goto decode_success_vfp;
+      }
       /* fall through */
    }
 

  Modified: trunk/priv/host_arm_isel.c (+13 -1)
===================================================================
--- trunk/priv/host_arm_isel.c	2013-03-05 14:26:22 +00:00 (rev 2694)
+++ trunk/priv/host_arm_isel.c	2013-03-06 08:34:04 +00:00 (rev 2695)
@@ -3087,12 +3087,23 @@
             return res;
          }
 
+         /* 32Sto64 */
+         case Iop_32Sto64: {
+            HReg rLo = iselIntExpr_R(env, e->Iex.Unop.arg);
+            HReg rHi = newVRegI(env);
+            addInstr(env, mk_iMOVds_RR(rHi, rLo));
+            addInstr(env, ARMInstr_Shift(ARMsh_SAR, rHi, rHi, ARMRI5_I5(31)));
+            HReg res = newVRegD(env);
+            addInstr(env, ARMInstr_VXferD(True/*toD*/, res, rHi, rLo));
+            return res;
+         }
+
+         /* The next 3 are pass-throughs */
          /* ReinterpF64asI64 */
          case Iop_ReinterpF64asI64:
          /* Left64(e) */
          case Iop_Left64:
          /* CmpwNEZ64(e) */
-         //case Iop_CmpwNEZ64:
          case Iop_1Sto64: {
             HReg rLo, rHi;
             HReg res = newVRegD(env);
@@ -3100,6 +3111,7 @@
             addInstr(env, ARMInstr_VXferD(True/*toD*/, res, rHi, rLo));
             return res;
          }
+
          case Iop_Not64: {
             DECLARE_PATTERN(p_veqz_8x8);
             DECLARE_PATTERN(p_veqz_16x4);