| Index: src/crankshaft/mips/lithium-codegen-mips.cc
|
| diff --git a/src/crankshaft/mips/lithium-codegen-mips.cc b/src/crankshaft/mips/lithium-codegen-mips.cc
|
| index 44b0a499d0c7a6728718e54f4227e68a7e901e27..5683251109c2f2b84414c4632f1207229014a21e 100644
|
| --- a/src/crankshaft/mips/lithium-codegen-mips.cc
|
| +++ b/src/crankshaft/mips/lithium-codegen-mips.cc
|
| @@ -1430,9 +1430,10 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| switch (constant) {
|
| case -1:
|
| if (overflow) {
|
| - __ SubuAndCheckForOverflow(result, zero_reg, left, scratch);
|
| - DeoptimizeIf(lt, instr, Deoptimizer::kOverflow, scratch,
|
| - Operand(zero_reg));
|
| + Label no_overflow;
|
| + __ SubBranchNoOvf(result, zero_reg, Operand(left), &no_overflow);
|
| + DeoptimizeIf(al, instr);
|
| + __ bind(&no_overflow);
|
| } else {
|
| __ Subu(result, zero_reg, left);
|
| }
|
| @@ -1658,21 +1659,19 @@ void LCodeGen::DoSubI(LSubI* instr) {
|
| __ Subu(ToRegister(result), ToRegister(left), ToOperand(right));
|
| }
|
| } else { // can_overflow.
|
| - Register overflow = scratch0();
|
| - Register scratch = scratch1();
|
| + Register scratch = scratch0();
|
| + Label no_overflow_label;
|
| if (right->IsStackSlot()) {
|
| Register right_reg = EmitLoadRegister(right, scratch);
|
| - __ SubuAndCheckForOverflow(ToRegister(result),
|
| - ToRegister(left),
|
| - right_reg,
|
| - overflow); // Reg at also used as scratch.
|
| + __ SubBranchNoOvf(ToRegister(result), ToRegister(left),
|
| + Operand(right_reg), &no_overflow_label);
|
| } else {
|
| DCHECK(right->IsRegister() || right->IsConstantOperand());
|
| - __ SubuAndCheckForOverflow(ToRegister(result), ToRegister(left),
|
| - ToOperand(right), overflow, scratch);
|
| + __ SubBranchNoOvf(ToRegister(result), ToRegister(left), ToOperand(right),
|
| + &no_overflow_label, scratch);
|
| }
|
| - DeoptimizeIf(lt, instr, Deoptimizer::kOverflow, overflow,
|
| - Operand(zero_reg));
|
| + DeoptimizeIf(al, instr);
|
| + __ bind(&no_overflow_label);
|
| }
|
| }
|
|
|
| @@ -1854,21 +1853,19 @@ void LCodeGen::DoAddI(LAddI* instr) {
|
| __ Addu(ToRegister(result), ToRegister(left), ToOperand(right));
|
| }
|
| } else { // can_overflow.
|
| - Register overflow = scratch0();
|
| Register scratch = scratch1();
|
| + Label no_overflow_label;
|
| if (right->IsStackSlot()) {
|
| Register right_reg = EmitLoadRegister(right, scratch);
|
| - __ AdduAndCheckForOverflow(ToRegister(result),
|
| - ToRegister(left),
|
| - right_reg,
|
| - overflow); // Reg at also used as scratch.
|
| + __ AddBranchNoOvf(ToRegister(result), ToRegister(left),
|
| + Operand(right_reg), &no_overflow_label);
|
| } else {
|
| DCHECK(right->IsRegister() || right->IsConstantOperand());
|
| - __ AdduAndCheckForOverflow(ToRegister(result), ToRegister(left),
|
| - ToOperand(right), overflow, scratch);
|
| + __ AddBranchNoOvf(ToRegister(result), ToRegister(left), ToOperand(right),
|
| + &no_overflow_label, scratch);
|
| }
|
| - DeoptimizeIf(lt, instr, Deoptimizer::kOverflow, overflow,
|
| - Operand(zero_reg));
|
| + DeoptimizeIf(al, instr);
|
| + __ bind(&no_overflow_label);
|
| }
|
| }
|
|
|
|
|