| 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 48ef0337f2732ee9050af7f3cf4a7b3021bf39df..73ed10a3562e2cec35ad9bfea2b6a2dbe204b0c1 100644
|
| --- a/src/compiler/mips/code-generator-mips.cc
|
| +++ b/src/compiler/mips/code-generator-mips.cc
|
| @@ -542,6 +542,45 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| }
|
| break;
|
|
|
| + case kMipsCmpS:
|
| + // Psuedo-instruction used for FP cmp/branch. No opcode emitted here.
|
| + break;
|
| + case kMipsAddS:
|
| + // TODO(plind): add special case: combine mult & add.
|
| + __ add_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| + break;
|
| + case kMipsSubS:
|
| + __ sub_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| + break;
|
| + case kMipsMulS:
|
| + // TODO(plind): add special case: right op is -1.0, see arm port.
|
| + __ mul_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| + break;
|
| + case kMipsDivS:
|
| + __ div_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| + break;
|
| + case kMipsModS: {
|
| + // TODO(bmeurer): We should really get rid of this special instruction,
|
| + // and generate a CallAddress instruction instead.
|
| + FrameScope scope(masm(), StackFrame::MANUAL);
|
| + __ PrepareCallCFunction(0, 2, kScratchReg);
|
| + __ MovToFloatParameters(i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| + // TODO(balazs.kilvady): implement mod_two_floats_operation(isolate())
|
| + __ CallCFunction(ExternalReference::mod_two_doubles_operation(isolate()),
|
| + 0, 2);
|
| + // Move the result in the double result register.
|
| + __ MovFromFloatResult(i.OutputSingleRegister());
|
| + break;
|
| + }
|
| + case kMipsSqrtS: {
|
| + __ sqrt_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
|
| + break;
|
| + }
|
| case kMipsCmpD:
|
| // Psuedo-instruction used for FP cmp/branch. No opcode emitted here.
|
| break;
|
| @@ -576,6 +615,10 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| __ MovFromFloatResult(i.OutputDoubleRegister());
|
| break;
|
| }
|
| + case kMipsSqrtD: {
|
| + __ sqrt_d(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
|
| + break;
|
| + }
|
| case kMipsFloat64RoundDown: {
|
| ASSEMBLE_ROUND_DOUBLE_TO_DOUBLE(floor_l_d, Floor);
|
| break;
|
| @@ -588,10 +631,6 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| ASSEMBLE_ROUND_DOUBLE_TO_DOUBLE(ceil_l_d, Ceil);
|
| break;
|
| }
|
| - case kMipsSqrtD: {
|
| - __ sqrt_d(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
|
| - break;
|
| - }
|
| case kMipsCvtSD: {
|
| __ cvt_s_d(i.OutputSingleRegister(), i.InputDoubleRegister(0));
|
| break;
|
| @@ -781,6 +820,41 @@ void CodeGenerator::AssembleArchBranch(Instruction* instr, BranchInfo* branch) {
|
|
|
| if (!branch->fallthru) __ Branch(flabel); // no fallthru to flabel.
|
|
|
| + } else if (instr->arch_opcode() == kMipsCmpS) {
|
| + // TODO(dusmil) optimize unordered checks to use fewer instructions
|
| + // even if we have to unfold BranchF macro.
|
| + Label* nan = flabel;
|
| + switch (branch->condition) {
|
| + case kEqual:
|
| + cc = eq;
|
| + break;
|
| + case kNotEqual:
|
| + cc = ne;
|
| + nan = tlabel;
|
| + break;
|
| + case kUnsignedLessThan:
|
| + cc = lt;
|
| + break;
|
| + case kUnsignedGreaterThanOrEqual:
|
| + cc = ge;
|
| + nan = tlabel;
|
| + break;
|
| + case kUnsignedLessThanOrEqual:
|
| + cc = le;
|
| + break;
|
| + case kUnsignedGreaterThan:
|
| + cc = gt;
|
| + nan = tlabel;
|
| + break;
|
| + default:
|
| + UNSUPPORTED_COND(kMipsCmpS, branch->condition);
|
| + break;
|
| + }
|
| + __ BranchFS(tlabel, nan, cc, i.InputDoubleRegister(0),
|
| + i.InputDoubleRegister(1));
|
| +
|
| + if (!branch->fallthru) __ Branch(flabel); // no fallthru to flabel.
|
| +
|
| } else if (instr->arch_opcode() == kMipsCmpD) {
|
| // TODO(dusmil) optimize unordered checks to use fewer instructions
|
| // even if we have to unfold BranchF macro.
|
|
|