Incremental mode now works for x64. The only difference

src/x64/code-stubs-x64.h

 // Copyright 2011 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 627 matching lines @@
           !rcx.is(object_orig_) &&
           !rcx.is(address_orig_)) {
         masm->pop(rcx);
       }
       if (!scratch0_.is(scratch0_orig_)) masm->pop(scratch0_);
     }
 
     // If we have to call into C then we need to save and restore all caller-
     // saved registers that were not already preserved.
 
-    // The three scratch registers (incl. rcx)
-    // will be restored by other means so we don't bother pushing them here.
+    // The three scratch registers (incl. rcx) will be restored by other means
+    // so we don't bother pushing them here.  Rbx, rbp and r12-15 are callee
+    // save and don't need to be preserved.
     void SaveCallerSaveRegisters(MacroAssembler* masm, SaveFPRegsMode mode) {

[Lasse Reichstein, 2011/06/10 13:55:44]

Is this the C+-calling convention saved registers, or just internal ones.
If the former, the XMM registers differ beetween Win64 ABI and X64 ABI (but
pushing them all is obviously safe).

[Erik Corry, 2011/06/10 21:57:29]

It's a conservative estimate of the intersection of the caller-save registers in
V8 and the caller save registers in C++.

-      masm->int3();  // TODO(gc): Save the caller save registers.
-      if (mode == kSaveFPRegs) {
-        CpuFeatures::Scope scope(SSE2);
-        masm->subq(rsp,
-                   Immediate(kDoubleSize * (XMMRegister::kNumRegisters - 1)));
-        // Save all XMM registers except XMM0.
-        for (int i = XMMRegister::kNumRegisters - 1; i > 0; i--) {
-          XMMRegister reg = XMMRegister::from_code(i);
-          masm->movsd(Operand(rsp, (i - 1) * kDoubleSize), reg);
-        }
-      }
+      masm->PushCallerSaved(mode, scratch0_, scratch1_, rcx);
     }
 
     inline void RestoreCallerSaveRegisters(MacroAssembler*masm,
                                            SaveFPRegsMode mode) {
-      if (mode == kSaveFPRegs) {
-        CpuFeatures::Scope scope(SSE2);
-        // Restore all XMM registers except XMM0.
-        for (int i = XMMRegister::kNumRegisters - 1; i > 0; i--) {
-          XMMRegister reg = XMMRegister::from_code(i);
-          masm->movsd(reg, Operand(rsp, (i - 1) * kDoubleSize));
-        }
-        masm->addq(rsp,
-                   Immediate(kDoubleSize * (XMMRegister::kNumRegisters - 1)));
-      }
-      masm->int3();  // TODO(gc): Restore the caller save registers.
+      masm->PopCallerSaved(mode, scratch0_, scratch1_, rcx);
     }
 
     inline Register object() { return object_; }
     inline Register address() { return address_; }
     inline Register scratch0() { return scratch0_; }
     inline Register scratch1() { return scratch1_; }
 
    private:
     Register object_orig_;
     Register address_orig_;
@@ skipping 14 matching lines @@
         if (candidate.is(r2)) continue;
         if (candidate.is(r3)) continue;
         return candidate;
       }
       UNREACHABLE();
       return no_reg;
     }
     friend class RecordWriteStub;
   };
 
+  enum OnNoNeedToInformIncrementalMarker {
+    kReturnOnNoNeedToInformIncrementalMarker,
+    kRememberedSetOnNoNeedToInformIncrementalMarker

[Lasse Reichstein, 2011/06/10 13:55:44]

Do what to remembered set on no need to inform incremental marker?

[Erik Corry, 2011/06/10 21:57:29]

Update.

+  };
+
   void Generate(MacroAssembler* masm);
   void GenerateIncremental(MacroAssembler* masm);
+  void CheckNeedsToInformIncrementalMarker(
+      MacroAssembler* masm,
+      OnNoNeedToInformIncrementalMarker on_no_need);
+  void InformIncrementalMarker(MacroAssembler* masm);
 
   Major MajorKey() { return RecordWrite; }
 
   int MinorKey() {
     return ObjectBits::encode(object_.code()) |
         ValueBits::encode(value_.code()) |
         AddressBits::encode(address_.code()) |
         RememberedSetActionBits::encode(remembered_set_action_) |
         SaveFPRegsModeBits::encode(save_fp_regs_mode_);
   }
@@ skipping 10 matching lines @@
   RememberedSetAction remembered_set_action_;
   SaveFPRegsMode save_fp_regs_mode_;
   Label slow_;
   RegisterAllocation regs_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_X64_CODE_STUBS_X64_H_