Introduce MoveReturnAddress instruction into X64 Macro Assembler

src/x64/stub-cache-x64.cc

 // Copyright 2012 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 388 matching lines @@
 
 // Reserves space for the extra arguments to API function in the
 // caller's frame.
 //
 // These arguments are set by CheckPrototypes and GenerateFastApiCall.
 static void ReserveSpaceForFastApiCall(MacroAssembler* masm, Register scratch) {
   // ----------- S t a t e -------------
   //  -- rsp[0] : return address
   //  -- rsp[8] : last argument in the internal frame of the caller
   // -----------------------------------
-  __ movq(scratch, StackOperandForReturnAddress(0));
+  __ MoveReturnAddress(scratch, Operand(rsp, 0));
   __ subq(rsp, Immediate(kFastApiCallArguments * kPointerSize));
-  __ movq(StackOperandForReturnAddress(0), scratch);
+  __ MoveReturnAddress(Operand(rsp, 0), scratch);
   __ Move(scratch, Smi::FromInt(0));
   StackArgumentsAccessor args(rsp, kFastApiCallArguments,
                               ARGUMENTS_DONT_CONTAIN_RECEIVER);
   for (int i = 0; i < kFastApiCallArguments; i++) {
      __ movq(args.GetArgumentOperand(i), scratch);
   }
 }
 
 
 // Undoes the effects of ReserveSpaceForFastApiCall.
 static void FreeSpaceForFastApiCall(MacroAssembler* masm, Register scratch) {
   // ----------- S t a t e -------------
   //  -- rsp[0]                             : return address.
   //  -- rsp[8]                             : last fast api call extra argument.
   //  -- ...
   //  -- rsp[kFastApiCallArguments * 8]     : first fast api call extra
   //                                          argument.
   //  -- rsp[kFastApiCallArguments * 8 + 8] : last argument in the internal
   //                                          frame.
   // -----------------------------------
-  __ movq(scratch, StackOperandForReturnAddress(0));
-  __ movq(StackOperandForReturnAddress(kFastApiCallArguments * kPointerSize),
+  __ MoveReturnAddress(scratch, Operand(rsp, 0));
+  __ MoveReturnAddress(Operand(rsp, kFastApiCallArguments * kPointerSize),
           scratch);
   __ addq(rsp, Immediate(kPointerSize * kFastApiCallArguments));
 }
 
 
 // Generates call to API function.
 static void GenerateFastApiCall(MacroAssembler* masm,
                                 const CallOptimization& optimization,
                                 int argc,
                                 bool restore_context) {
@@ skipping 96 matching lines @@
                                 int argc,
                                 Register* values) {
   ASSERT(optimization.is_simple_api_call());
   ASSERT(!receiver.is(scratch));
 
   const int fast_api_call_argc = argc + kFastApiCallArguments;
   StackArgumentsAccessor args(rsp, fast_api_call_argc);
   // argc + 1 is the argument number before FastApiCall arguments, 1 ~ receiver
   const int kHolderIndex = argc + 1 +
       kFastApiCallArguments - 1 - FunctionCallbackArguments::kHolderIndex;
-  __ movq(scratch, StackOperandForReturnAddress(0));
+  __ MoveReturnAddress(scratch, Operand(rsp, 0));
   // Assign stack space for the call arguments and receiver.
   __ subq(rsp, Immediate((fast_api_call_argc + 1) * kPointerSize));
-  __ movq(StackOperandForReturnAddress(0), scratch);
+  __ MoveReturnAddress(Operand(rsp, 0), scratch);
   // Write holder to stack frame.
   __ movq(args.GetArgumentOperand(kHolderIndex), receiver);
   __ movq(args.GetReceiverOperand(), receiver);
   // Write the arguments to stack frame.
   for (int i = 0; i < argc; i++) {
     ASSERT(!receiver.is(values[i]));
     ASSERT(!scratch.is(values[i]));
     __ movq(args.GetArgumentOperand(i + 1), values[i]);
   }
 
@@ skipping 1919 matching lines @@
 
   // Allocate space for v8::Arguments implicit values. Must be initialized
   // before calling any runtime function.
   __ subq(rsp, Immediate(kFastApiCallArguments * kPointerSize));
 
   // Check that the maps haven't changed and find a Holder as a side effect.
   CheckPrototypes(Handle<JSObject>::cast(object), rdx, holder, rbx, rax, rdi,
                   name, depth, &miss);
 
   // Move the return address on top of the stack.
-  __ movq(rax,
-          StackOperandForReturnAddress(kFastApiCallArguments * kPointerSize));
-  __ movq(StackOperandForReturnAddress(0), rax);
+  __ MoveReturnAddress(rax, Operand(rsp, kFastApiCallArguments * kPointerSize));
+  __ MoveReturnAddress(Operand(rsp, 0), rax);
 
   GenerateFastApiCall(masm(), optimization, argc, false);
 
   __ bind(&miss);
   __ addq(rsp, Immediate(kFastApiCallArguments * kPointerSize));
 
   __ bind(&miss_before_stack_reserved);
   GenerateMissBranch();
 
   // Return the generated code.
@@ skipping 640 matching lines @@
   // -----------------------------------
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_MissForceGeneric);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64