MIPS: Fix usage of EmitBranch in compare-minus-zero-and-branch.

Port r17669 (132efad)

BUG=
R=plind44@gmail.com

Review URL: https://codereview.chromium.org/71003003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17675 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
index a3bcdf608a3154c210767c017b7d47a5f075cc0e..7f6e86980872e1c79cd66f4bfdabecdfe81cf0ab 100644 (file)
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -2038,6 +2038,16 @@ void LCodeGen::EmitBranchF(InstrType instr,
 }
 
 
+template<class InstrType>
+void LCodeGen::EmitFalseBranch(InstrType instr,
+                               Condition condition,
+                               Register src1,
+                               const Operand& src2) {
+  int false_block = instr->FalseDestination(chunk_);
+  __ Branch(chunk_->GetAssemblyLabel(false_block), condition, src1, src2);
+}
+
+
 template<class InstrType>
 void LCodeGen::EmitFalseBranchF(InstrType instr,
                                 Condition condition,
@@ -2314,27 +2324,26 @@ void LCodeGen::DoCmpHoleAndBranch(LCmpHoleAndBranch* instr) {
 void LCodeGen::DoCompareMinusZeroAndBranch(LCompareMinusZeroAndBranch* instr) {
   Representation rep = instr->hydrogen()->value()->representation();
   ASSERT(!rep.IsInteger32());
-  Label if_false;
   Register scratch = ToRegister(instr->temp());
 
   if (rep.IsDouble()) {
     DoubleRegister value = ToDoubleRegister(instr->value());
-    __ BranchF(&if_false, NULL, ne, value, kDoubleRegZero);
+    EmitFalseBranchF(instr, ne, value, kDoubleRegZero);
     __ FmoveHigh(scratch, value);
     __ li(at, 0x80000000);
   } else {
     Register value = ToRegister(instr->value());
-    __ CheckMap(
-        value, scratch, Heap::kHeapNumberMapRootIndex, &if_false, DO_SMI_CHECK);
+    __ CheckMap(value,
+                scratch,
+                Heap::kHeapNumberMapRootIndex,
+                instr->FalseLabel(chunk()),
+                DO_SMI_CHECK);
     __ lw(scratch, FieldMemOperand(value, HeapNumber::kExponentOffset));
-    __ Branch(&if_false, ne, scratch, Operand(0x80000000));
+    EmitFalseBranch(instr, ne, scratch, Operand(0x80000000));
     __ lw(scratch, FieldMemOperand(value, HeapNumber::kMantissaOffset));
     __ mov(at, zero_reg);
   }
   EmitBranch(instr, eq, scratch, Operand(at));
-
-  __ bind(&if_false);
-  EmitFalseBranchF(instr, al, kDoubleRegZero, kDoubleRegZero);
 }
 
 

diff --git a/src/mips/lithium-codegen-mips.h b/src/mips/lithium-codegen-mips.h
index f41adbfddde3d9759e79e735fa4b9e2c46f35212..c15352fcbee725a49599b2a921b268581b764295 100644 (file)
--- a/src/mips/lithium-codegen-mips.h
+++ b/src/mips/lithium-codegen-mips.h
@@ -301,6 +301,8 @@ class LCodeGen: public LCodeGenBase {
 
   static Condition TokenToCondition(Token::Value op, bool is_unsigned);
   void EmitGoto(int block);
+
+  // EmitBranch expects to be the last instruction of a block.
   template<class InstrType>
   void EmitBranch(InstrType instr,
                   Condition condition,
@@ -312,6 +314,11 @@ class LCodeGen: public LCodeGenBase {
                    FPURegister src1,
                    FPURegister src2);
   template<class InstrType>
+  void EmitFalseBranch(InstrType instr,
+                       Condition condition,
+                       Register src1,
+                       const Operand& src2);
+  template<class InstrType>
   void EmitFalseBranchF(InstrType instr,
                         Condition condition,
                         FPURegister src1,