Minor tools/grokdump improvements

tools/grokdump.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 952 matching lines @@
     self.map = map
     self.address = address
 
   def Is(self, cls):
     return isinstance(self, cls)
 
   def Print(self, p):
     p.Print(str(self))
 
   def __str__(self):
+    instance_type = "???"
+    if self.map is not None:
+      instance_type = INSTANCE_TYPES[self.map.instance_type]
     return "HeapObject(%s, %s)" % (self.heap.reader.FormatIntPtr(self.address),
-                                   INSTANCE_TYPES[self.map.instance_type])
+                                   instance_type)
 
   def ObjectField(self, offset):
     field_value = self.heap.reader.ReadUIntPtr(self.address + offset)
     return self.heap.FindObjectOrSmi(field_value)
 
   def SmiField(self, offset):
     field_value = self.heap.reader.ReadUIntPtr(self.address + offset)
     if (field_value & 1) == 0:
       return field_value / 2
     return None
@@ skipping 394 matching lines @@
     p.Print("code:")
     self.code.Print(p)
     if self.code != self.shared.code:
       p.Print("unoptimized code:")
       self.shared.code.Print(p)
     p.Dedent()
     p.Print("}")
 
   def __str__(self):
     inferred_name = ""
-    if self.shared.Is(SharedFunctionInfo):
+    if self.shared is not None and self.shared.Is(SharedFunctionInfo):
       inferred_name = self.shared.inferred_name
-    return "JSFunction(%s, %s)" % \
+    return "JSFunction(%s, %s) " % \
           (self.heap.reader.FormatIntPtr(self.address), inferred_name)
 
   def _GetSource(self):
     source = "?source?"
     start = self.shared.start_position
     end = self.shared.end_position
     if not self.shared.script.Is(Script): return source
     script_source = self.shared.script.source
     if not script_source.Is(String): return source
     if start and end:
@@ skipping 685 matching lines @@
       else:
         self.send_error(404,'File Not Found: %s' % self.path)
 
     except IOError:
       self.send_error(404,'File Not Found: %s' % self.path)
 
     except WebParameterError as e:
       self.send_error(404, 'Web parameter error: %s' % e.message)
 
 
-HTML_REG_FORMAT = "<span class=\"register\"><b>%s</b>:&nbsp;%s</span>\n"
+HTML_REG_FORMAT = "<span class=\"register\"><b>%s</b>:&nbsp;%s</span><br/>\n"
 
 
 class InspectionWebFormatter(object):
   CONTEXT_FULL = 0
   CONTEXT_SHORT = 1
 
   def __init__(self, switches, minidump_name, http_server):
     self.dumpfilename = os.path.split(minidump_name)[1]
     self.encfilename = urllib.urlencode({ 'dump' : self.dumpfilename })
     self.reader = MinidumpReader(switches, minidump_name)
@@ skipping 148 matching lines @@
       self.output_module_details(f, module)
     f.write("</div>")
     self.output_footer(f)
     return
 
   def output_context(self, f, details):
     exception_thread = self.reader.thread_map[self.reader.exception.thread_id]
     f.write("<h3>Exception context</h3>")
     f.write('<div class="code">\n')
     f.write("Thread id: %d" % exception_thread.id)
-    f.write("&nbsp;&nbsp; Exception code: %08X\n" %
+    f.write("&nbsp;&nbsp; Exception code: %08X<br/>\n" %
             self.reader.exception.exception.code)
     if details == InspectionWebFormatter.CONTEXT_FULL:
       if self.reader.exception.exception.parameter_count > 0:
         f.write("&nbsp;&nbsp; Exception parameters: \n")
         for i in xrange(0, self.reader.exception.exception.parameter_count):
           f.write("%08x" % self.reader.exception.exception.information[i])
         f.write("<br><br>\n")
 
     for r in CONTEXT_FOR_ARCH[self.reader.arch]:
       f.write(HTML_REG_FORMAT %
@@ skipping 905 matching lines @@
     try:
       server = InspectionWebServer(PORT_NUMBER, options, args[0])
       print 'Started httpserver on port ' , PORT_NUMBER
       webbrowser.open('http://localhost:%i/summary.html' % PORT_NUMBER)
       server.serve_forever()
     except KeyboardInterrupt:
       print '^C received, shutting down the web server'
       server.socket.close()
   else:
     AnalyzeMinidump(options, args[0])