| Index: src/mips64/builtins-mips64.cc
|
| diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc
|
| index 843daa1ee5cfb495a0c0bb9c280e022e714ff6af..85ba4cb4aa0fc9b729f5de31d4800d163c3dbc58 100644
|
| --- a/src/mips64/builtins-mips64.cc
|
| +++ b/src/mips64/builtins-mips64.cc
|
| @@ -240,7 +240,7 @@ void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
|
| {
|
| FrameScope scope(masm, StackFrame::INTERNAL);
|
| __ push(a0);
|
| - __ InvokeBuiltin(Builtins::TO_STRING, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::TO_STRING_BUILTIN_INDEX, CALL_FUNCTION);
|
| }
|
| __ pop(function);
|
| __ mov(argument, v0);
|
| @@ -762,7 +762,7 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm,
|
| __ SmiTag(argc);
|
| }
|
| __ Push(a1, argc);
|
| - __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::STACK_OVERFLOW_BUILTIN_INDEX, CALL_FUNCTION);
|
|
|
| __ bind(&okay);
|
| }
|
| @@ -909,7 +909,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| __ Dsubu(a5, sp, Operand(a4));
|
| __ LoadRoot(a2, Heap::kRealStackLimitRootIndex);
|
| __ Branch(&ok, hs, a5, Operand(a2));
|
| - __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::STACK_OVERFLOW_BUILTIN_INDEX, CALL_FUNCTION);
|
| __ bind(&ok);
|
|
|
| // If ok, push undefined as the initial value for all register file entries.
|
| @@ -1396,12 +1396,12 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
|
|
| __ push(a1); // Re-add proxy object as additional argument.
|
| __ Daddu(a0, a0, Operand(1));
|
| - __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY);
|
| + __ GetBuiltinFunction(a1, Context::CALL_FUNCTION_PROXY_BUILTIN_INDEX);
|
| __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| RelocInfo::CODE_TARGET);
|
|
|
| __ bind(&non_proxy);
|
| - __ GetBuiltinFunction(a1, Builtins::CALL_NON_FUNCTION);
|
| + __ GetBuiltinFunction(a1, Context::CALL_NON_FUNCTION_BUILTIN_INDEX);
|
| __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| RelocInfo::CODE_TARGET);
|
| __ bind(&function);
|
| @@ -1493,9 +1493,10 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) {
|
|
|
| // Returns (in v0) number of arguments to copy to stack as Smi.
|
| if (targetIsArgument) {
|
| - __ InvokeBuiltin(Builtins::REFLECT_APPLY_PREPARE, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::REFLECT_APPLY_PREPARE_BUILTIN_INDEX,
|
| + CALL_FUNCTION);
|
| } else {
|
| - __ InvokeBuiltin(Builtins::APPLY_PREPARE, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::APPLY_PREPARE_BUILTIN_INDEX, CALL_FUNCTION);
|
| }
|
|
|
| // Returns the result in v0.
|
| @@ -1587,7 +1588,7 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) {
|
| __ push(a1); // Add function proxy as last argument.
|
| __ Daddu(a0, a0, Operand(1));
|
| __ li(a2, Operand(0, RelocInfo::NONE32));
|
| - __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY);
|
| + __ GetBuiltinFunction(a1, Context::CALL_FUNCTION_PROXY_BUILTIN_INDEX);
|
| __ Call(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| RelocInfo::CODE_TARGET);
|
| // Tear down the internal frame and remove function, receiver and args.
|
| @@ -1625,7 +1626,8 @@ static void Generate_ConstructHelper(MacroAssembler* masm) {
|
| __ ld(a0, MemOperand(fp, kNewTargetOffset)); // get the new.target
|
| __ push(a0);
|
| // Returns argument count in v0.
|
| - __ InvokeBuiltin(Builtins::REFLECT_CONSTRUCT_PREPARE, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::REFLECT_CONSTRUCT_PREPARE_BUILTIN_INDEX,
|
| + CALL_FUNCTION);
|
|
|
| // Returns result in v0.
|
| Generate_CheckStackOverflow(masm, kFunctionOffset, v0, kArgcIsSmiTagged);
|
| @@ -1869,7 +1871,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
| {
|
| FrameScope frame(masm, StackFrame::MANUAL);
|
| EnterArgumentsAdaptorFrame(masm);
|
| - __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
|
| + __ InvokeBuiltin(Context::STACK_OVERFLOW_BUILTIN_INDEX, CALL_FUNCTION);
|
| __ break_(0xCC);
|
| }
|
| }
|
|
|