X64 Crankshaft: Fix bug in pushed registers at safepoints. Fixes issue 1153 ...

src/x64/macro-assembler-x64.cc

Index: src/x64/macro-assembler-x64.cc
===================================================================
--- src/x64/macro-assembler-x64.cc	(revision 6778)
+++ src/x64/macro-assembler-x64.cc	(working copy)
@@ -1442,11 +1442,15 @@
   // r13 is kRootRegister.
   push(r14);
   // r15 is kSmiConstantRegister
-  STATIC_ASSERT(11 == kRegistersPushedByPushad);
+  STATIC_ASSERT(11 == kNumSafepointSavedRegisters);
+  subq(rsp, Immediate(
+      (kNumSafepointRegisters-kNumSafepointSavedRegisters) * kPointerSize));

[Kevin Millikin (Chromium), 2011/02/14 18:42:21]

I guess this needs to be nonnegative.  Maybe that should be asserted, or it goes
without saying?

 }
 
 
 void MacroAssembler::Popad() {
+  addq(rsp, Immediate(
+      (kNumSafepointRegisters-kNumSafepointSavedRegisters) * kPointerSize));
   pop(r14);
   pop(r12);
   pop(r11);
@@ -1462,7 +1466,7 @@
 
 
 void MacroAssembler::Dropad() {
-  addq(rsp, Immediate(kRegistersPushedByPushad * kPointerSize));
+  addq(rsp, Immediate(kNumSafepointRegisters * kPointerSize));
 }