A64: Synchronize with r18581.

src/a64/builtins-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 16 matching lines @@
 
 #include "v8.h"
 
 #if V8_TARGET_ARCH_A64
 
 #include "codegen.h"
 #include "debug.h"
 #include "deoptimizer.h"
 #include "full-codegen.h"
 #include "runtime.h"
+#include "stub-cache.h"
 
 namespace v8 {
 namespace internal {
 
 
 #define __ ACCESS_MASM(masm)
 
 
 // Load the built-in Array function from the current context.
 static void GenerateLoadArrayFunction(MacroAssembler* masm, Register result) {
@@ skipping 1029 matching lines @@
       __ SmiUntag(x0);
 
       // Exit the internal frame.
     }
 
     // Restore the function to x1, and the flag to x4.
     __ Peek(x1, Operand(x0, LSL, kXRegSizeInBytesLog2));
     __ Mov(x4, 0);
     __ B(&patch_receiver);
 
-    // Use the global receiver object from the called function as the
-    // receiver.
     __ Bind(&use_global_receiver);
-    const int kGlobalIndex =
-        Context::kHeaderSize + Context::GLOBAL_OBJECT_INDEX * kPointerSize;
-    __ Ldr(x10, FieldMemOperand(cp, kGlobalIndex));
-    __ Ldr(x2, FieldMemOperand(x10, GlobalObject::kNativeContextOffset));
-    __ Ldr(x10, FieldMemOperand(x2, kGlobalIndex));
-    __ Ldr(x2, FieldMemOperand(x10, GlobalObject::kGlobalReceiverOffset));
+    __ Ldr(x2, GlobalObjectMemOperand());
 
     __ Bind(&patch_receiver);
     __ Sub(x10, x0, 1);
     __ Poke(x2, Operand(x10, LSL, kXRegSizeInBytesLog2));
 
     __ B(&shift_arguments);
   }
 
   // 3b. Check for function proxy.
   __ Bind(&slow);
@@ skipping 66 matching lines @@
   // 5b. Get the code to call from the function and check that the number of
   //     expected arguments matches what we're providing.  If so, jump
   //     (tail-call) to the code in register edx without checking arguments.
   // x0: actual number of arguments
   // x1: function
   __ Ldr(x3, FieldMemOperand(x1, JSFunction::kSharedFunctionInfoOffset));
   __ Ldrsw(x2,
            FieldMemOperand(x3,
              SharedFunctionInfo::kFormalParameterCountOffset));
   __ Ldr(x3, FieldMemOperand(x1, JSFunction::kCodeEntryOffset));
-  __ SetCallKind(x5, CALL_AS_METHOD);
+  __ SetCallKind(x5, CALL_AS_FUNCTION);
   Label dont_adapt_args;
   __ Cmp(x2, x0);  // Check formal and actual parameter counts.
   __ B(eq, &dont_adapt_args);
   __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
           RelocInfo::CODE_TARGET);
 
   __ Bind(&dont_adapt_args);
   ParameterCount expected(0);
   __ InvokeCode(x3, expected, expected, JUMP_FUNCTION,
-                NullCallWrapper(), CALL_AS_METHOD);
+                NullCallWrapper(), CALL_AS_FUNCTION);
 }
 
 
 void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
   ASM_LOCATION("Builtins::Generate_FunctionApply");
   const int kIndexOffset    =
       StandardFrameConstants::kExpressionsOffset - (2 * kPointerSize);
   const int kLimitOffset    =
       StandardFrameConstants::kExpressionsOffset - (1 * kPointerSize);
   const int kArgsOffset     =  2 * kPointerSize;
@@ skipping 74 matching lines @@
     __ JumpIfObjectType(receiver, x10, x11, FIRST_SPEC_OBJECT_TYPE,
                         &push_receiver, ge);
 
     // Call a builtin to convert the receiver to a regular object.
     __ Bind(&convert_receiver_to_object);
     __ Push(receiver);
     __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
     __ Mov(receiver, x0);
     __ B(&push_receiver);
 
-    // Use the current global receiver object as the receiver.
     __ Bind(&use_global_receiver);
-    const int kGlobalOffset =
-        Context::kHeaderSize + Context::GLOBAL_OBJECT_INDEX * kPointerSize;
-    __ Ldr(x10, FieldMemOperand(cp, kGlobalOffset));
-    __ Ldr(x11, FieldMemOperand(x10, GlobalObject::kNativeContextOffset));
-    __ Ldr(x10, FieldMemOperand(x11, kGlobalOffset));
+    __ Ldr(x10, GlobalObjectMemOperand());
     __ Ldr(receiver, FieldMemOperand(x10, GlobalObject::kGlobalReceiverOffset));
 
     // Push the receiver
     __ Bind(&push_receiver);
     __ Push(receiver);
 
     // Copy all arguments from the array to the stack.
     Label entry, loop;
     Register current = x0;
     __ Ldr(current, MemOperand(fp, kIndexOffset));
@@ skipping 21 matching lines @@
     __ Ldr(x1, MemOperand(fp, kLimitOffset));
     __ Cmp(current, x1);
     __ B(ne, &loop);
 
     // At the end of the loop, the number of arguments is stored in 'current',
     // represented as a smi.
 
     function = x1;  // From now on we want the function to be kept in x1;
     __ Ldr(function, MemOperand(fp, kFunctionOffset));
 
-    // Invoke the function.
+    // Call the function.
     Label call_proxy;
     ParameterCount actual(current);
     __ SmiUntag(current);
     __ JumpIfNotObjectType(function, x10, x11, JS_FUNCTION_TYPE, &call_proxy);
     __ InvokeFunction(function, actual, CALL_FUNCTION,
-                      NullCallWrapper(), CALL_AS_METHOD);
+                      NullCallWrapper(), CALL_AS_FUNCTION);
     frame_scope.GenerateLeaveFrame();
     __ Drop(3);
     __ Ret();
 
-    // Invoke the function proxy.
+    // Call the function proxy.
     __ Bind(&call_proxy);
     // x0 : argc
     // x1 : function
     __ Push(function);  // Add function proxy as last argument.
     __ Add(x0, x0, 1);
     __ Mov(x2, 0);
-    __ SetCallKind(x5, CALL_AS_METHOD);
+    __ SetCallKind(x5, CALL_AS_FUNCTION);
     __ GetBuiltinEntry(x3, Builtins::CALL_FUNCTION_PROXY);
     __ Call(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
             RelocInfo::CODE_TARGET);
   }
   __ Drop(3);
   __ Ret();
 }
 
 
 static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
@@ skipping 133 matching lines @@
   __ Bind(&dont_adapt_arguments);
   __ Jump(x3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM