A64: Synchronize with r17104.

src/a64/stub-cache-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 829 matching lines @@
                                       bool restore_context) {
   // ----------- S t a t e -------------
   //  -- sp[0] - sp[48]     : FunctionCallbackInfo, including
   //                          holder (set by CheckPrototypes)
   //  -- sp[56]             : last JS argument
   //  -- ...
   //  -- sp[(argc + 6) * 8] : first JS argument
   //  -- sp[(argc + 7) * 8] : receiver
   // -----------------------------------
   typedef FunctionCallbackArguments FCA;
-  const int kArgs = kFastApiCallArguments;
   // Save calling context.
-  __ Poke(cp, (kArgs - 1 + FCA::kContextSaveIndex) * kPointerSize);
+  __ Poke(cp, FCA::kContextSaveIndex * kPointerSize);
   // Get the function and setup the context.
   Handle<JSFunction> function = optimization.constant_function();
   Register function_reg = x5;
   __ LoadHeapObject(function_reg, function);
   __ Ldr(cp, FieldMemOperand(function_reg, JSFunction::kContextOffset));
-  __ Poke(function_reg, (kArgs - 1 + FCA::kCalleeIndex) * kPointerSize);
+  __ Poke(function_reg, FCA::kCalleeIndex * kPointerSize);
 
   // Construct the FunctionCallbackInfo.
   Handle<CallHandlerInfo> api_call_info = optimization.api_call_info();
   Handle<Object> call_data(api_call_info->data(), masm->isolate());
   Register call_data_reg = x6;
   if (masm->isolate()->heap()->InNewSpace(*call_data)) {
     __ Mov(x0, Operand(api_call_info));
     __ Ldr(call_data_reg, FieldMemOperand(x0, CallHandlerInfo::kDataOffset));
   } else {
     __ Mov(call_data_reg, Operand(call_data));
   }
   // Store call data.
-  __ Poke(call_data_reg, (kArgs - 1 + FCA::kDataIndex) * kPointerSize);
+  __ Poke(call_data_reg, FCA::kDataIndex * kPointerSize);
   // Store isolate.
   Register isolate_reg = x7;
   __ Mov(isolate_reg,
          Operand(ExternalReference::isolate_address(masm->isolate())));
-  __ Poke(isolate_reg, (kArgs - 1 + FCA::kIsolateIndex) * kPointerSize);
+  __ Poke(isolate_reg, FCA::kIsolateIndex * kPointerSize);
   // Store ReturnValue default and ReturnValue.
   Register undefined_reg = x8;
   __ LoadRoot(undefined_reg, Heap::kUndefinedValueRootIndex);
-  __ Poke(undefined_reg, (kArgs - 1 + FCA::kReturnValueOffset) * kPointerSize);
-  __ Poke(undefined_reg,
-          (kArgs - 1 + FCA::kReturnValueDefaultValueIndex) * kPointerSize);
+  // TODO(all): These are adjacent. Once things settle down, use PokePair.
+  __ Poke(undefined_reg, FCA::kReturnValueOffset * kPointerSize);
+  __ Poke(undefined_reg, FCA::kReturnValueDefaultValueIndex * kPointerSize);
 
   Register implicit_args = x2;
-  __ Add(implicit_args, masm->StackPointer(), (kArgs - 1) * kPointerSize);
+  __ Mov(implicit_args, masm->StackPointer());
 
   FrameScope frame_scope(masm, StackFrame::MANUAL);
   // Allocate the v8::Arguments structure inside the ExitFrame since it's not
   // controlled by GC.
   const int kApiArgsStackSpace = 4;
   __ EnterExitFrame(
       false,
       x3,
       kApiArgsStackSpace + MacroAssembler::kCallApiFunctionSpillSpace);
 
   // Arguments structure is after the return address.
+  // args = FunctionCallbackInfo&
   Register args = x0;
   __ Add(args, masm->StackPointer(), kPointerSize);
 
-  // v8::Arguments::implicit_args_
+  // FunctionCallbackInfo::implicit_args_
   __ Str(implicit_args, MemOperand(args, 0 * kPointerSize));
-  // v8::Arguments::values_
-  __ Add(x3, implicit_args, argc * kPointerSize);
+  // FunctionCallbackInfo::values_
+  __ Add(x3, implicit_args, (kFastApiCallArguments - 1 + argc) * kPointerSize);
   __ Str(x3, MemOperand(args, 1 * kPointerSize));
-  // v8::Arguments::length_ = argc
+  // FunctionCallbackInfo::length_ = argc
   __ Mov(x3, argc);
   __ Str(x3, MemOperand(args, 2 * kPointerSize));
-  // v8::Arguments::is_construct_call = 0
-  __ Mov(x3, 0);
-  __ Str(x3, MemOperand(args, 3 * kPointerSize));
+  // FunctionCallbackInfo::is_construct_call = 0
+  __ Str(xzr, MemOperand(args, 3 * kPointerSize));
 
   // After the call to the API function we need to free memory used for:
   //  - JS arguments
   //  - the receiver
   //  - the space allocated by ReserveSpaceForFastApiCall.
   //
   // The memory allocated for v8::Arguments structure will be freed when we'll
   // leave the ExitFrame.
-  const int kStackUnwindSpace = argc + kArgs + 1;
+  const int kStackUnwindSpace = argc + kFastApiCallArguments + 1;
 
   Address function_address = v8::ToCData<Address>(api_call_info->callback());
   ApiFunction fun(function_address);
   ExternalReference::Type type = ExternalReference::DIRECT_API_CALL;
   ExternalReference ref = ExternalReference(&fun, type, masm->isolate());
 
   Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback);
   ExternalReference::Type thunk_type = ExternalReference::PROFILING_API_CALL;
   ApiFunction thunk_fun(thunk_address);
   ExternalReference thunk_ref =
       ExternalReference(&thunk_fun, thunk_type, masm->isolate());
 
   AllowExternalCallThatCantCauseGC scope(masm);
   MemOperand context_restore_operand(
-      fp, (kArgs + 1 + FCA::kContextSaveIndex) * kPointerSize);
+      fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
   MemOperand return_value_operand(
-      fp, (kArgs + 1 + FCA::kReturnValueOffset) * kPointerSize);
+      fp, (2 + FCA::kReturnValueOffset) * kPointerSize);
+
   // CallApiFunctionAndReturn can spill registers inside the exit frame,
   // after the return address and the v8::Arguments structure.
   const int spill_offset = 1 + kApiArgsStackSpace;
   __ CallApiFunctionAndReturn(ref,
                               function_address,
                               thunk_ref,
                               x1,
                               kStackUnwindSpace,
                               spill_offset,
                               return_value_operand,
                               restore_context ?
                                   &context_restore_operand : NULL);
 }
 
 
 // Generate call to api function.
 static void GenerateFastApiCall(MacroAssembler* masm,
                                 const CallOptimization& optimization,
                                 Register receiver,
                                 Register scratch,
                                 int argc,
                                 Register* values) {
   ASSERT(optimization.is_simple_api_call());
   ASSERT(!AreAliased(receiver, scratch));
 
+  typedef FunctionCallbackArguments FCA;
   const int stack_space = kFastApiCallArguments + argc + 1;
-  const int kHolderIndex = kFastApiCallArguments +
-      FunctionCallbackArguments::kHolderIndex - 1;
   // Assign stack space for the call arguments.
   __ Claim(stack_space);
   // Write holder to stack frame.
-  __ Poke(receiver, kHolderIndex * kPointerSize);
+  __ Poke(receiver, FCA::kHolderIndex * kPointerSize);
   // Write receiver to stack frame.
   int index = stack_space - 1;
   __ Poke(receiver, index * kPointerSize);
   // Write the arguments to stack frame.
   for (int i = 0; i < argc; i++) {
     // TODO(jbramley): This is broken, but it is broken on ARM too.
     ASSERT(!AreAliased(receiver, scratch, values[i]));
     __ Poke(receiver, index-- * kPointerSize);
   }
 
@@ skipping 209 matching lines @@
 Register StubCompiler::CheckPrototypes(Handle<JSObject> object,
                                        Register object_reg,
                                        Handle<JSObject> holder,
                                        Register holder_reg,
                                        Register scratch1,
                                        Register scratch2,
                                        Handle<Name> name,
                                        int save_at_depth,
                                        Label* miss,
                                        PrototypeCheckType check) {
-  const int kHolderIndex = kFastApiCallArguments +
-      FunctionCallbackArguments::kHolderIndex - 1;
   // Make sure that the type feedback oracle harvests the receiver map.
   // TODO(svenpanne) Remove this hack when all ICs are reworked.
   __ Mov(scratch1, Operand(Handle<Map>(object->map())));
 
   Handle<JSObject> first = object;
 
   // object_reg and holder_reg registers can alias.
   ASSERT(!AreAliased(object_reg, scratch1, scratch2));
   ASSERT(!AreAliased(holder_reg, scratch1, scratch2));
 
   // Keep track of the current object in register reg.
   Register reg = object_reg;
   int depth = 0;
 
+  typedef FunctionCallbackArguments FCA;
   if (save_at_depth == depth) {
-    __ Poke(reg, kHolderIndex * kPointerSize);
+    __ Poke(reg, FCA::kHolderIndex * kPointerSize);
   }
 
   // Check the maps in the prototype chain.
   // Traverse the prototype chain from the object and do map checks.
   Handle<JSObject> current = object;
   while (!current.is_identical_to(holder)) {
     ++depth;
 
     // Only global objects and objects that do not require access
     // checks are allowed in stubs.
@@ skipping 38 matching lines @@
         // The prototype is in new space; we cannot store a reference to it
         // in the code.  Load it from the map.
         __ Ldr(reg, FieldMemOperand(map_reg, Map::kPrototypeOffset));
       } else {
         // The prototype is in old space; load it directly.
         __ Mov(reg, Operand(prototype));
       }
     }
 
     if (save_at_depth == depth) {
-      __ Poke(reg, kHolderIndex * kPointerSize);
+      __ Poke(reg, FCA::kHolderIndex * kPointerSize);
     }
 
     // Go to the next object in the prototype chain.
     current = prototype;
   }
 
   // Log the check depth.
   LOG(isolate(), IntEvent("check-maps-depth", depth + 1));
 
   // Check the holder map.
@@ skipping 146 matching lines @@
 
 
 void BaseLoadStubCompiler::GenerateLoadCallback(
     Register reg,
     Handle<ExecutableAccessorInfo> callback) {
   ASSERT(!AreAliased(scratch2(), scratch3(), scratch4(), reg));
 
   // Build ExecutableAccessorInfo::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::kThisIndex == 0);
-  STATIC_ASSERT(PropertyCallbackArguments::kDataIndex == -1);
-  STATIC_ASSERT(PropertyCallbackArguments::kReturnValueOffset == -2);
-  STATIC_ASSERT(PropertyCallbackArguments::kReturnValueDefaultValueIndex == -3);
-  STATIC_ASSERT(PropertyCallbackArguments::kIsolateIndex == -4);
-  STATIC_ASSERT(PropertyCallbackArguments::kHolderIndex == -5);
+  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);
 
   __ Push(receiver());
-  Register args_addr = scratch2();
-  __ Mov(args_addr, __ StackPointer());
 
   if (heap()->InNewSpace(callback->data())) {
     __ Mov(scratch3(), Operand(callback));
     __ Ldr(scratch3(), FieldMemOperand(scratch3(),
                                        ExecutableAccessorInfo::kDataOffset));
   } else {
     __ Mov(scratch3(), Operand(Handle<Object>(callback->data(), isolate())));
   }
   // TODO(jbramley): Find another scratch register and combine the pushes
   // together. Can we use scratch1() here?
-  // Push:
-  //   - callback data
-  //   - undefined
-  //   - undefined
-  //   - isolate
-  //   - reg
-  //   - name
   __ LoadRoot(scratch4(), Heap::kUndefinedValueRootIndex);
   __ Push(scratch3(), scratch4());
   __ Mov(scratch3(), Operand(ExternalReference::isolate_address(isolate())));
   __ Push(scratch4(), scratch3(), reg, name());
 
+  Register args_addr = scratch2();
+  __ Add(args_addr, __ StackPointer(), kPointerSize);
+
+  // Stack at this point:
+  //              sp[40] callback data
+  //              sp[32] undefined
+  //              sp[24] undefined
+  //              sp[16] isolate
+  // args_addr -> sp[8]  reg
+  //              sp[0]  name
+
   // Pass the Handle<Name> of the property name to the runtime.
   __ Mov(x0, __ StackPointer());
 
   FrameScope frame_scope(masm(), StackFrame::MANUAL);
   const int kApiStackSpace = 1;
   __ EnterExitFrame(false, scratch4(),
       kApiStackSpace + MacroAssembler::kCallApiFunctionSpillSpace);
 
-  // Create ExecutableAccessorInfo instance on the stack above the exit frame
-  // before the return address. ExecutableAccessorInfo has only one field: the
-  // address of args_.
+  // Create PropertyAccessorInfo instance on the stack above the exit frame
+  // (before the return address) with args_addr as the data.
   __ Poke(args_addr, 1 * kPointerSize);
 
   // Get the address of ExecutableAccessorInfo instance and pass it to the
   // runtime.
   __ Add(x1, __ StackPointer(), 1 * kPointerSize);
 
   // CallApiFunctionAndReturn can spill registers inside the exit frame, after
   // the return address and the ExecutableAccessorInfo instance.
   const int spill_offset = 1 + kApiStackSpace;
 
@@ skipping 1771 matching lines @@
 
   // Miss case, call the runtime.
   __ Bind(&miss_force_generic);
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_MissForceGeneric);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64