Support slots recording for compaction during incremental marking.

src/ia32/code-stubs-ia32.h

 // 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 526 matching lines @@
       : object_(object),
         value_(value),
         address_(address),
         remembered_set_action_(remembered_set_action),
         save_fp_regs_mode_(fp_mode),
         regs_(object,   // An input reg.
               address,  // An input reg.
               value) {  // One scratch reg.
   }
 
-  static const byte kTwoByteNopInstruction = 0x3c;          // Cmpb al, #imm8.
-  static const byte kSkipNonIncrementalPartInstruction = 0xeb;  // Jmp #imm8.
+  static const byte kTwoByteNopInstruction = 0x3c;  // Cmpb al, #imm8.
+  static const byte kTwoByteJumpInstruction = 0xeb;  // Jmp #imm8.
 
-  static byte GetInstruction(bool enable) {
-    // Can't use ternary operator here, because gcc makes an undefined
-    // reference to a static const int.
-    if (enable) {
-      return kSkipNonIncrementalPartInstruction;
+  static const byte kFiveByteNopInstruction = 0x3d;  // Cmpl al, #imm32.

[Erik Corry, 2011/07/04 11:04:11]

You are sure it is al and not eax?

[Vyacheslav Egorov (Chromium), 2011/08/05 12:50:28]

Done.

+  static const byte kFiveByteJumpInstruction = 0xe9;  // Jmp #imm32.
+
+  static void Patch(Code* stub, bool incremental, bool compaction) {
+    ASSERT(!compaction || incremental);

[Erik Corry, 2011/07/04 11:04:11]

It would be very good to assert that the old opcode was one of the ones we
expect to see.

[Vyacheslav Egorov (Chromium), 2011/08/05 12:50:28]

Done.

+    if (incremental) {
+      if (compaction) {
+        stub->instruction_start()[0] = kTwoByteNopInstruction;
+        stub->instruction_start()[2] = kFiveByteJumpInstruction;
+      } else {
+        stub->instruction_start()[0] = kTwoByteJumpInstruction;
+      }
     } else {
-      return kTwoByteNopInstruction;
+      stub->instruction_start()[0] = kTwoByteNopInstruction;
+      stub->instruction_start()[2] = kFiveByteNopInstruction;
     }
   }
 
-  static void Patch(Code* stub, bool enable) {
-    ASSERT(*stub->instruction_start() == GetInstruction(!enable));
-    *stub->instruction_start() = GetInstruction(enable);
-  }
-
  private:
   // This is a helper class for freeing up 3 scratch registers, where the third
   // is always ecx (needed for shift operations).  The input is two registers
   // that must be preserved and one scratch register provided by the caller.
   class RegisterAllocation {
    public:
     RegisterAllocation(Register object,
                        Register address,
                        Register scratch0)
         : object_orig_(object),
@@ skipping 128 matching lines @@
       return no_reg;
     }
     friend class RecordWriteStub;
   };
 
   enum OnNoNeedToInformIncrementalMarker {
     kReturnOnNoNeedToInformIncrementalMarker,
     kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
   };
 
+  enum EvacuationState {
+    kWithEvacuationCandidates,
+    kWithoutEvacuationCandidates
+  };
+
   void Generate(MacroAssembler* masm);
-  void GenerateIncremental(MacroAssembler* masm);
+  void GenerateIncremental(MacroAssembler* masm,
+                           EvacuationState evacuation_state);
   void CheckNeedsToInformIncrementalMarker(
       MacroAssembler* masm,
-      OnNoNeedToInformIncrementalMarker on_no_need);
-  void InformIncrementalMarker(MacroAssembler* masm);
+      OnNoNeedToInformIncrementalMarker on_no_need,
+      EvacuationState evacuation_state);
+  void InformIncrementalMarker(MacroAssembler* masm,
+                               EvacuationState evacuation_state);
 
   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 50 matching lines @@
                                  Register scratch1,
                                  bool load_elements_from_receiver,
                                  Label* key_not_smi,
                                  Label* value_not_smi,
                                  Label* not_pixel_array,
                                  Label* out_of_range);
 
 } }  // namespace v8::internal
 
 #endif  // V8_IA32_CODE_STUBS_IA32_H_