Introduce StackOperandForArgument for X64 to access stack argument

src/x64/builtins-x64.cc

Index: src/x64/builtins-x64.cc
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
index d34e4f70d9a9c0a425e6cf2db99acf22768a42f7..5e467ff3caedd70967cc395e8fe9eac00148c317 100644
--- a/src/x64/builtins-x64.cc
+++ b/src/x64/builtins-x64.cc
@@ -44,15 +44,16 @@ void Builtins::Generate_Adaptor(MacroAssembler* masm,
                                 CFunctionId id,
                                 BuiltinExtraArguments extra_args) {
   // ----------- S t a t e -------------
-  //  -- rax                 : number of arguments excluding receiver
-  //  -- rdi                 : called function (only guaranteed when
-  //                           extra_args requires it)
-  //  -- rsi                 : context
-  //  -- rsp[0]              : return address
-  //  -- rsp[8]              : last argument
+  //  -- rax                             : number of arguments
+  //                                       excluding receiver
+  //  -- rdi                             : called function (only guaranteed
+  //                                       when extra_args requires it)
+  //  -- rsi                             : context
+  //  -- rsp[0]                          : return address
+  //  -- rsp[8]                          : last argument
   //  -- ...
-  //  -- rsp[8 * argc]       : first argument (argc == rax)
-  //  -- rsp[8 * (argc + 1)] : receiver
+  //  -- rsp[8 * argc]                   : first argument (argc == rax)
+  //  -- rsp[8 * argc + kPCOnStackSize)] : receiver
   // -----------------------------------
 
   // Insert extra arguments.
@@ -708,7 +709,7 @@ static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
   }
 
   // Get the full codegen state from the stack and untag it.
-  __ SmiToInteger32(r10, Operand(rsp, 1 * kPointerSize));
+  __ SmiToInteger32(r10, Operand(rsp, kPCOnStackSize));
 
   // Switch on the state.
   Label not_no_registers, not_tos_rax;
@@ -717,7 +718,7 @@ static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
   __ ret(1 * kPointerSize);  // Remove state.
 
   __ bind(&not_no_registers);
-  __ movq(rax, Operand(rsp, 2 * kPointerSize));
+  __ movq(rax, Operand(rsp, kPCOnStackSize + kPointerSize));

[haitao.feng, 2013/07/25 06:31:49]

This is not for argument access, so I did not use 1 * kPointerSize.

   __ cmpq(r10, Immediate(FullCodeGenerator::TOS_REG));
   __ j(not_equal, &not_tos_rax, Label::kNear);
   __ ret(2 * kPointerSize);  // Remove state, rax.
@@ -759,12 +760,12 @@ void Builtins::Generate_NotifyOSR(MacroAssembler* masm) {
 
 void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
   // Stack Layout:
-  // rsp[0]           : Return address
-  // rsp[8]           : Argument n
-  // rsp[16]          : Argument n-1
+  // rsp[0]                      : Return address
+  // rsp[8]                      : Argument n
+  // rsp[16]                     : Argument n-1
   //  ...
-  // rsp[8 * n]       : Argument 1
-  // rsp[8 * (n + 1)] : Receiver (function to call)
+  // rsp[8 * n]                  : Argument 1
+  // rsp[8 * n + kPCOnStackSize] : Receiver (function to call)
   //
   // rax contains the number of arguments, n, not counting the receiver.
   //
@@ -782,8 +783,9 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
   // 2. Get the function to call (passed as receiver) from the stack, check
   //    if it is a function.
   Label slow, non_function;
-  // The function to call is at position n+1 on the stack.
-  __ movq(rdi, Operand(rsp, rax, times_pointer_size, 1 * kPointerSize));
+  // The function to call is at position n * kPointerSize + kPCOnStackSize
+  // on the stack.
+  __ movq(rdi, Operand(rsp, rax, times_pointer_size, kPCOnStackSize));
   __ JumpIfSmi(rdi, &non_function);
   __ CmpObjectType(rdi, JS_FUNCTION_TYPE, rcx);
   __ j(not_equal, &slow);
@@ -808,7 +810,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
     __ j(not_zero, &shift_arguments);
 
     // Compute the receiver in non-strict mode.
-    __ movq(rbx, Operand(rsp, rax, times_pointer_size, 0));
+    __ movq(rbx, Operand(rsp, rax, times_pointer_size,
+                         kPCOnStackSize - kPointerSize));
     __ JumpIfSmi(rbx, &convert_to_object, Label::kNear);
 
     __ CompareRoot(rbx, Heap::kNullValueRootIndex);
@@ -837,7 +840,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
     }
 
     // Restore the function to rdi.
-    __ movq(rdi, Operand(rsp, rax, times_pointer_size, 1 * kPointerSize));
+    __ movq(rdi, Operand(rsp, rax, times_pointer_size, kPCOnStackSize));
     __ jmp(&patch_receiver, Label::kNear);
 
     // Use the global receiver object from the called function as the
@@ -851,7 +854,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
     __ movq(rbx, FieldOperand(rbx, GlobalObject::kGlobalReceiverOffset));
 
     __ bind(&patch_receiver);
-    __ movq(Operand(rsp, rax, times_pointer_size, 0), rbx);
+    __ movq(Operand(rsp, rax, times_pointer_size,
+                    kPCOnStackSize - kPointerSize), rbx);
 
     __ jmp(&shift_arguments);
   }
@@ -868,7 +872,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
   //     CALL_NON_FUNCTION builtin expects the non-function callee as
   //     receiver, so overwrite the first argument which will ultimately
   //     become the receiver.
-  __ movq(Operand(rsp, rax, times_pointer_size, 0), rdi);
+  __ movq(Operand(rsp, rax, times_pointer_size, kPCOnStackSize - kPointerSize),
+          rdi);
 
   // 4. Shift arguments and return address one slot down on the stack
   //    (overwriting the original receiver).  Adjust argument count to make
@@ -1161,11 +1166,11 @@ void Builtins::Generate_ArrayCode(MacroAssembler* masm) {
 
 void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
   // ----------- S t a t e -------------
-  //  -- rax                 : number of arguments
-  //  -- rdi                 : constructor function
-  //  -- rsp[0]              : return address
-  //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
-  //  -- rsp[(argc + 1) * 8] : receiver
+  //  -- rax                                      : number of arguments
+  //  -- rdi                                      : constructor function
+  //  -- rsp[0]                                   : return address
+  //  -- rsp[(argc - n - 1) * 8 + kPCOnStackSize] : arg[n] (zero-based)
+  //  -- rsp[argc * 8 + kPCOnStackSize]           : receiver
   // -----------------------------------
   Counters* counters = masm->isolate()->counters();
   __ IncrementCounter(counters->string_ctor_calls(), 1);
@@ -1181,7 +1186,8 @@ void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
   Label no_arguments;
   __ testq(rax, rax);
   __ j(zero, &no_arguments);
-  __ movq(rbx, Operand(rsp, rax, times_pointer_size, 0));
+  __ movq(rbx, Operand(rsp, rax, times_pointer_size,
+                       kPCOnStackSize - kPointerSize));
   __ pop(rcx);
   __ lea(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
   __ push(rcx);