Observatory Display PC descriptors with disassembling

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 10017 matching lines @@
                          PC(i),
                          KindAsStr(i),
                          DeoptId(i),
                          TokenPos(i),
                          TryIndex(i));
   }
   return buffer;
 }
 
 
+void PcDescriptors::PrintToJSONObject(JSONObject* jsobj) const {
+  jsobj->AddProperty("type", JSONType(false));
+  // TODO(johnmccutchan): Generate a valid ID.
+  // PcDescriptors hang off a Code object but do not have a back reference to
+  // generate an ID. Currently we only print PcDescriptors inline with a Code.
+  jsobj->AddProperty("id", "");
+  JSONArray members(jsobj, "members");
+  for (intptr_t i = 0; i < Length(); i++) {
+    JSONObject descriptor(&members);
+    descriptor.AddPropertyF("pc", "%" Px "", PC(i));
+    descriptor.AddProperty("kind", KindAsStr(i));
+    descriptor.AddProperty("deoptId", DeoptId(i));
+    descriptor.AddProperty("tokenPos", TokenPos(i));
+    descriptor.AddProperty("tryIndex", TryIndex(i));
+  }
+}
+
+
 void PcDescriptors::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+  JSONObject jsobj(stream);
+  PrintToJSONObject(&jsobj);
 }
 
 
 // Verify assumptions (in debug mode only).
 // - No two deopt descriptors have the same deoptimization id.
 // - No two ic-call descriptors have the same deoptimization id (type feedback).
 // A function without unique ids is marked as non-optimizable (e.g., because of
 // finally blocks).
 void PcDescriptors::Verify(const Function& function) const {
 #if defined(DEBUG)
@@ skipping 1576 matching lines @@
     func.AddProperty("kind", "Stub");
     func.AddPropertyF("id", "functions/stub-%" Pd "", EntryPoint());
     func.AddProperty("user_name", user_name.ToCString());
     func.AddProperty("name", name.ToCString());
   }
   if (ref) {
     return;
   }
   const Array& array = Array::Handle(ObjectPool());
   jsobj.AddProperty("object_pool", array);
-  JSONArray jsarr(&jsobj, "disassembly");
-  if (is_alive()) {
-    // Only disassemble alive code objects.
-    DisassembleToJSONStream formatter(jsarr);
-    Disassemble(&formatter);
+  {
+    JSONArray jsarr(&jsobj, "disassembly");
+    if (is_alive()) {
+      // Only disassemble alive code objects.
+      DisassembleToJSONStream formatter(jsarr);
+      Disassemble(&formatter);
+    }
+  }
+  const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
+  if (!descriptors.IsNull()) {
+    JSONObject desc(&jsobj, "descriptors");
+    descriptors.PrintToJSONObject(&desc);
   }
 }
 
 
 uword Code::GetPatchCodePc() const {
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   return descriptors.GetPcForKind(PcDescriptors::kPatchCode);
 }
 
 
@@ skipping 1762 matching lines @@
 
 
 const char* AbstractType::ToCString() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return "AbstractType";
 }
 
 
 void AbstractType::PrintToJSONStream(JSONStream* stream, bool ref) const {
+  if (IsNull()) {
+    Instance::PrintToJSONStream(stream, ref);
+    return;
+  }
   UNREACHABLE();
 }
 
 
 RawType* Type::NullType() {
   return Isolate::Current()->object_store()->null_type();
 }
 
 
 RawType* Type::DynamicType() {
@@ skipping 5208 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart