| Index: src/mips/code-stubs-mips.cc
|
| diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
|
| index 1698c6ccb4d37c0ef2b066137a752cb88d782853..54f9492ff2e4fda3659d5b8e78adbf5c17651090 100644
|
| --- a/src/mips/code-stubs-mips.cc
|
| +++ b/src/mips/code-stubs-mips.cc
|
| @@ -362,6 +362,56 @@ void NewStringAddStub::InitializeInterfaceDescriptor(
|
| }
|
|
|
|
|
| +void CallDescriptors::InitializeForIsolate(Isolate* isolate) {
|
| + {
|
| + CallInterfaceDescriptor* descriptor =
|
| + isolate->call_descriptor(Isolate::ArgumentAdaptorCall);
|
| + static Register registers[] = { a1, // JSFunction
|
| + cp, // context
|
| + a0, // actual number of arguments
|
| + a2, // expected number of arguments
|
| + };
|
| + static Representation representations[] = {
|
| + Representation::Tagged(), // JSFunction
|
| + Representation::Tagged(), // context
|
| + Representation::Integer32(), // actual number of arguments
|
| + Representation::Integer32(), // expected number of arguments
|
| + };
|
| + descriptor->register_param_count_ = 4;
|
| + descriptor->register_params_ = registers;
|
| + descriptor->param_representations_ = representations;
|
| + }
|
| + {
|
| + CallInterfaceDescriptor* descriptor =
|
| + isolate->call_descriptor(Isolate::KeyedCall);
|
| + static Register registers[] = { cp, // context
|
| + a2, // key
|
| + };
|
| + static Representation representations[] = {
|
| + Representation::Tagged(), // context
|
| + Representation::Tagged(), // key
|
| + };
|
| + descriptor->register_param_count_ = 2;
|
| + descriptor->register_params_ = registers;
|
| + descriptor->param_representations_ = representations;
|
| + }
|
| + {
|
| + CallInterfaceDescriptor* descriptor =
|
| + isolate->call_descriptor(Isolate::NamedCall);
|
| + static Register registers[] = { cp, // context
|
| + a2, // name
|
| + };
|
| + static Representation representations[] = {
|
| + Representation::Tagged(), // context
|
| + Representation::Tagged(), // name
|
| + };
|
| + descriptor->register_param_count_ = 2;
|
| + descriptor->register_params_ = registers;
|
| + descriptor->param_representations_ = representations;
|
| + }
|
| +}
|
| +
|
| +
|
| #define __ ACCESS_MASM(masm)
|
|
|
|
|
| @@ -3362,7 +3412,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| __ push(a1); // Put proxy as additional argument.
|
| __ li(a0, Operand(argc_ + 1, RelocInfo::NONE32));
|
| __ li(a2, Operand(0, RelocInfo::NONE32));
|
| - __ GetBuiltinEntry(a3, Builtins::CALL_FUNCTION_PROXY);
|
| + __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY);
|
| {
|
| Handle<Code> adaptor =
|
| masm->isolate()->builtins()->ArgumentsAdaptorTrampoline();
|
| @@ -3375,7 +3425,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| __ sw(a1, MemOperand(sp, argc_ * kPointerSize));
|
| __ li(a0, Operand(argc_)); // Set up the number of arguments.
|
| __ mov(a2, zero_reg);
|
| - __ GetBuiltinEntry(a3, Builtins::CALL_NON_FUNCTION);
|
| + __ GetBuiltinFunction(a1, Builtins::CALL_NON_FUNCTION);
|
| __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| RelocInfo::CODE_TARGET);
|
| }
|
| @@ -3411,11 +3461,11 @@ void CallConstructStub::Generate(MacroAssembler* masm) {
|
| Label do_call;
|
| __ bind(&slow);
|
| __ Branch(&non_function_call, ne, a3, Operand(JS_FUNCTION_PROXY_TYPE));
|
| - __ GetBuiltinEntry(a3, Builtins::CALL_FUNCTION_PROXY_AS_CONSTRUCTOR);
|
| + __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY_AS_CONSTRUCTOR);
|
| __ jmp(&do_call);
|
|
|
| __ bind(&non_function_call);
|
| - __ GetBuiltinEntry(a3, Builtins::CALL_NON_FUNCTION_AS_CONSTRUCTOR);
|
| + __ GetBuiltinFunction(a1, Builtins::CALL_NON_FUNCTION_AS_CONSTRUCTOR);
|
| __ bind(&do_call);
|
| // Set expected number of arguments to zero (not changing r0).
|
| __ li(a2, Operand(0, RelocInfo::NONE32));
|
|
|