| Index: src/compiler/interpreter-assembler.cc
|
| diff --git a/src/compiler/interpreter-assembler.cc b/src/compiler/interpreter-assembler.cc
|
| index 3f5cf9a71eb048182da1cc5675f65bccc8520dde..67ddf042b4df1e25708396c688ea8bffd3f3ae73 100644
|
| --- a/src/compiler/interpreter-assembler.cc
|
| +++ b/src/compiler/interpreter-assembler.cc
|
| @@ -316,11 +316,11 @@ Node* InterpreterAssembler::LoadTypeFeedbackVector() {
|
|
|
| Node* InterpreterAssembler::CallJS(Node* function, Node* first_arg,
|
| Node* arg_count) {
|
| - Callable builtin = CodeFactory::PushArgsAndCall(isolate());
|
| + Callable callable = CodeFactory::InterpreterPushArgsAndCall(isolate());
|
| CallDescriptor* descriptor = Linkage::GetStubCallDescriptor(
|
| - isolate(), zone(), builtin.descriptor(), 0, CallDescriptor::kNoFlags);
|
| + isolate(), zone(), callable.descriptor(), 0, CallDescriptor::kNoFlags);
|
|
|
| - Node* code_target = HeapConstant(builtin.code());
|
| + Node* code_target = HeapConstant(callable.code());
|
|
|
| Node** args = zone()->NewArray<Node*>(4);
|
| args[0] = arg_count;
|
| @@ -367,6 +367,33 @@ Node* InterpreterAssembler::CallIC(CallInterfaceDescriptor descriptor,
|
| }
|
|
|
|
|
| +Node* InterpreterAssembler::CallRuntime(Node* function_id, Node* first_arg,
|
| + Node* arg_count) {
|
| + Callable callable = CodeFactory::InterpreterCEntry(isolate());
|
| + CallDescriptor* descriptor = Linkage::GetStubCallDescriptor(
|
| + isolate(), zone(), callable.descriptor(), 0, CallDescriptor::kNoFlags);
|
| +
|
| + Node* code_target = HeapConstant(callable.code());
|
| +
|
| + // Get the function entry from the function id.
|
| + Node* function_table = raw_assembler_->ExternalConstant(
|
| + ExternalReference::runtime_function_table_address(isolate()));
|
| + Node* function_offset = raw_assembler_->Int32Mul(
|
| + function_id, Int32Constant(sizeof(Runtime::Function)));
|
| + Node* function = IntPtrAdd(function_table, function_offset);
|
| + Node* function_entry = raw_assembler_->Load(
|
| + kMachPtr, function, Int32Constant(offsetof(Runtime::Function, entry)));
|
| +
|
| + Node** args = zone()->NewArray<Node*>(4);
|
| + args[0] = arg_count;
|
| + args[1] = first_arg;
|
| + args[2] = function_entry;
|
| + args[3] = ContextTaggedPointer();
|
| +
|
| + return raw_assembler_->CallN(descriptor, code_target, args);
|
| +}
|
| +
|
| +
|
| Node* InterpreterAssembler::CallRuntime(Runtime::FunctionId function_id,
|
| Node* arg1) {
|
| return raw_assembler_->CallRuntime1(function_id, arg1,
|
|
|