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

src/x64/macro-assembler-x64.cc

 // Copyright 2010 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 1424 matching lines @@
   push(rsi);
   push(rdi);
   push(r8);
   push(r9);
   // r10 is kScratchRegister.
   push(r11);
   push(r12);
   // 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);
   pop(r9);
   pop(r8);
   pop(rdi);
   pop(rsi);
   pop(rbx);
   pop(rdx);
   pop(rcx);
   pop(rax);
 }
 
 
 void MacroAssembler::Dropad() {
-  addq(rsp, Immediate(kRegistersPushedByPushad * kPointerSize));
+  addq(rsp, Immediate(kNumSafepointRegisters * kPointerSize));
 }
 
 
 // Order general registers are pushed by Pushad:
 // rax, rcx, rdx, rbx, rsi, rdi, r8, r9, r11, r12, r14.
 int MacroAssembler::kSafepointPushRegisterIndices[Register::kNumRegisters] = {
     0,
     1,
     2,
     3,
@@ skipping 1025 matching lines @@
   CPU::FlushICache(address_, size_);
 
   // Check that the code was patched as expected.
   ASSERT(masm_.pc_ == address_ + size_);
   ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64