- Annotate instructions that load objects from the ObjectPool or Thread.

runtime/vm/disassembler.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/disassembler.h"
 
 #include "vm/assembler.h"
 #include "vm/globals.h"
 #include "vm/il_printer.h"
+#include "vm/instructions.h"
 #include "vm/json_stream.h"
 #include "vm/log.h"
 #include "vm/os.h"
+#include "vm/code_patcher.h"
 
 
 namespace dart {
 
-void DisassembleToStdout::ConsumeInstruction(char* hex_buffer,
+void DisassembleToStdout::ConsumeInstruction(const Code& code,
+                                             char* hex_buffer,
                                              intptr_t hex_size,
                                              char* human_buffer,
                                              intptr_t human_size,
                                              uword pc) {
   static const int kHexColumnWidth = 23;
   uint8_t* pc_ptr = reinterpret_cast<uint8_t*>(pc);
   THR_Print("%p    %s", pc_ptr, hex_buffer);
   int hex_length = strlen(hex_buffer);
   if (hex_length < kHexColumnWidth) {
     for (int i = kHexColumnWidth - hex_length; i > 0; i--) {
       THR_Print(" ");
     }
   }
   THR_Print("%s", human_buffer);
   THR_Print("\n");
 }
 
 
 void DisassembleToStdout::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
   THR_VPrint(format, args);
   va_end(args);
 }
 
 
-void DisassembleToJSONStream::ConsumeInstruction(char* hex_buffer,
+void DisassembleToJSONStream::ConsumeInstruction(const Code& code,
+                                                 char* hex_buffer,
                                                  intptr_t hex_size,
                                                  char* human_buffer,
                                                  intptr_t human_size,
                                                  uword pc) {
-  // Instructions are represented as three consecutive values in a JSON array.
-  // All three are strings. The first is the address of the instruction,
-  // the second is the hex string of the code, and the final is a human
-  // readable string.
+  // Instructions are represented as four consecutive values in a JSON array.
+  // The first is the address of the instruction, the second is the hex string,
+  // of the code, and the third is a human readable string, and the fourth is
+  // the object loaded by the instruction.
   jsarr_.AddValueF("%" Pp "", pc);
   jsarr_.AddValue(hex_buffer);
   jsarr_.AddValue(human_buffer);
+
+  Object& object = Object::Handle();
+  if (DecodeLoadObjectFromPoolOrThread(pc, code, &object)) {
+    jsarr_.AddValue(object);
+  } else {
+    jsarr_.AddValueNull();  // Not a reference to null.
+  }
 }
 
 
 void DisassembleToJSONStream::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len, format, args);
   va_end(args);
   ASSERT(len == len2);
   for (intptr_t i = 0; i < len; i++) {
     if (p[i] == '\n' || p[i] == '\r') {
       p[i] = ' ';
     }
   }
-  // Instructions are represented as three consecutive values in a JSON array.
-  // All three are strings. Comments only use the third slot. See above comment
-  // for more information.
-  jsarr_.AddValue("");
-  jsarr_.AddValue("");
+  // Instructions are represented as four consecutive values in a JSON array.
+  // Comments only use the third slot. See above comment for more information.
+  jsarr_.AddValueNull();
+  jsarr_.AddValueNull();
   jsarr_.AddValue(p);
+  jsarr_.AddValueNull();
   free(p);
 }
 
 
 class FindAddrVisitor : public FindObjectVisitor {
  public:
   explicit FindAddrVisitor(uword addr)
       : FindObjectVisitor(Isolate::Current()), addr_(addr) { }
   virtual ~FindAddrVisitor() { }
 
@@ skipping 61 matching lines @@
         f.Print("]\n");
         formatter->Print(str);
       }
     }
     int instruction_length;
     DecodeInstruction(hex_buffer,
                       sizeof(hex_buffer),
                       human_buffer,
                       sizeof(human_buffer),
                       &instruction_length, pc);
-    formatter->ConsumeInstruction(hex_buffer,
+    formatter->ConsumeInstruction(code,
+                                  hex_buffer,
                                   sizeof(hex_buffer),
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart