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

src/ia32/lithium-codegen-ia32.cc

 // 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 2015 matching lines @@
   __ mov(result, Operand::Cell(instr->hydrogen()->cell()));
   if (instr->hydrogen()->check_hole_value()) {
     __ cmp(result, Factory::the_hole_value());
     DeoptimizeIf(equal, instr->environment());
   }
 }
 
 
 void LCodeGen::DoStoreGlobal(LStoreGlobal* instr) {
   Register object = ToRegister(instr->temp1());
-  Register scratch = ToRegister(instr->temp2());
+  Register address = ToRegister(instr->temp2());
   Register value = ToRegister(instr->InputAt(0));
   Handle<JSGlobalPropertyCell> cell_handle(instr->hydrogen()->cell());
 
   // If the cell we are storing to contains the hole it could have
   // been deleted from the property dictionary. In that case, we need
   // to update the property details in the property dictionary to mark
   // it as no longer deleted. We deoptimize in that case.
   if (instr->hydrogen()->check_hole_value()) {
     __ cmp(Operand::Cell(cell_handle), Factory::the_hole_value());
     DeoptimizeIf(equal, instr->environment());
   }
 
   // Store the value.
   __ mov(object, Immediate(cell_handle));
-  __ mov(FieldOperand(object, JSGlobalPropertyCell::kValueOffset), value);
+  __ lea(address, FieldOperand(object, JSGlobalPropertyCell::kValueOffset));
+  __ mov(Operand(address, 0), value);
 
-  __ IncrementalMarkingRecordWrite(object,
-                                   value,
-                                   scratch,
-                                   INLINE_SMI_CHECK,
-                                   DESTROY_OBJECT,
-                                   DESTROY_VALUE,
-                                   DESTROY_SCRATCH);
+
+  // Cells are always in the remembered set.
+  __ RecordWrite(object, address, value, OMIT_REMEMBERED_SET, kSaveFPRegs);

[Vyacheslav Egorov (Chromium), 2011/04/06 11:46:40]

mixing two constant naming styles in a single call. maybe we should choose one?

[Erik Corry, 2011/04/06 12:31:28]

Yes.  Postponed.

 }
 
 
 void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) {
   Register context = ToRegister(instr->context());
   Register result = ToRegister(instr->result());
   __ mov(result, ContextOperand(context, instr->slot_index()));
 }
 
 
@@ skipping 801 matching lines @@
            value);
   }
 
   if (instr->hydrogen()->NeedsWriteBarrier()) {
     // Compute address of modified element and store it into key register.
     __ lea(key,
            FieldOperand(elements,
                         key,
                         times_pointer_size,
                         FixedArray::kHeaderSize));
-    __ RecordWrite(elements, key, value, kSaveFPRegs);
+    __ RecordWrite(elements, key, value, EMIT_REMEMBERED_SET, kSaveFPRegs);
   }
 }
 
 
 void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
   ASSERT(ToRegister(instr->context()).is(esi));
   ASSERT(ToRegister(instr->object()).is(edx));
   ASSERT(ToRegister(instr->key()).is(ecx));
   ASSERT(ToRegister(instr->value()).is(eax));
 
@@ skipping 1057 matching lines @@
   ASSERT(osr_pc_offset_ == -1);
   osr_pc_offset_ = masm()->pc_offset();
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32