Index: src/mips64/code-stubs-mips64.cc |
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc |
index 9a239b213e245fdf14c84ca9b0d6dcb81e6fc54b..2dda3deab434a2b260c255373d0a193d5a7a9e37 100644 |
--- a/src/mips64/code-stubs-mips64.cc |
+++ b/src/mips64/code-stubs-mips64.cc |
@@ -5717,36 +5717,16 @@ |
void CallApiGetterStub::Generate(MacroAssembler* masm) { |
- // Build v8::PropertyCallbackInfo::args_ array on the stack and push property |
- // name below the exit frame to make GC aware of them. |
- STATIC_ASSERT(PropertyCallbackArguments::kShouldThrowOnErrorIndex == 0); |
- STATIC_ASSERT(PropertyCallbackArguments::kHolderIndex == 1); |
- STATIC_ASSERT(PropertyCallbackArguments::kIsolateIndex == 2); |
- STATIC_ASSERT(PropertyCallbackArguments::kReturnValueDefaultValueIndex == 3); |
- STATIC_ASSERT(PropertyCallbackArguments::kReturnValueOffset == 4); |
- STATIC_ASSERT(PropertyCallbackArguments::kDataIndex == 5); |
- STATIC_ASSERT(PropertyCallbackArguments::kThisIndex == 6); |
- STATIC_ASSERT(PropertyCallbackArguments::kArgsLength == 7); |
- |
- Register receiver = ApiGetterDescriptor::ReceiverRegister(); |
- Register holder = ApiGetterDescriptor::HolderRegister(); |
- Register callback = ApiGetterDescriptor::CallbackRegister(); |
- Register scratch = a4; |
- Register scratch2 = a5; |
- Register scratch3 = a6; |
- DCHECK(!AreAliased(receiver, holder, callback, scratch, scratch2, scratch3)); |
- |
- Register api_function_address = a2; |
- |
- __ Push(receiver); |
- // Push data from AccessorInfo. |
- __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex); |
- __ li(scratch2, Operand(ExternalReference::isolate_address(isolate()))); |
- __ ld(scratch3, FieldMemOperand(callback, AccessorInfo::kDataOffset)); |
- __ Push(scratch3, scratch, scratch, scratch2, holder); |
- __ Push(Smi::FromInt(0)); // should_throw_on_error -> false |
- __ ld(scratch, FieldMemOperand(callback, AccessorInfo::kNameOffset)); |
- __ Push(scratch); |
+ // ----------- S t a t e ------------- |
+ // -- sp[0] : name |
+ // -- sp[8 .. (8 + kArgsLength*8)] : v8::PropertyCallbackInfo::args_ |
+ // -- ... |
+ // -- a2 : api_function_address |
+ // ----------------------------------- |
+ |
+ Register api_function_address = ApiGetterDescriptor::function_address(); |
+ DCHECK(api_function_address.is(a2)); |
+ |
// v8::PropertyCallbackInfo::args_ array and name handle. |
const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1; |
@@ -5766,10 +5746,6 @@ |
ExternalReference thunk_ref = |
ExternalReference::invoke_accessor_getter_callback(isolate()); |
- |
- __ ld(scratch, FieldMemOperand(callback, AccessorInfo::kJsGetterOffset)); |
- __ ld(api_function_address, |
- FieldMemOperand(scratch, Foreign::kForeignAddressOffset)); |
// +3 is to skip prolog, return address and name handle. |
MemOperand return_value_operand( |