A64: Synchronize with r16849.

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 818 matching lines @@
 
 
 // Undoes the effects of ReserveSpaceForFastApiCall.
 static void FreeSpaceForFastApiCall(MacroAssembler* masm) {
   __ Drop(kFastApiCallArguments);
 }
 
 
 static void GenerateFastApiDirectCall(MacroAssembler* masm,
                                       const CallOptimization& optimization,
-                                      int argc) {
+                                      int argc,
+                                      bool restore_context) {
   // ----------- S t a t e -------------
-  //  -- sp[0]              : holder (set by CheckPrototypes)
-  //  -- sp[8]              : callee JS function
-  //  -- sp[16]             : call data
-  //  -- sp[24]             : isolate
-  //  -- sp[32]             : ReturnValue default value
-  //  -- sp[40]             : ReturnValue
-  //  -- sp[48]             : last JS argument
+  //  -- sp[0]              : context
+  //  -- sp[8]              : holder (set by CheckPrototypes)
+  //  -- sp[16]             : callee JS function
+  //  -- sp[24]             : call data
+  //  -- sp[32]             : isolate
+  //  -- sp[40]             : ReturnValue default value
+  //  -- sp[48]             : ReturnValue
+  //  -- sp[56]             : last JS argument
   //  -- ...
-  //  -- sp[(argc + 5) * 8] : first JS argument
-  //  -- sp[(argc + 6) * 8] : receiver
+  //  -- sp[(argc + 6) * 8] : first JS argument
+  //  -- sp[(argc + 7) * 8] : receiver
   // -----------------------------------
+  // Save calling context.
+  __ Poke(cp, 0);
   // 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, 2 * kPointerSize);
 
   // Pass the additional arguments.
   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, 3 * kPointerSize);
+  // Store isolate.
   Register isolate_reg = x7;
   __ Mov(isolate_reg,
          Operand(ExternalReference::isolate_address(masm->isolate())));
-
+  __ Poke(isolate_reg, 4 * kPointerSize);
+  // Store ReturnValue default and ReturnValue.
   Register undefined_reg = x8;
   __ LoadRoot(undefined_reg, Heap::kUndefinedValueRootIndex);
-
-  // Store JS function, call data, isolate, ReturnValue default and ReturnValue.
-  // TODO(jbramley): Try to combine these accesses using stp.
-  __ Poke(function_reg, 1 * kXRegSizeInBytes);
-  __ Poke(call_data_reg, 2 * kXRegSizeInBytes);
-  __ Poke(isolate_reg, 3 * kXRegSizeInBytes);
-  __ Poke(undefined_reg, 4 * kXRegSizeInBytes);
-  __ Poke(undefined_reg, 5 * kXRegSizeInBytes);
+  __ PokePair(undefined_reg, undefined_reg, 5 * kXRegSizeInBytes);
 
   Register implicit_args = x2;
-  __ Add(implicit_args, masm->StackPointer(), 5 * kXRegSizeInBytes);
+  __ Add(implicit_args, masm->StackPointer(),
+         (kFastApiCallArguments - 1) * kXRegSizeInBytes);
 
   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);
 
@@ skipping 27 matching lines @@
   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, 2 * kPointerSize);
+  MemOperand return_value_operand(
+      fp, (kFastApiCallArguments + 1) * 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,
-                              kFastApiCallArguments + 1);
+                              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));
 
   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, 0);
+  __ Poke(receiver, 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);
   }
 
-  GenerateFastApiDirectCall(masm, optimization, argc);
+  GenerateFastApiDirectCall(masm, optimization, argc, true);
 }
 
 
 class CallInterceptorCompiler BASE_EMBEDDED {
  public:
   CallInterceptorCompiler(StubCompiler* stub_compiler,
                           const ParameterCount& arguments,
                           Register name,
                           Code::ExtraICState extra_ic_state)
       : stub_compiler_(stub_compiler),
@@ skipping 96 matching lines @@
     } else {
       // CheckPrototypes has a side effect of fetching a 'holder'
       // for API (object which is instanceof for the signature).  It's
       // safe to omit it here, as if present, it should be fetched
       // by the previous CheckPrototypes.
       ASSERT(depth2 == kInvalidProtoDepth);
     }
 
     // Invoke function.
     if (can_do_fast_api_call) {
-      GenerateFastApiDirectCall(masm, optimization, arguments_.immediate());
+      GenerateFastApiDirectCall(
+          masm, optimization, arguments_.immediate(), false);
     } else {
       CallKind call_kind = CallICBase::Contextual::decode(extra_ic_state_)
           ? CALL_AS_FUNCTION
           : CALL_AS_METHOD;
       Handle<JSFunction> function = optimization.constant_function();
       ParameterCount expected(function);
       __ InvokeFunction(function, expected, arguments_,
                         JUMP_FUNCTION, NullCallWrapper(), call_kind);
     }
 
@@ skipping 80 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;
 
   if (save_at_depth == depth) {
-    __ Poke(reg, 0);
+    __ Poke(reg, 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, 0);
+      __ Poke(reg, 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 208 matching lines @@
 
   // After the call to the API function we need to free memory used for:
   //  - the holder
   //  - the callback data
   //  - the isolate
   //  - the property name
   //  - the receiver.
   //
   // The memory allocated inside the ExitFrame will be freed when we'll leave
   // the ExitFrame in CallApiFunctionAndReturn.
-  const int kStackUnwindSpace = kFastApiCallArguments + 1;
+  const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1;
 
   // Do the API call.
   Address getter_address = v8::ToCData<Address>(callback->getter());
 
   ApiFunction fun(getter_address);
   ExternalReference::Type type = ExternalReference::DIRECT_GETTER_CALL;
   ExternalReference ref = ExternalReference(&fun, type, isolate());
 
   Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback);
   ExternalReference::Type thunk_type = ExternalReference::PROFILING_GETTER_CALL;
   ApiFunction thunk_fun(thunk_address);
   ExternalReference thunk_ref =
       ExternalReference(&thunk_fun, thunk_type, isolate());
 
   // TODO(jbramley): I don't know where '6' comes from, but this goes away at
   // some point.
   __ CallApiFunctionAndReturn(ref,
                               getter_address,
                               thunk_ref,
                               x2,
                               kStackUnwindSpace,
                               spill_offset,
-                              6);
+                              MemOperand(fp, 6 * kPointerSize),
+                              NULL);
 }
 
 
 void BaseLoadStubCompiler::GenerateLoadInterceptor(
     Register holder_reg,
     Handle<JSObject> object,
     Handle<JSObject> interceptor_holder,
     LookupResult* lookup,
     Handle<Name> name) {
   ASSERT(!AreAliased(receiver(), this->name(),
@@ skipping 1079 matching lines @@
 
   __ IncrementCounter(counters->call_const(), 1, x0, x3);
   __ IncrementCounter(counters->call_const_fast_api(), 1, x0, x3);
 
   ReserveSpaceForFastApiCall(masm(), x0);
 
   // Check that the maps haven't changed and find a Holder as a side effect.
   CheckPrototypes(Handle<JSObject>::cast(object), receiver, holder, x0, x3, x4,
                   name, depth, &miss);
 
-  GenerateFastApiDirectCall(masm(), optimization, argc);
+  GenerateFastApiDirectCall(masm(), optimization, argc, false);
 
   __ Bind(&miss);
   FreeSpaceForFastApiCall(masm());
 
   __ Bind(&miss_before_stack_reserved);
   GenerateMissBranch();
 
   // Return the generated code.
   return GetCode(function);
 }
@@ skipping 627 matching lines @@
 
   // Miss case, call the runtime.
   __ Bind(&miss_force_generic);
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_MissForceGeneric);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64