Index: src/mips64/builtins-mips64.cc |
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc |
index 35d9092d5e746aedff3b97cc16a9407152fa3e26..700112fa60196881bfb5f762d54cd305f025789f 100644 |
--- a/src/mips64/builtins-mips64.cc |
+++ b/src/mips64/builtins-mips64.cc |
@@ -71,30 +71,15 @@ void Builtins::Generate_Adaptor(MacroAssembler* masm, |
// Load the built-in InternalArray function from the current context. |
static void GenerateLoadInternalArrayFunction(MacroAssembler* masm, |
Register result) { |
- // Load the native context. |
- |
- __ ld(result, |
- MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
- __ ld(result, FieldMemOperand(result, JSGlobalObject::kNativeContextOffset)); |
// Load the InternalArray function from the native context. |
- __ ld(result, |
- MemOperand(result, |
- Context::SlotOffset( |
- Context::INTERNAL_ARRAY_FUNCTION_INDEX))); |
+ __ LoadNativeContextSlot(Context::INTERNAL_ARRAY_FUNCTION_INDEX, result); |
} |
// Load the built-in Array function from the current context. |
static void GenerateLoadArrayFunction(MacroAssembler* masm, Register result) { |
- // Load the native context. |
- |
- __ ld(result, |
- MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
- __ ld(result, FieldMemOperand(result, JSGlobalObject::kNativeContextOffset)); |
// Load the Array function from the native context. |
- __ ld(result, |
- MemOperand(result, |
- Context::SlotOffset(Context::ARRAY_FUNCTION_INDEX))); |
+ __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, result); |
} |
@@ -1743,7 +1728,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) { |
__ daddu(at, sp, at); |
__ sd(a1, MemOperand(at)); |
// Let the "call_as_function_delegate" take care of the rest. |
- __ LoadGlobalFunction(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, a1); |
+ __ LoadNativeContextSlot(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, a1); |
__ Jump(masm->isolate()->builtins()->CallFunction( |
ConvertReceiverMode::kNotNullOrUndefined), |
RelocInfo::CODE_TARGET); |
@@ -1827,7 +1812,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
__ daddu(at, sp, at); |
__ sd(a1, MemOperand(at)); |
// Let the "call_as_constructor_delegate" take care of the rest. |
- __ LoadGlobalFunction(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, a1); |
+ __ LoadNativeContextSlot(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, a1); |
__ Jump(masm->isolate()->builtins()->CallFunction(), |
RelocInfo::CODE_TARGET); |
} |