grokdump: Compute correct call destinations and display them in-place

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 863 matching lines @@
 ADDRESS_RE = re.compile(r"0x[0-9a-fA-F]+")
 
 
 def FormatDisasmLine(start, heap, line):
   line_address = start + line[0]
   stack_slot = heap.stack_map.get(line_address)
   marker = "  "
   if stack_slot:
     marker = "=>"
   code = AnnotateAddresses(heap, line[1])
+
+  # Compute the actual call target which the disassembler is too stupid
+  # to figure out (it adds the call offset to the disassembly offset rather
+  # than the absolute instruction address).
+  if heap.reader.arch == MD_CPU_ARCHITECTURE_X86:
+    if code.startswith("e8"):
+      words = code.split()
+      if len(words) > 6 and words[5] == "call":
+        offset = int(words[4] + words[3] + words[2] + words[1], 16)
+        target = (line_address + offset + 5) & 0xFFFFFFFF
+        code = code.replace(words[6], "0x%08x" % target)
+  # TODO(jkummerow): port this hack to ARM and x64.
+
   return "%s%08x %08x: %s" % (marker, line_address, line[0], code)
 
 
 def AnnotateAddresses(heap, line):
   extra = []
   for m in ADDRESS_RE.finditer(line):
     maybe_address = int(m.group(0), 16)
     object = heap.FindObject(maybe_address)
     if not object: continue
     extra.append(str(object))
@@ skipping 1101 matching lines @@
   options, args = parser.parse_args()
   if os.path.exists(options.objdump):
     disasm.OBJDUMP_BIN = options.objdump
     OBJDUMP_BIN = options.objdump
   else:
     print "Cannot find %s, falling back to default objdump" % options.objdump
   if len(args) != 1:
     parser.print_help()
     sys.exit(1)
   AnalyzeMinidump(options, args[0])