Index: src/compiler/mips/code-generator-mips.cc |
diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc |
index be741932d9bf902490c4751016e798a3430ac843..e415f88734e3f54e6c7c4bede5d9ac24dd0ca7af 100644 |
--- a/src/compiler/mips/code-generator-mips.cc |
+++ b/src/compiler/mips/code-generator-mips.cc |
@@ -201,32 +201,45 @@ class OutOfLineCeil final : public OutOfLineRound { |
}; |
-Condition FlagsConditionToConditionCmp(FlagsCondition condition) { |
+Condition FlagsConditionToConditionCmp(bool& predicate, |
+ FlagsCondition condition) { |
switch (condition) { |
case kEqual: |
+ predicate = true; |
return eq; |
case kNotEqual: |
+ predicate = false; |
return ne; |
case kSignedLessThan: |
+ predicate = true; |
return lt; |
case kSignedGreaterThanOrEqual: |
+ predicate = false; |
return ge; |
case kSignedLessThanOrEqual: |
+ predicate = false; |
return le; |
case kSignedGreaterThan: |
+ predicate = true; |
return gt; |
case kUnsignedLessThan: |
+ predicate = true; |
return lo; |
case kUnsignedGreaterThanOrEqual: |
+ predicate = false; |
return hs; |
case kUnsignedLessThanOrEqual: |
+ predicate = false; |
return ls; |
case kUnsignedGreaterThan: |
+ predicate = true; |
return hi; |
case kUnorderedEqual: |
case kUnorderedNotEqual: |
+ predicate = true; |
break; |
default: |
+ predicate = true; |
break; |
} |
UNREACHABLE(); |
@@ -234,13 +247,17 @@ Condition FlagsConditionToConditionCmp(FlagsCondition condition) { |
} |
-Condition FlagsConditionToConditionTst(FlagsCondition condition) { |
+Condition FlagsConditionToConditionTst(bool& predicate, |
+ FlagsCondition condition) { |
switch (condition) { |
case kNotEqual: |
+ predicate = false; |
return ne; |
case kEqual: |
+ predicate = true; |
return eq; |
default: |
+ predicate = true; |
break; |
} |
UNREACHABLE(); |
@@ -248,13 +265,17 @@ Condition FlagsConditionToConditionTst(FlagsCondition condition) { |
} |
-Condition FlagsConditionToConditionOvf(FlagsCondition condition) { |
+Condition FlagsConditionToConditionOvf(bool& predicate, |
+ FlagsCondition condition) { |
switch (condition) { |
case kOverflow: |
+ predicate = true; |
return lt; |
case kNotOverflow: |
+ predicate = false; |
return ge; |
default: |
+ predicate = true; |
break; |
} |
UNREACHABLE(); |
@@ -904,7 +925,7 @@ void CodeGenerator::AssembleArchBranch(Instruction* instr, BranchInfo* branch) { |
Label* tlabel = branch->true_label; |
Label* flabel = branch->false_label; |
Condition cc = kNoCondition; |
- |
+ bool predicate; |
// 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 handled here by branch |
@@ -915,16 +936,16 @@ void CodeGenerator::AssembleArchBranch(Instruction* instr, BranchInfo* branch) { |
// not separated by other instructions. |
if (instr->arch_opcode() == kMipsTst) { |
- cc = FlagsConditionToConditionTst(branch->condition); |
+ cc = FlagsConditionToConditionTst(predicate, branch->condition); |
__ And(at, i.InputRegister(0), i.InputOperand(1)); |
__ Branch(tlabel, cc, at, Operand(zero_reg)); |
} else if (instr->arch_opcode() == kMipsAddOvf || |
instr->arch_opcode() == kMipsSubOvf) { |
// kMipsAddOvf, SubOvf emit negative result to 'kCompareReg' on overflow. |
- cc = FlagsConditionToConditionOvf(branch->condition); |
+ cc = FlagsConditionToConditionOvf(predicate, branch->condition); |
__ Branch(tlabel, cc, kCompareReg, Operand(zero_reg)); |
} else if (instr->arch_opcode() == kMipsCmp) { |
- cc = FlagsConditionToConditionCmp(branch->condition); |
+ cc = FlagsConditionToConditionCmp(predicate, branch->condition); |
__ Branch(tlabel, cc, i.InputRegister(0), i.InputOperand(1)); |
} else if (instr->arch_opcode() == kMipsCmpS) { |
if (!convertCondition(branch->condition, cc)) { |
@@ -964,41 +985,108 @@ void CodeGenerator::AssembleArchBoolean(Instruction* instr, |
DCHECK_NE(0u, instr->OutputCount()); |
Register result = i.OutputRegister(instr->OutputCount() - 1); |
Condition cc = kNoCondition; |
- |
+ bool predicate; |
// 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 checked and handled here. |
- // For materializations, we use delay slot to set the result true, and |
- // in the false case, where we fall thru the branch, we reset the result |
- // false. |
- |
if (instr->arch_opcode() == kMipsTst) { |
- 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. |
- |
+ cc = FlagsConditionToConditionTst(predicate, condition); |
+ __ And(kScratchReg, i.InputRegister(0), i.InputOperand(1)); |
+ if (IsMipsArchVariant(kMips32r6)) { |
+ __ li(kScratchReg2, 1); // Create 1 for true. |
+ if (cc == eq) { |
+ __ seleqz(result, kScratchReg2, kScratchReg); |
+ } else { |
+ __ selnez(result, kScratchReg2, kScratchReg); |
+ } |
+ } else { |
+ __ li(result, 1); |
+ if (cc == eq) { |
+ __ Movn(result, zero_reg, kScratchReg); |
+ } else { |
+ __ Movz(result, zero_reg, kScratchReg); |
+ } |
+ } |
+ return; |
} else if (instr->arch_opcode() == kMipsAddOvf || |
instr->arch_opcode() == kMipsSubOvf) { |
// kMipsAddOvf, SubOvf emits negative result to 'kCompareReg' on overflow. |
- cc = FlagsConditionToConditionOvf(condition); |
- __ Branch(USE_DELAY_SLOT, &done, cc, kCompareReg, Operand(zero_reg)); |
- __ li(result, Operand(1)); // In delay slot. |
- |
+ cc = FlagsConditionToConditionOvf(predicate, condition); |
+ // Return 1 on overflow. |
+ __ Slt(result, kCompareReg, Operand(zero_reg)); |
+ if (cc == ne) // Invert result on not overflow. |
+ __ xori(result, result, 1); |
+ return; |
} else if (instr->arch_opcode() == kMipsCmp) { |
- 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. |
- |
+ cc = FlagsConditionToConditionCmp(predicate, condition); |
+ switch (cc) { |
+ case eq: |
+ case ne: { |
+ Register left = i.InputRegister(0); |
+ Operand right = i.InputOperand(1); |
+ __ Subu(kScratchReg, left, right); |
+ if (IsMipsArchVariant(kMips32r6)) { |
+ __ li(kScratchReg2, 1); |
+ if (cc == eq) { |
+ __ seleqz(result, kScratchReg2, kScratchReg); |
+ } else { |
+ __ selnez(result, kScratchReg2, kScratchReg); |
+ } |
+ } else { |
+ __ li(result, 1); |
+ 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() == kMipsCmpD || |
instr->arch_opcode() == kMipsCmpS) { |
FPURegister left = i.InputDoubleRegister(0); |
FPURegister right = i.InputDoubleRegister(1); |
- bool predicate; |
FPUCondition cc = FlagsConditionToConditionCmpFPU(predicate, condition); |
if (!IsMipsArchVariant(kMips32r6)) { |
__ li(result, Operand(1)); |
@@ -1032,11 +1120,6 @@ void CodeGenerator::AssembleArchBoolean(Instruction* instr, |
TRACE_UNIMPL(); |
UNIMPLEMENTED(); |
} |
- |
- // Fallthrough case is the false materialization. |
- __ bind(&false_value); |
- __ li(result, Operand(0)); |
- __ bind(&done); |
} |