Index: src/ppc/builtins-ppc.cc |
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc |
index f50060443bbfd7b4569a4e91cfc6099f8fce95bc..99f19b8b3e5d005ae94b3a54564df866447c0622 100644 |
--- a/src/ppc/builtins-ppc.cc |
+++ b/src/ppc/builtins-ppc.cc |
@@ -234,7 +234,7 @@ void Builtins::Generate_StringConstructCode(MacroAssembler* masm) { |
{ |
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL); |
__ push(r3); |
- __ InvokeBuiltin(Builtins::TO_STRING, CALL_FUNCTION); |
+ __ InvokeBuiltin(Context::TO_STRING_BUILTIN_INDEX, CALL_FUNCTION); |
} |
__ pop(function); |
__ mr(argument, r3); |
@@ -760,7 +760,7 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm, |
__ SmiTag(argc); |
} |
__ Push(r4, 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) { |
__ LoadRoot(r0, Heap::kRealStackLimitRootIndex); |
__ cmp(r6, r0); |
__ bge(&ok); |
- __ 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. |
@@ -1431,12 +1431,12 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) { |
__ push(r4); // re-add proxy object as additional argument |
__ addi(r3, r3, Operand(1)); |
- __ GetBuiltinFunction(r4, Builtins::CALL_FUNCTION_PROXY); |
+ __ GetBuiltinFunction(r4, Context::CALL_FUNCTION_PROXY_BUILTIN_INDEX); |
__ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(), |
RelocInfo::CODE_TARGET); |
__ bind(&non_proxy); |
- __ GetBuiltinFunction(r4, Builtins::CALL_NON_FUNCTION); |
+ __ GetBuiltinFunction(r4, Context::CALL_NON_FUNCTION_BUILTIN_INDEX); |
__ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(), |
RelocInfo::CODE_TARGET); |
__ bind(&function); |
@@ -1527,9 +1527,10 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
__ LoadP(r3, MemOperand(fp, kArgumentsOffset)); // get the args array |
__ push(r3); |
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); |
} |
Generate_CheckStackOverflow(masm, kFunctionOffset, r3, kArgcIsSmiTagged); |
@@ -1630,7 +1631,7 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
__ push(r4); // add function proxy as last argument |
__ addi(r3, r3, Operand(1)); |
__ li(r5, Operand::Zero()); |
- __ GetBuiltinFunction(r4, Builtins::CALL_FUNCTION_PROXY); |
+ __ GetBuiltinFunction(r4, Context::CALL_FUNCTION_PROXY_BUILTIN_INDEX); |
__ Call(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(), |
RelocInfo::CODE_TARGET); |
@@ -1667,7 +1668,8 @@ static void Generate_ConstructHelper(MacroAssembler* masm) { |
__ push(r3); |
__ LoadP(r3, MemOperand(fp, kNewTargetOffset)); // get the new.target |
__ push(r3); |
- __ InvokeBuiltin(Builtins::REFLECT_CONSTRUCT_PREPARE, CALL_FUNCTION); |
+ __ InvokeBuiltin(Context::REFLECT_CONSTRUCT_PREPARE_BUILTIN_INDEX, |
+ CALL_FUNCTION); |
Generate_CheckStackOverflow(masm, kFunctionOffset, r3, kArgcIsSmiTagged); |
@@ -1917,7 +1919,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); |
__ bkpt(0); |
} |
} |