Combine the incremental-marking write barrier and the remembered-set...

src/ia32/macro-assembler-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 35 matching lines @@
 };
 
 // Convenience for platform-independent signatures.  We do not normally
 // distinguish memory operands from other operands on ia32.
 typedef Operand MemOperand;
 
 // Forward declaration.
 class JumpTarget;
 class PostCallGenerator;
 
+enum EmitRememberedSet { EMIT_REMEMBERED_SET, OMIT_REMEMBERED_SET };
 enum SmiCheck { INLINE_SMI_CHECK, OMIT_SMI_CHECK };
 enum ObjectMode { PRESERVE_OBJECT, DESTROY_OBJECT };
 enum ValueMode { PRESERVE_VALUE, DESTROY_VALUE };
-enum ScratchMode { PRESERVE_SCRATCH, DESTROY_SCRATCH };
+enum AddressMode { PRESERVE_ADDRESS, DESTROY_ADDRESS };
 
 // MacroAssembler implements a collection of frequently used macros.
 class MacroAssembler: public Assembler {
  public:
   MacroAssembler(void* buffer, int size);
 
   // ---------------------------------------------------------------------------
   // GC Support
 
   void IncrementalMarkingRecordWriteHelper(Register object,
                                            Register value,
-                                           Register scratch,
-                                           ObjectMode object_mode,
-                                           ValueMode value_mode,
-                                           ScratchMode scratch_mode);
-
-
-  void IncrementalMarkingRecordWrite(Register object,
-                                     Register value,
-                                     Register scratch,
-                                     SmiCheck smi_check,
-                                     ObjectMode object_mode,
-                                     ValueMode value_mode,
-                                     ScratchMode scratch_mode);
-
+                                           Register address);
 
   // For page containing |object| mark region covering |addr| dirty.
-  // RecordWriteHelper only works if the object is not in new
+  // RememberedSetHelper only works if the object is not in new
   // space.
-  void RecordWriteHelper(Register object,
-                         Register addr,
-                         Register scratch,
-                         SaveFPRegsMode save_fp);
+  void RememberedSetHelper(Register object,
+                           Register addr,
+                           Register scratch,
+                           SaveFPRegsMode save_fp);
 
   // Check if object is in new space.
   // scratch can be object itself, but it will be clobbered.
   template <typename LabelType>
   void InNewSpace(Register object,
                   Register scratch,
                   Condition cc,  // equal for new space, not_equal otherwise.
                   LabelType* branch);
 
   // For page containing |object| mark region covering [object+offset]
@@ skipping 10 matching lines @@
                    SaveFPRegsMode save_fp);
 
   // For page containing |object| mark region covering |address|
   // dirty. |object| is the object being stored into, |value| is the
   // object being stored. All registers are clobbered by the
   // operation. RecordWrite filters out smis so it does not update the
   // write barrier if the value is a smi.
   void RecordWrite(Register object,
                    Register address,
                    Register value,
-                   SaveFPRegsMode save_fp);
+                   EmitRememberedSet emit_remembered_set,
+                   SaveFPRegsMode save_fp,
+                   SmiCheck smi_check = INLINE_SMI_CHECK);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // ---------------------------------------------------------------------------
   // Debugger Support
 
   void DebugBreak();
 #endif
 
   // ---------------------------------------------------------------------------
   // Activation frames
@@ skipping 680 matching lines @@
   }                                                                       \
   masm->
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_IA32_MACRO_ASSEMBLER_IA32_H_