Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/assembler_ia32.cc

 // Copyright (c) 2012, 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/code_generator.h"
 #include "vm/heap.h"
+#include "vm/heap_trace.h"
 #include "vm/memory_region.h"
 #include "vm/runtime_entry.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_stop_message, true, "Print stop message.");
 DEFINE_FLAG(bool, code_comments, false,
             "Include comments into code and disassembly");
 DEFINE_FLAG(bool, use_sse41, true, "Use SSE 4.1 if available");
@@ skipping 1593 matching lines @@
       (kNewObjectAlignmentOffset >> 1) + kHeapObjectTag +
       kOldObjectAlignmentOffset + kHeapObjectTag));
   j(NOT_ZERO, no_update, Assembler::kNearJump);
 }
 
 
 void Assembler::StoreIntoObject(Register object,
                                 const FieldAddress& dest,
                                 Register value) {
   ASSERT(object != value);
+  TraceStoreIntoObject(object, dest, value);
   movl(dest, value);
   Label done;
   StoreIntoObjectFilter(object, value, &done);
   // A store buffer update is required.
   if (value != EAX) pushl(EAX);  // Preserve EAX.
   leal(EAX, dest);
   call(&StubCode::UpdateStoreBufferLabel());
   if (value != EAX) popl(EAX);  // Restore EAX.
   Bind(&done);
 }
 
 
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          Register value) {
+  TraceStoreIntoObject(object, dest, value);
   movl(dest, value);
 #if defined(DEBUG)
   Label done;
   pushl(value);
   StoreIntoObjectFilter(object, value, &done);
   Stop("Store buffer update is required");
   Bind(&done);
   popl(value);
 #endif  // defined(DEBUG)
   // No store buffer update.
 }
 
 
 void Assembler::StoreIntoObjectNoBarrier(Register object,
                                          const FieldAddress& dest,
                                          const Object& value) {
+  TraceStoreIntoObject(object, dest, value);
   if (value.IsSmi()) {
     movl(dest, Immediate(reinterpret_cast<int32_t>(value.raw())));
   } else {
     ASSERT(value.IsOld());
     AssemblerBuffer::EnsureCapacity ensured(&buffer_);
     EmitUint8(0xC7);
     EmitOperand(0, dest);
     buffer_.EmitObject(value);
   }
   // No store buffer update.
 }
 
 
+void Assembler::TraceStoreIntoObject(Register object,
+                                     const FieldAddress& dest,
+                                     Register value) {
+  if (HeapTrace::is_enabled()) {
+    pushal();
+    EnterCallRuntimeFrame(3 * kWordSize);
+    movl(Address(ESP, 0 * kWordSize), object);
+    leal(EAX, dest);
+    movl(Address(ESP, 1 * kWordSize), EAX);
+    movl(Address(ESP, 2 * kWordSize), value);
+    CallRuntime(kHeapTraceStoreRuntimeEntry);
+    LeaveCallRuntimeFrame();
+    popal();
+  }
+}
+
+
+void Assembler::TraceStoreIntoObject(Register object,
+                                     const FieldAddress& dest,
+                                     const Object& value) {
+  if (HeapTrace::is_enabled()) {
+    pushal();
+    EnterCallRuntimeFrame(3 * kWordSize);
+    movl(Address(ESP, 0 * kWordSize), object);
+    leal(EAX, dest);
+    movl(Address(ESP, 1 * kWordSize), EAX);
+    movl(Address(ESP, 2 * kWordSize),
+         Immediate(reinterpret_cast<int32_t>(value.raw())));

[siva, 2012/12/05 16:06:40]

This is not right, the raw value is directly being written into the instruction.
Not sure how this works.

Should be:
LoadObject(EAX, value);
movl(Address(ESP, 2 * kWordSize), EAX);

[cshapiro, 2012/12/08 03:23:08]

This method turns out to not be needed so I will be avoiding this issue all
together by removing this method and its calls.

+    CallRuntime(kHeapTraceStoreRuntimeEntry);
+    LeaveCallRuntimeFrame();
+    popal();
+  }
+}
+
+
 void Assembler::LoadDoubleConstant(XmmRegister dst, double value) {
   // TODO(5410843): Need to have a code constants table.
   int64_t constant = bit_cast<int64_t, double>(value);
   pushl(Immediate(Utils::High32Bits(constant)));
   pushl(Immediate(Utils::Low32Bits(constant)));
   movsd(dst, Address(ESP, 0));
   addl(ESP, Immediate(2 * kWordSize));
 }
 
 
@@ skipping 358 matching lines @@
 
 const char* Assembler::XmmRegisterName(XmmRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32