MIPS: Fix disassembler test failures.

test/cctest/test-disasm-mips.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 875 matching lines @@
     COMPARE(min_s(f3, f4, f5), "460520dc       min.s    f3, f4, f5");
     COMPARE(max_s(f3, f4, f5), "460520de       max.s    f3, f4, f5");
 
     COMPARE(mina_d(f3, f4, f5), "462520dd       mina.d   f3, f4, f5");
     COMPARE(mina_s(f3, f4, f5), "460520dd       mina.s   f3, f4, f5");
 
     COMPARE(maxa_d(f3, f4, f5), "462520df       maxa.d   f3, f4, f5");
     COMPARE(maxa_s(f3, f4, f5), "460520df       maxa.s   f3, f4, f5");
   }
 
+  if ((IsMipsArchVariant(kMips32r2) || IsMipsArchVariant(kMips32r6)) &&
+      IsFp64Mode()) {
+    COMPARE(trunc_l_d(f8, f6), "46203209       trunc.l.d f8, f6");
+    COMPARE(trunc_l_s(f8, f6), "46003209       trunc.l.s f8, f6");
+
+    COMPARE(round_l_s(f8, f6), "46003208       round.l.s f8, f6");
+    COMPARE(round_l_d(f8, f6), "46203208       round.l.d f8, f6");
+
+    COMPARE(floor_l_s(f8, f6), "4600320b       floor.l.s f8, f6");
+    COMPARE(floor_l_d(f8, f6), "4620320b       floor.l.d f8, f6");
+
+    COMPARE(ceil_l_s(f8, f6), "4600320a       ceil.l.s f8, f6");
+    COMPARE(ceil_l_d(f8, f6), "4620320a       ceil.l.d f8, f6");
+  }
+
   COMPARE(trunc_w_d(f8, f6), "4620320d       trunc.w.d f8, f6");
   COMPARE(trunc_w_s(f8, f6), "4600320d       trunc.w.s f8, f6");
 
   COMPARE(round_w_s(f8, f6), "4600320c       round.w.s f8, f6");
   COMPARE(round_w_d(f8, f6), "4620320c       round.w.d f8, f6");
 
-  COMPARE(round_l_s(f8, f6), "46003208       round.l.s f8, f6");
-  COMPARE(round_l_d(f8, f6), "46203208       round.l.d f8, f6");
-
   COMPARE(floor_w_s(f8, f6), "4600320f       floor.w.s f8, f6");
   COMPARE(floor_w_d(f8, f6), "4620320f       floor.w.d f8, f6");
 
-  COMPARE(floor_l_s(f8, f6), "4600320b       floor.l.s f8, f6");
-  COMPARE(floor_l_d(f8, f6), "4620320b       floor.l.d f8, f6");
-
   COMPARE(ceil_w_s(f8, f6), "4600320e       ceil.w.s f8, f6");
   COMPARE(ceil_w_d(f8, f6), "4620320e       ceil.w.d f8, f6");
 
-  COMPARE(ceil_l_s(f8, f6), "4600320a       ceil.l.s f8, f6");
-  COMPARE(ceil_l_d(f8, f6), "4620320a       ceil.l.d f8, f6");
-
   COMPARE(sub_s(f10, f8, f6), "46064281       sub.s   f10, f8, f6");
   COMPARE(sub_d(f10, f8, f6), "46264281       sub.d   f10, f8, f6");
 
   COMPARE(sqrt_s(f8, f6), "46003204       sqrt.s  f8, f6");
   COMPARE(sqrt_d(f8, f6), "46203204       sqrt.d  f8, f6");
 
   COMPARE(neg_s(f8, f6), "46003207       neg.s   f8, f6");
   COMPARE(neg_d(f8, f6), "46203207       neg.d   f8, f6");
 
   COMPARE(mul_s(f8, f6, f4), "46043202       mul.s   f8, f6, f4");
   COMPARE(mul_d(f8, f6, f4), "46243202       mul.d   f8, f6, f4");
 
   if (IsMipsArchVariant(kMips32r2) || IsMipsArchVariant(kMips32r6)) {
     COMPARE(rsqrt_s(f8, f6), "46003216       rsqrt.s  f8, f6");
     COMPARE(rsqrt_d(f8, f6), "46203216       rsqrt.d  f8, f6");
 
     COMPARE(recip_s(f8, f6), "46003215       recip.s  f8, f6");
     COMPARE(recip_d(f8, f6), "46203215       recip.d  f8, f6");
   }
 
   COMPARE(mov_s(f6, f4), "46002186       mov.s   f6, f4");
   COMPARE(mov_d(f6, f4), "46202186       mov.d   f6, f4");
 
   if (IsMipsArchVariant(kMips32r2)) {
-    COMPARE(trunc_l_d(f8, f6), "46203209       trunc.l.d f8, f6");
-    COMPARE(trunc_l_s(f8, f6), "46003209       trunc.l.s f8, f6");
-
     COMPARE(movz_s(f6, f4, t0), "46082192       movz.s    f6, f4, t0");
     COMPARE(movz_d(f6, f4, t0), "46282192       movz.d    f6, f4, t0");
 
     COMPARE(movt_s(f6, f4, 4), "46112191       movt.s    f6, f4, cc(1)");
     COMPARE(movt_d(f6, f4, 4), "46312191       movt.d    f6, f4, cc(1)");
 
     COMPARE(movf_s(f6, f4, 4), "46102191       movf.s    f6, f4, cc(1)");
     COMPARE(movf_d(f6, f4, 4), "46302191       movf.d    f6, f4, cc(1)");
 
     COMPARE(movn_s(f6, f4, t0), "46082193       movn.s    f6, f4, t0");
@@ skipping 87 matching lines @@
 
     VERIFY_RUN();
   }
 }
 
 
 TEST(CVT_DISSASM) {
   SET_UP();
   COMPARE(cvt_d_s(f22, f24), "4600c5a1       cvt.d.s f22, f24");
   COMPARE(cvt_d_w(f22, f24), "4680c5a1       cvt.d.w f22, f24");
-  if (IsMipsArchVariant(kMips32r6) || IsMipsArchVariant(kMips32r2)) {
-    COMPARE(cvt_d_l(f22, f24), "46a0c5a1       cvt.d.l f22, f24");
-  }
-
-  if (IsMipsArchVariant(kMips32r6) || IsMipsArchVariant(kMips32r2)) {
-    COMPARE(cvt_l_s(f22, f24), "4600c5a5       cvt.l.s f22, f24");
-    COMPARE(cvt_l_d(f22, f24), "4620c5a5       cvt.l.d f22, f24");
-  }
-
-  COMPARE(cvt_s_d(f22, f24), "4620c5a0       cvt.s.d f22, f24");
-  COMPARE(cvt_s_w(f22, f24), "4680c5a0       cvt.s.w f22, f24");
-  if (IsMipsArchVariant(kMips32r6) || IsMipsArchVariant(kMips32r2)) {
-    COMPARE(cvt_s_l(f22, f24), "46a0c5a0       cvt.s.l f22, f24");
-  }
 
   COMPARE(cvt_s_d(f22, f24), "4620c5a0       cvt.s.d f22, f24");
   COMPARE(cvt_s_w(f22, f24), "4680c5a0       cvt.s.w f22, f24");
 
+  if ((IsMipsArchVariant(kMips32r2) || IsMipsArchVariant(kMips32r6)) &&
+      IsFp64Mode()) {
+    COMPARE(cvt_d_l(f22, f24), "46a0c5a1       cvt.d.l f22, f24");
+    COMPARE(cvt_l_d(f22, f24), "4620c5a5       cvt.l.d f22, f24");
+
+    COMPARE(cvt_s_l(f22, f24), "46a0c5a0       cvt.s.l f22, f24");
+    COMPARE(cvt_l_s(f22, f24), "4600c5a5       cvt.l.s f22, f24");
+  }
+
   VERIFY_RUN();
 }