Index: src/mips64/code-stubs-mips64.cc |
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc |
index 70bd5d81f829b2262695d4f71171653fcba9d9e1..3c53d3651bec9f9020afb1a0972826d1658162e1 100644 |
--- a/src/mips64/code-stubs-mips64.cc |
+++ b/src/mips64/code-stubs-mips64.cc |
@@ -724,12 +724,13 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) { |
if (cc == eq && strict()) { |
__ TailCallRuntime(Runtime::kStrictEquals, 2, 1); |
} else { |
- Builtins::JavaScript native; |
+ int context_index; |
if (cc == eq) { |
- native = Builtins::EQUALS; |
+ context_index = Context::EQUALS_BUILTIN_INDEX; |
} else { |
- native = |
- is_strong(strength()) ? Builtins::COMPARE_STRONG : Builtins::COMPARE; |
+ context_index = is_strong(strength()) |
+ ? Context::COMPARE_STRONG_BUILTIN_INDEX |
+ : Context::COMPARE_BUILTIN_INDEX; |
int ncr; // NaN compare result. |
if (cc == lt || cc == le) { |
ncr = GREATER; |
@@ -743,7 +744,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) { |
// Call the native; it returns -1 (less), 0 (equal), or 1 (greater) |
// tagged as a small integer. |
- __ InvokeBuiltin(native, JUMP_FUNCTION); |
+ __ InvokeBuiltin(context_index, JUMP_FUNCTION); |
} |
__ bind(&miss); |
@@ -2597,7 +2598,7 @@ static void EmitSlowCase(MacroAssembler* masm, |
__ push(a1); // put proxy as additional argument |
__ li(a0, Operand(argc + 1, RelocInfo::NONE32)); |
__ mov(a2, zero_reg); |
- __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY); |
+ __ GetBuiltinFunction(a1, Context::CALL_FUNCTION_PROXY_BUILTIN_INDEX); |
{ |
Handle<Code> adaptor = |
masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(); |
@@ -2610,7 +2611,7 @@ static void EmitSlowCase(MacroAssembler* masm, |
__ sd(a1, MemOperand(sp, argc * kPointerSize)); |
__ li(a0, Operand(argc)); // Set up the number of arguments. |
__ mov(a2, zero_reg); |
- __ GetBuiltinFunction(a1, Builtins::CALL_NON_FUNCTION); |
+ __ GetBuiltinFunction(a1, Context::CALL_NON_FUNCTION_BUILTIN_INDEX); |
__ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(), |
RelocInfo::CODE_TARGET); |
} |
@@ -2747,11 +2748,13 @@ void CallConstructStub::Generate(MacroAssembler* masm) { |
Label do_call; |
__ bind(&slow); |
__ Branch(&non_function_call, ne, a5, Operand(JS_FUNCTION_PROXY_TYPE)); |
- __ GetBuiltinFunction(a1, Builtins::CALL_FUNCTION_PROXY_AS_CONSTRUCTOR); |
+ __ GetBuiltinFunction( |
+ a1, Context::CALL_FUNCTION_PROXY_AS_CONSTRUCTOR_BUILTIN_INDEX); |
__ jmp(&do_call); |
__ bind(&non_function_call); |
- __ GetBuiltinFunction(a1, Builtins::CALL_NON_FUNCTION_AS_CONSTRUCTOR); |
+ __ GetBuiltinFunction( |
+ a1, Context::CALL_NON_FUNCTION_AS_CONSTRUCTOR_BUILTIN_INDEX); |
__ bind(&do_call); |
// Set expected number of arguments to zero (not changing r0). |
__ li(a2, Operand(0, RelocInfo::NONE32)); |
@@ -3442,7 +3445,7 @@ void ToNumberStub::Generate(MacroAssembler* masm) { |
__ bind(¬_oddball); |
__ push(a0); // Push argument. |
- __ InvokeBuiltin(Builtins::TO_NUMBER, JUMP_FUNCTION); |
+ __ InvokeBuiltin(Context::TO_NUMBER_BUILTIN_INDEX, JUMP_FUNCTION); |
} |