Index: src/mips/builtins-mips.cc |
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc |
index 44acfb99a1ca9a8b95ea48f2719fed59979b08bd..a05c2e43c02456c179e2e550924a4066c1c18551 100644 |
--- a/src/mips/builtins-mips.cc |
+++ b/src/mips/builtins-mips.cc |
@@ -242,7 +242,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); |
@@ -763,7 +763,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); |
} |
@@ -912,7 +912,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
__ Subu(t1, sp, Operand(t0)); |
__ LoadRoot(a2, Heap::kRealStackLimitRootIndex); |
__ Branch(&ok, hs, t1, 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. |
@@ -1401,12 +1401,12 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) { |
__ push(a1); // Re-add proxy object as additional argument. |
__ Addu(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); |
@@ -1496,9 +1496,10 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
__ push(a0); |
// 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. |
@@ -1590,7 +1591,7 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
__ push(a1); // Add function proxy as last argument. |
__ Addu(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. |
@@ -1628,7 +1629,8 @@ static void Generate_ConstructHelper(MacroAssembler* masm) { |
__ lw(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); |
@@ -1871,7 +1873,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); |
} |
} |