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

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 196 matching lines @@
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::codefinalizer_timer,
                        isolate);
       const Function& function = parsed_function.function();
       const Code& code = Code::Handle(Code::FinalizeCode(function, &assembler));
       code.set_is_optimized(optimized);
       graph_compiler.FinalizePcDescriptors(code);
       graph_compiler.FinalizeStackmaps(code);
       graph_compiler.FinalizeVarDescriptors(code);
       graph_compiler.FinalizeExceptionHandlers(code);
+      graph_compiler.FinalizeComments(code);
       if (optimized) {
         function.SetCode(code);
         CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
         if (FLAG_trace_compiler) {
           OS::Print("--> patching entry 0x%x\n",
                     Code::Handle(function.unoptimized_code()).EntryPoint());
         }
       } else {
         function.set_unoptimized_code(code);
         function.SetCode(code);
@@ skipping 42 matching lines @@
       code_gen.GenerateCode();
     }
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::codefinalizer_timer);
       Code& code = Code::Handle(Code::FinalizeCode(function, &assembler));
       code.set_is_optimized(true);
       code_gen.FinalizePcDescriptors(code);
       code_gen.FinalizeStackmaps(code);
       code_gen.FinalizeExceptionHandlers(code);
+      code_gen.FinalizeComments(code);
       function.SetCode(code);
       CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
     }
     if (FLAG_trace_compiler) {
       OS::Print("--> patching entry 0x%x\n",
                 Code::Handle(function.unoptimized_code()).EntryPoint());
     }
   } else {
     // Compile unoptimized code.
     ASSERT(!function.HasCode());
     // Compiling first time.
     CodeGenerator code_gen(&assembler, parsed_function);
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphcompiler_timer);
       code_gen.GenerateCode();
     }
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::codefinalizer_timer);
       const Code& code = Code::Handle(Code::FinalizeCode(function, &assembler));
       code.set_is_optimized(false);
       code_gen.FinalizePcDescriptors(code);
       code_gen.FinalizeStackmaps(code);
       code_gen.FinalizeVarDescriptors(code);
       code_gen.FinalizeExceptionHandlers(code);
+      code_gen.FinalizeComments(code);
       function.set_unoptimized_code(code);
       function.SetCode(code);
       ASSERT(CodePatcher::CodeIsPatchable(code));
     }
   }
 }
 
 static void CompileParsedFunctionHelper(
     const ParsedFunction& parsed_function, bool optimized) {
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
@@ skipping 50 matching lines @@
     }
     if (FLAG_disassemble) {
       const char* function_fullname = function.ToFullyQualifiedCString();
       OS::Print("Code for %sfunction '%s' {\n",
                 optimized ? "optimized " : "",
                 function_fullname);
       const Code& code = Code::Handle(function.CurrentCode());
       const Instructions& instructions =
           Instructions::Handle(code.instructions());
       uword start = instructions.EntryPoint();
-      Disassembler::Disassemble(start, start + instructions.size());
+      Disassembler::Disassemble(start,
+                                start + instructions.size(),
+                                code.comments());
       OS::Print("}\n");
       OS::Print("Pointer offsets for function: {\n");
       for (intptr_t i = 0; i < code.pointer_offsets_length(); i++) {
         const uword addr = code.GetPointerOffsetAt(i) + code.EntryPoint();
         Object& obj = Object::Handle();
         obj = *reinterpret_cast<RawObject**>(addr);
         OS::Print(" %d : 0x%x '%s'\n",
                   code.GetPointerOffsetAt(i), addr, obj.ToCString());
       }
       OS::Print("}\n");
@@ skipping 147 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart