Use kRegisterSize when passing arguments to the C++ runtime for X64

src/x64/code-stubs-x64.cc

Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index fef72606f6e349a9c09afde340ea52141e7167dd..a220368e4ee67bbf0e91e4a9cabe1943662e622b 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -1616,11 +1616,11 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
   // Argument 9: Pass current isolate address.
   __ LoadAddress(kScratchRegister,
                  ExternalReference::isolate_address(masm->isolate()));
-  __ movq(Operand(rsp, (argument_slots_on_stack - 1) * kPointerSize),
+  __ movq(Operand(rsp, (argument_slots_on_stack - 1) * kRegisterSize),
           kScratchRegister);
 
   // Argument 8: Indicate that this is a direct call from JavaScript.
-  __ movq(Operand(rsp, (argument_slots_on_stack - 2) * kPointerSize),
+  __ movq(Operand(rsp, (argument_slots_on_stack - 2) * kRegisterSize),
           Immediate(1));
 
   // Argument 7: Start (high end) of backtracking stack memory area.
@@ -1628,13 +1628,13 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
   __ movq(r9, Operand(kScratchRegister, 0));
   __ Move(kScratchRegister, address_of_regexp_stack_memory_size);
   __ addq(r9, Operand(kScratchRegister, 0));
-  __ movq(Operand(rsp, (argument_slots_on_stack - 3) * kPointerSize), r9);
+  __ movq(Operand(rsp, (argument_slots_on_stack - 3) * kRegisterSize), r9);
 
   // Argument 6: Set the number of capture registers to zero to force global
   // regexps to behave as non-global.  This does not affect non-global regexps.
   // Argument 6 is passed in r9 on Linux and on the stack on Windows.
 #ifdef _WIN64
-  __ movq(Operand(rsp, (argument_slots_on_stack - 4) * kPointerSize),
+  __ movq(Operand(rsp, (argument_slots_on_stack - 4) * kRegisterSize),
           Immediate(0));
 #else
   __ Set(r9, 0);
@@ -1645,7 +1645,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
                  ExternalReference::address_of_static_offsets_vector(isolate));
   // Argument 5 passed in r8 on Linux and on the stack on Windows.
 #ifdef _WIN64
-  __ movq(Operand(rsp, (argument_slots_on_stack - 5) * kPointerSize), r8);
+  __ movq(Operand(rsp, (argument_slots_on_stack - 5) * kRegisterSize), r8);
 #endif
 
   // rdi: subject string
@@ -2628,8 +2628,8 @@ void CEntryStub::GenerateCore(MacroAssembler* masm,
     // Read result values stored on stack. Result is stored
     // above the four argument mirror slots and the two
     // Arguments object slots.
-    __ movq(rax, Operand(rsp, 6 * kPointerSize));
-    __ movq(rdx, Operand(rsp, 7 * kPointerSize));
+    __ movq(rax, Operand(rsp, 6 * kRegisterSize));
+    __ movq(rdx, Operand(rsp, 7 * kRegisterSize));
   }
 #endif
   __ lea(rcx, Operand(rax, 1));
@@ -5176,7 +5176,8 @@ void ProfileEntryHookStub::Generate(MacroAssembler* masm) {
   __ push(arg_reg_2);

[Toon Verwaest, 2014/01/16 09:50:27]

Shouldn't we mov here?

[haitao.feng, 2014/01/16 11:54:42]

Sorry I do not quite understand this comment.
On 2014/01/16 09:50:27, Toon Verwaest wrote:

 
   // Calculate the original stack pointer and store it in the second arg.
-  __ lea(arg_reg_2, Operand(rsp, (kNumSavedRegisters + 1) * kPointerSize));
+  __ lea(arg_reg_2,
+         Operand(rsp, kNumSavedRegisters * kPointerSize + kPCOnStackSize));

[Toon Verwaest, 2014/01/16 09:50:27]

In that case, this would be "* kRegisterSize" rather than "* kPointerSize".

[haitao.feng, 2014/01/16 11:54:42]

Done.

"make x32.release.check" happens to pass as "push" is translated to "Push" which
is 4-byte pseudo instruction and the high 32-bit of arg_reg_1 and arg_reg_2 is
unused. You are right we should use 8-byte push in this function for safety. A
side note is that currently we only have "__k (keep)" annotation, all the other
annotations are gone. I will introduce pushp, addp, ... to eliminate the __k
annotation.

 
   // Calculate the function address to the first arg.
   __ movq(arg_reg_1, Operand(rsp, kNumSavedRegisters * kPointerSize));