- Implement the filtering store barrier on x64.

runtime/vm/assembler_ia32.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 1366 matching lines @@
       buffer_.EmitObject(object);
     } else {
       EmitUint8(0x81);
       EmitOperand(7, Operand(reg));
       buffer_.EmitObject(object);
     }
   }
 }
 
 
+void Assembler::StoreIntoObjectFilter(Register object,
+                                      Register value,
+                                      Label* no_update) {
+  // Check that 'value' is a new object.  Store buffer updates are not
+  // required when storing a smi or an old object.
+  testl(value, Immediate(kNewObjectAlignmentOffset | kHeapObjectTag));
+  j(PARITY_ODD, no_update, Assembler::kNearJump);
+  j(ZERO, no_update, Assembler::kNearJump);
+  // Check that 'object' is an old object.  A store buffer update is
+  // not required when storing into a new object.
+  testl(object, Immediate(kNewObjectAlignmentOffset));
+  j(NOT_ZERO, no_update, Assembler::kNearJump);
+}
+
+
 void Assembler::StoreIntoObject(Register object,
                                 const FieldAddress& dest,
                                 Register value) {
   movl(dest, value);
   Label done;
-  // Check that 'value' is a new object.  Store buffer updates are not
-  // required when storing a smi or an old object.
-  testl(value, Immediate(kNewObjectAlignmentOffset | kHeapObjectTag));
-  j(PARITY_ODD, &done, Assembler::kNearJump);
-  j(ZERO, &done, Assembler::kNearJump);
-  // Check that 'object' is an old object.  A store buffer update is
-  // not required when storing into a new object.
-  testl(object, Immediate(kNewObjectAlignmentOffset));
-  j(NOT_ZERO, &done, Assembler::kNearJump);
+  StoreIntoObjectFilter(object, value, &done);
   // A store buffer update is required.
   pushl(EAX);  // Preserve EAX.
   leal(EAX, dest);
   call(&StubCode::UpdateStoreBufferLabel());
   popl(EAX);  // Restore EAX.
   Bind(&done);
 }
 
 
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          Register value) {
   movl(dest, value);
-#if 0  // TODO(cshapiro) Turn this back on after it is fixed defined(DEBUG).
+#if defined(DEBUG)
   Label done;
-  testl(value, Immediate(kNewObjectAlignmentOffset | kHeapObjectTag));
-  j(PARITY_ODD, &done, Assembler::kNearJump);
-  testl(object, Immediate(kNewObjectAlignmentOffset));
-  j(NOT_ZERO, &done, Assembler::kNearJump);
+  StoreIntoObjectFilter(object, value, &done);
   Stop("Store buffer update is required");
   Bind(&done);
-#endif
+#endif  // defined(DEBUG)
   // No store buffer update.
 }
 
 
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          const Object& value) {
   if (value.IsSmi()) {
     movl(dest, Immediate(reinterpret_cast<int32_t>(value.raw())));
   } else {
@@ skipping 293 matching lines @@
     comments.SetCommentAt(i, comments_[i]->comment());
   }
 
   return comments;
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32