Index: src/compiler/mips64/code-generator-mips64.cc |
diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc |
index bcfa56ae306a19c0bdff67ff51807be6c8296563..da2fce31acaa4fb3bf01d9065117493aa75ac9d2 100644 |
--- a/src/compiler/mips64/code-generator-mips64.cc |
+++ b/src/compiler/mips64/code-generator-mips64.cc |
@@ -975,7 +975,6 @@ void CodeGenerator::AssembleArchBranch(Instruction* instr, BranchInfo* branch) { |
Label* tlabel = branch->true_label; |
Label* flabel = branch->false_label; |
Condition cc = kNoCondition; |
- |
// MIPS does not have condition code flags, so compare and branch are |
// implemented differently than on the other arch's. The compare operations |
// emit mips psuedo-instructions, which are handled here by branch |
@@ -1034,38 +1033,105 @@ void CodeGenerator::AssembleArchBoolean(Instruction* instr, |
DCHECK_NE(0u, instr->OutputCount()); |
Register result = i.OutputRegister(instr->OutputCount() - 1); |
Condition cc = kNoCondition; |
- |
// MIPS does not have condition code flags, so compare and branch are |
// implemented differently than on the other arch's. The compare operations |
// emit mips pseudo-instructions, which are checked and handled here. |
- // For materializations, we use delay slot to set the result true, and |
- // in the false case, where we fall through the branch, we reset the result |
- // false. |
- |
if (instr->arch_opcode() == kMips64Tst) { |
cc = FlagsConditionToConditionTst(condition); |
- __ And(at, i.InputRegister(0), i.InputOperand(1)); |
- __ Branch(USE_DELAY_SLOT, &done, cc, at, Operand(zero_reg)); |
- __ li(result, Operand(1)); // In delay slot. |
+ __ And(kScratchReg, i.InputRegister(0), i.InputOperand(1)); |
+ __ xori(result, zero_reg, 1); // Create 1 for true. |
+ if (kArchVariant == kMips64r6) { |
+ if (cc == eq) { |
+ __ seleqz(result, result, kScratchReg); |
+ } else { |
+ __ selnez(result, result, kScratchReg); |
+ } |
+ } else { |
+ if (cc == eq) { |
+ __ Movn(result, zero_reg, kScratchReg); |
+ } else { |
+ __ Movz(result, zero_reg, kScratchReg); |
+ } |
+ } |
+ return; |
} else if (instr->arch_opcode() == kMips64Dadd || |
instr->arch_opcode() == kMips64Dsub) { |
cc = FlagsConditionToConditionOvf(condition); |
- __ dsra32(kScratchReg, i.OutputRegister(), 0); |
- __ sra(at, i.OutputRegister(), 31); |
- __ Branch(USE_DELAY_SLOT, &done, cc, at, Operand(kScratchReg)); |
- __ li(result, Operand(1)); // In delay slot. |
+ // Check for overflow creates 1 or 0 for result. |
+ __ dsrl32(kScratchReg, i.OutputRegister(), 31); |
+ __ srl(at, i.OutputRegister(), 31); |
+ __ xor_(result, kScratchReg, at); |
+ if (cc == eq) // Toggle result for not overflow. |
+ __ xori(result, result, 1); |
+ return; |
} else if (instr->arch_opcode() == kMips64Cmp) { |
- Register left = i.InputRegister(0); |
- Operand right = i.InputOperand(1); |
cc = FlagsConditionToConditionCmp(condition); |
- __ Branch(USE_DELAY_SLOT, &done, cc, left, right); |
- __ li(result, Operand(1)); // In delay slot. |
+ switch (cc) { |
+ case eq: |
+ case ne: { |
+ Register left = i.InputRegister(0); |
+ Operand right = i.InputOperand(1); |
+ __ Dsubu(kScratchReg, left, right); |
+ __ xori(result, zero_reg, 1); |
+ if (kArchVariant == kMips64r6) { |
+ if (cc == eq) { |
+ __ seleqz(result, result, kScratchReg); |
+ } else { |
+ __ selnez(result, result, kScratchReg); |
+ } |
+ } else { |
+ if (cc == eq) { |
+ __ Movn(result, zero_reg, kScratchReg); |
+ } else { |
+ __ Movz(result, zero_reg, kScratchReg); |
+ } |
+ } |
+ } break; |
+ case lt: |
+ case ge: { |
+ Register left = i.InputRegister(0); |
+ Operand right = i.InputOperand(1); |
+ __ Slt(result, left, right); |
+ if (cc == ge) { |
+ __ xori(result, result, 1); |
+ } |
+ } break; |
+ case gt: |
+ case le: { |
+ Register left = i.InputRegister(1); |
+ Operand right = i.InputOperand(0); |
+ __ Slt(result, left, right); |
+ if (cc == le) { |
+ __ xori(result, result, 1); |
+ } |
+ } break; |
+ case lo: |
+ case hs: { |
+ Register left = i.InputRegister(0); |
+ Operand right = i.InputOperand(1); |
+ __ Sltu(result, left, right); |
+ if (cc == hs) { |
+ __ xori(result, result, 1); |
+ } |
+ } break; |
+ case hi: |
+ case ls: { |
+ Register left = i.InputRegister(1); |
+ Operand right = i.InputOperand(0); |
+ __ Sltu(result, left, right); |
+ if (cc == ls) { |
+ __ xori(result, result, 1); |
+ } |
+ } break; |
+ default: |
+ UNREACHABLE(); |
+ } |
+ return; |
} else if (instr->arch_opcode() == kMips64CmpD || |
instr->arch_opcode() == kMips64CmpS) { |
FPURegister left = i.InputDoubleRegister(0); |
FPURegister right = i.InputDoubleRegister(1); |
- |
bool predicate; |
FPUCondition cc = FlagsConditionToConditionCmpFPU(predicate, condition); |
if (kArchVariant != kMips64r6) { |
@@ -1100,10 +1166,6 @@ void CodeGenerator::AssembleArchBoolean(Instruction* instr, |
TRACE_UNIMPL(); |
UNIMPLEMENTED(); |
} |
- // Fallthru case is the false materialization. |
- __ bind(&false_value); |
- __ li(result, Operand(static_cast<int64_t>(0))); |
- __ bind(&done); |
} |