Revert "Reland "MIPS: Add support for arch. revision 6 to mips32 port.""

src/mips/code-stubs-mips.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_MIPS
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ skipping 1004 matching lines @@
   Label nan;
   __ li(t0, Operand(LESS));
   __ li(t1, Operand(GREATER));
   __ li(t2, Operand(EQUAL));
 
   // Check if either rhs or lhs is NaN.
   __ BranchF(NULL, &nan, eq, f12, f14);
 
   // Check if LESS condition is satisfied. If true, move conditionally
   // result to v0.
-  if (!IsMipsArchVariant(kMips32r6)) {
-    __ c(OLT, D, f12, f14);
-    __ Movt(v0, t0);
-    // Use previous check to store conditionally to v0 oposite condition
-    // (GREATER). If rhs is equal to lhs, this will be corrected in next
-    // check.
-    __ Movf(v0, t1);
-    // Check if EQUAL condition is satisfied. If true, move conditionally
-    // result to v0.
-    __ c(EQ, D, f12, f14);
-    __ Movt(v0, t2);
-  } else {
-    Label skip;
-    __ BranchF(USE_DELAY_SLOT, &skip, NULL, lt, f12, f14);
-    __ mov(v0, t0);  // Return LESS as result.
-
-    __ BranchF(USE_DELAY_SLOT, &skip, NULL, eq, f12, f14);
-    __ mov(v0, t2);  // Return EQUAL as result.
-
-    __ mov(v0, t1);  // Return GREATER as result.
-    __ bind(&skip);
-  }
+  __ c(OLT, D, f12, f14);
+  __ Movt(v0, t0);
+  // Use previous check to store conditionally to v0 oposite condition
+  // (GREATER). If rhs is equal to lhs, this will be corrected in next
+  // check.
+  __ Movf(v0, t1);
+  // Check if EQUAL condition is satisfied. If true, move conditionally
+  // result to v0.
+  __ c(EQ, D, f12, f14);
+  __ Movt(v0, t2);
 
   __ Ret();
 
   __ bind(&nan);
   // NaN comparisons always fail.
   // Load whatever we need in v0 to make the comparison fail.
   DCHECK(is_int16(GREATER) && is_int16(LESS));
   __ Ret(USE_DELAY_SLOT);
   if (cc == lt || cc == le) {
     __ li(v0, Operand(GREATER));
@@ skipping 4226 matching lines @@
                               MemOperand(fp, 6 * kPointerSize),
                               NULL);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_MIPS