Index: src/compiler/mips/instruction-selector-mips.cc |
diff --git a/src/compiler/mips/instruction-selector-mips.cc b/src/compiler/mips/instruction-selector-mips.cc |
index 5f64dbd16188b406d6e40c6960b56ccede1a2c67..afddd0a5089a2c2704e9285f5ef6fc4023054fd3 100644 |
--- a/src/compiler/mips/instruction-selector-mips.cc |
+++ b/src/compiler/mips/instruction-selector-mips.cc |
@@ -499,12 +499,11 @@ void InstructionSelector::VisitFloat64RoundTiesAway(Node* node) { |
} |
-void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, |
- CallMode call_mode) { |
+void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) { |
MipsOperandGenerator g(this); |
const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node); |
- FrameStateDescriptor* frame_state_descriptor = NULL; |
+ FrameStateDescriptor* frame_state_descriptor = nullptr; |
if (descriptor->NeedsFrameState()) { |
frame_state_descriptor = |
GetFrameStateDescriptor(node->InputAt(descriptor->InputCount())); |
@@ -529,21 +528,20 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, |
// Pass label of exception handler block. |
CallDescriptor::Flags flags = descriptor->flags(); |
- if (handler != nullptr) { |
+ if (handler) { |
flags |= CallDescriptor::kHasExceptionHandler; |
buffer.instruction_args.push_back(g.Label(handler)); |
} |
// Select the appropriate opcode based on the call type. |
- bool is_tail_call = call_mode == TAIL_CALL; |
InstructionCode opcode; |
switch (descriptor->kind()) { |
case CallDescriptor::kCallCodeObject: { |
- opcode = is_tail_call ? kArchTailCallCodeObject : kArchCallCodeObject; |
+ opcode = kArchCallCodeObject; |
break; |
} |
case CallDescriptor::kCallJSFunction: |
- opcode = is_tail_call ? kArchTailCallJSFunction : kArchCallJSFunction; |
+ opcode = kArchCallJSFunction; |
break; |
default: |
UNREACHABLE(); |
@@ -552,13 +550,96 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, |
opcode |= MiscField::encode(flags); |
// Emit the call instruction. |
- size_t size = is_tail_call ? 0 : buffer.outputs.size(); |
- InstructionOperand* first_output = |
- size > 0 ? &buffer.outputs.front() : nullptr; |
- Instruction* call_instr = |
- Emit(opcode, size, first_output, buffer.instruction_args.size(), |
- &buffer.instruction_args.front()); |
- call_instr->MarkAsCall(); |
+ size_t const output_count = buffer.outputs.size(); |
+ auto* outputs = output_count ? &buffer.outputs.front() : nullptr; |
+ Emit(opcode, output_count, outputs, buffer.instruction_args.size(), |
+ &buffer.instruction_args.front())->MarkAsCall(); |
+} |
+ |
+ |
+void InstructionSelector::VisitTailCall(Node* node) { |
+ MipsOperandGenerator g(this); |
+ const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node); |
+ DCHECK_NE(0, descriptor->flags() & CallDescriptor::kSupportsTailCalls); |
+ DCHECK_EQ(0, descriptor->flags() & CallDescriptor::kPatchableCallSite); |
+ DCHECK_EQ(0, descriptor->flags() & CallDescriptor::kNeedsNopAfterCall); |
+ |
+ // TODO(turbofan): Relax restriction for stack parameters. |
+ if (descriptor->UsesOnlyRegisters() && |
+ descriptor->HasSameReturnLocationsAs( |
+ linkage()->GetIncomingDescriptor())) { |
+ CallBuffer buffer(zone(), descriptor, nullptr); |
+ |
+ // Compute InstructionOperands for inputs and outputs. |
+ InitializeCallBuffer(node, &buffer, true, false); |
+ |
+ DCHECK_EQ(0u, buffer.pushed_nodes.size()); |
+ |
+ // Select the appropriate opcode based on the call type. |
+ InstructionCode opcode; |
+ switch (descriptor->kind()) { |
+ case CallDescriptor::kCallCodeObject: |
+ opcode = kArchTailCallCodeObject; |
+ break; |
+ case CallDescriptor::kCallJSFunction: |
+ opcode = kArchTailCallJSFunction; |
+ break; |
+ default: |
+ UNREACHABLE(); |
+ return; |
+ } |
+ opcode |= MiscField::encode(descriptor->flags()); |
+ |
+ // Emit the tailcall instruction. |
+ Emit(opcode, 0, nullptr, buffer.instruction_args.size(), |
+ &buffer.instruction_args.front()); |
+ } else { |
+ FrameStateDescriptor* frame_state_descriptor = |
+ descriptor->NeedsFrameState() |
+ ? GetFrameStateDescriptor( |
+ node->InputAt(static_cast<int>(descriptor->InputCount()))) |
+ : nullptr; |
+ |
+ CallBuffer buffer(zone(), descriptor, frame_state_descriptor); |
+ |
+ // Compute InstructionOperands for inputs and outputs. |
+ InitializeCallBuffer(node, &buffer, true, false); |
+ // Possibly align stack here for functions. |
+ int push_count = buffer.pushed_nodes.size(); |
+ if (push_count > 0) { |
+ Emit(kMipsStackClaim, g.NoOutput(), |
+ g.TempImmediate(push_count << kPointerSizeLog2)); |
+ } |
+ int slot = buffer.pushed_nodes.size() - 1; |
+ for (Node* node : base::Reversed(buffer.pushed_nodes)) { |
+ Emit(kMipsStoreToStackSlot, g.NoOutput(), g.UseRegister(node), |
+ g.TempImmediate(slot << kPointerSizeLog2)); |
+ slot--; |
+ } |
+ |
+ // Select the appropriate opcode based on the call type. |
+ InstructionCode opcode; |
+ switch (descriptor->kind()) { |
+ case CallDescriptor::kCallCodeObject: { |
+ opcode = kArchCallCodeObject; |
+ break; |
+ } |
+ case CallDescriptor::kCallJSFunction: |
+ opcode = kArchCallJSFunction; |
+ break; |
+ default: |
+ UNREACHABLE(); |
+ return; |
+ } |
+ opcode |= MiscField::encode(descriptor->flags()); |
+ |
+ // Emit the call instruction. |
+ size_t const output_count = buffer.outputs.size(); |
+ auto* outputs = output_count ? &buffer.outputs.front() : nullptr; |
+ Emit(opcode, output_count, outputs, buffer.instruction_args.size(), |
+ &buffer.instruction_args.front())->MarkAsCall(); |
+ Emit(kArchRet, 0, nullptr, output_count, outputs); |
+ } |
} |