Extend assembler with ability to produce comments for the generated code.

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"
 #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 disassembly");

[srdjan, 2012/05/17 17:22:08]

and code.

[Vyacheslav Egorov (Google), 2012/05/17 21:16:27]

Done.

 
 
 class DirectCallRelocation : public AssemblerFixup {
  public:
   void Process(const MemoryRegion& region, int position) {
     // Direct calls are relative to the following instruction on x86.
     int32_t pointer = region.Load<int32_t>(position);
     int32_t delta = region.start() + position + sizeof(int32_t);
     region.Store<int32_t>(position, pointer - delta);
   }
@@ skipping 1525 matching lines @@
 
 void Assembler::EmitGenericShift(int rm,
                                  Register operand,
                                  Register shifter) {
   AssemblerBuffer::EnsureCapacity ensured(&buffer_);
   ASSERT(shifter == ECX);
   EmitUint8(0xD3);
   EmitOperand(rm, Operand(operand));
 }
 
+
+void Assembler::Comment(const char* comment) {
+  if (FLAG_code_comments) {
+    comments_.Add(new CodeComment(buffer_.GetPosition(),
+                                  String::Handle(String::New(comment))));
+  }
+}
+
+
+CodeComments Assembler::GetComments() {
+  CodeComments comments = CodeComments::New(comments_.length());

[srdjan, 2012/05/17 17:22:08]

Make CodeComments ZoneObject and return "const CodeComments&" (not modifiable).

[Vyacheslav Egorov (Google), 2012/05/17 21:16:27]

Done.

+
+  for (int i = 0; i < comments_.length(); i++) {

[srdjan, 2012/05/17 17:22:08]

intptr_t

[Vyacheslav Egorov (Google), 2012/05/17 21:16:27]

Done.

+    comments.SetPCAt(i, comments_[i]->pc());
+    comments.SetCommentAt(i, comments_[i]->comment());
+  }
+
+  return comments;
+}
+
+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32