Index: src/ic/mips64/handler-compiler-mips64.cc |
diff --git a/src/ic/mips64/handler-compiler-mips64.cc b/src/ic/mips64/handler-compiler-mips64.cc |
index e22941203c27295a47fc2a8833e17ef7a7d19b3f..2f51e025037f7118874404fe338aebeaf9c749a4 100644 |
--- a/src/ic/mips64/handler-compiler-mips64.cc |
+++ b/src/ic/mips64/handler-compiler-mips64.cc |
@@ -585,50 +585,41 @@ |
void NamedLoadHandlerCompiler::GenerateLoadCallback( |
Register reg, Handle<AccessorInfo> callback) { |
- DCHECK(!AreAliased(scratch2(), scratch3(), scratch4(), receiver())); |
- DCHECK(!AreAliased(scratch2(), scratch3(), scratch4(), reg)); |
- |
- // 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); |
- |
- // Here and below +1 is for name() pushed after the args_ array. |
- typedef PropertyCallbackArguments PCA; |
- __ Dsubu(sp, sp, (PCA::kArgsLength + 1) * kPointerSize); |
- __ sw(receiver(), MemOperand(sp, (PCA::kThisIndex + 1) * kPointerSize)); |
+ // Build AccessorInfo::args_ list on the stack and push property name below |
+ // the exit frame to make GC aware of them and store pointers to them. |
+ STATIC_ASSERT(PropertyCallbackArguments::kHolderIndex == 0); |
+ STATIC_ASSERT(PropertyCallbackArguments::kIsolateIndex == 1); |
+ STATIC_ASSERT(PropertyCallbackArguments::kReturnValueDefaultValueIndex == 2); |
+ STATIC_ASSERT(PropertyCallbackArguments::kReturnValueOffset == 3); |
+ STATIC_ASSERT(PropertyCallbackArguments::kDataIndex == 4); |
+ STATIC_ASSERT(PropertyCallbackArguments::kThisIndex == 5); |
+ STATIC_ASSERT(PropertyCallbackArguments::kArgsLength == 6); |
+ DCHECK(!scratch2().is(reg)); |
+ DCHECK(!scratch3().is(reg)); |
+ DCHECK(!scratch4().is(reg)); |
+ __ push(receiver()); |
Handle<Object> data(callback->data(), isolate()); |
if (data->IsUndefined() || data->IsSmi()) { |
- __ li(scratch2(), data); |
+ __ li(scratch3(), data); |
} else { |
Handle<WeakCell> cell = |
isolate()->factory()->NewWeakCell(Handle<HeapObject>::cast(data)); |
// The callback is alive if this instruction is executed, |
// so the weak cell is not cleared and points to data. |
- __ GetWeakValue(scratch2(), cell); |
- } |
- __ sd(scratch2(), MemOperand(sp, (PCA::kDataIndex + 1) * kPointerSize)); |
- __ LoadRoot(scratch2(), Heap::kUndefinedValueRootIndex); |
- __ sd(scratch2(), |
- MemOperand(sp, (PCA::kReturnValueOffset + 1) * kPointerSize)); |
- __ sd(scratch2(), MemOperand(sp, (PCA::kReturnValueDefaultValueIndex + 1) * |
- kPointerSize)); |
- __ li(scratch2(), Operand(ExternalReference::isolate_address(isolate()))); |
- __ sd(scratch2(), MemOperand(sp, (PCA::kIsolateIndex + 1) * kPointerSize)); |
- __ sd(reg, MemOperand(sp, (PCA::kHolderIndex + 1) * kPointerSize)); |
- // should_throw_on_error -> false |
- DCHECK(Smi::FromInt(0) == nullptr); |
- __ sd(zero_reg, |
- MemOperand(sp, (PCA::kShouldThrowOnErrorIndex + 1) * kPointerSize)); |
- |
+ __ GetWeakValue(scratch3(), cell); |
+ } |
+ __ Dsubu(sp, sp, 6 * kPointerSize); |
+ __ sd(scratch3(), MemOperand(sp, 5 * kPointerSize)); |
+ __ LoadRoot(scratch3(), Heap::kUndefinedValueRootIndex); |
+ __ sd(scratch3(), MemOperand(sp, 4 * kPointerSize)); |
+ __ sd(scratch3(), MemOperand(sp, 3 * kPointerSize)); |
+ __ li(scratch4(), Operand(ExternalReference::isolate_address(isolate()))); |
+ __ sd(scratch4(), MemOperand(sp, 2 * kPointerSize)); |
+ __ sd(reg, MemOperand(sp, 1 * kPointerSize)); |
__ sd(name(), MemOperand(sp, 0 * kPointerSize)); |
- |
+ __ Daddu(scratch2(), sp, 1 * kPointerSize); |
+ |
+ __ mov(a2, scratch2()); // Saved in case scratch2 == a1. |
// Abi for CallApiGetter. |
Register getter_address_reg = ApiGetterDescriptor::function_address(); |
@@ -714,8 +705,7 @@ |
Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback( |
- Handle<JSObject> object, Handle<Name> name, Handle<AccessorInfo> callback, |
- LanguageMode language_mode) { |
+ Handle<JSObject> object, Handle<Name> name, Handle<AccessorInfo> callback) { |
Register holder_reg = Frontend(name); |
__ Push(receiver(), holder_reg); // Receiver. |
@@ -730,7 +720,6 @@ |
__ push(at); |
__ li(at, Operand(name)); |
__ Push(at, value()); |
- __ Push(Smi::FromInt(language_mode)); |
// Do tail-call to the runtime system. |
__ TailCallRuntime(Runtime::kStoreCallbackProperty); |