Skip to content

V
V8
Commit 031a04c6 authored by cbruni's avatar cbruni Committed by Commit bot
Browse files
Options

[tools] Reduce grokdump output size 

Minidumps have gotten bigger stack ranges leading to long load times when using
grokdump's web interface. A major factor seems to be the output size of the
generated table. Using shorter class names and avoiding quotes for most
attributes we can get a significant size reduction.

BUG=

Review-Url: https://codereview.chromium.org/2352303002
Cr-Commit-Position: refs/heads/master@{#39589}
parent 698bbe41
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 81 deletions
tools/grokdump.py
View file @ 031a04c6
...@@ -1745,10 +1745,12 @@ class InspectionInfo(object): ...@@ -1745,10 +1745,12 @@ class InspectionInfo(object):
frame_pointer = self.reader.ExceptionFP() frame_pointer = self.reader.ExceptionFP()
self.styles[frame_pointer] = "frame" self.styles[frame_pointer] = "frame"
for slot in xrange(stack_top, stack_bottom, self.reader.PointerSize()): for slot in xrange(stack_top, stack_bottom, self.reader.PointerSize()):
self.styles[slot] = "stackaddress" # stack address
self.styles[slot] = "sa"
for slot in xrange(stack_top, stack_bottom, self.reader.PointerSize()): for slot in xrange(stack_top, stack_bottom, self.reader.PointerSize()):
maybe_address = self.reader.ReadUIntPtr(slot) maybe_address = self.reader.ReadUIntPtr(slot)
self.styles[maybe_address] = "stackval" # stack value
self.styles[maybe_address] = "sv"
if slot == frame_pointer: if slot == frame_pointer:
self.styles[slot] = "frame" self.styles[slot] = "frame"
frame_pointer = maybe_address frame_pointer = maybe_address
...@@ -1760,7 +1762,7 @@ class InspectionInfo(object): ...@@ -1760,7 +1762,7 @@ class InspectionInfo(object):
def get_style_class_string(self, address): def get_style_class_string(self, address):
style = self.get_style_class(address) style = self.get_style_class(address)
if style != None: if style != None:
return " class=\"%s\" " % style return " class=%s " % style
else: else:
return "" return ""
...@@ -1875,11 +1877,13 @@ WEB_HEADER = """ ...@@ -1875,11 +1877,13 @@ WEB_HEADER = """
.dmptable { .dmptable {
border-collapse : collapse; border-collapse : collapse;
border-spacing : 0px; border-spacing : 0px;
table-layout: fixed;
} }
.codedump { .codedump {
border-collapse : collapse; border-collapse : collapse;
border-spacing : 0px; border-spacing : 0px;
table-layout: fixed;
} }
.addrcomments { .addrcomments {
...@@ -1932,11 +1936,11 @@ input { ...@@ -1932,11 +1936,11 @@ input {
background-color : cyan; background-color : cyan;
} }
.stackaddress { .stackaddress, .sa {
background-color : LightGray; background-color : LightGray;
} }
.stackval { .stackval, .sv {
background-color : LightCyan; background-color : LightCyan;
} }
...@@ -1944,16 +1948,17 @@ input { ...@@ -1944,16 +1948,17 @@ input {
background-color : cyan; background-color : cyan;
} }
.commentinput { .commentinput, .ci {
width : 20em; width : 20em;
} }
a.nodump:visited { /* a.nodump */
a.nd:visited {
color : black; color : black;
text-decoration : none; text-decoration : none;
} }
a.nodump:link { a.nd:link {
color : black; color : black;
text-decoration : none; text-decoration : none;
} }
...@@ -1984,6 +1989,7 @@ function comment() { ...@@ -1984,6 +1989,7 @@ function comment() {
send_comment(s.substring(index + address_len), event.srcElement.value); send_comment(s.substring(index + address_len), event.srcElement.value);
} }
} }
var c = comment;
function send_comment(address, comment) { function send_comment(address, comment) {
xmlhttp = new XMLHttpRequest(); xmlhttp = new XMLHttpRequest();
...@@ -2038,7 +2044,7 @@ function onpage(kind, address) { ...@@ -2038,7 +2044,7 @@ function onpage(kind, address) {
<body> <body>
<div class="header"> <div class="header">
<form class="navigation" action="search.html"> <form class="navigation" action=/search.html">
<a href="summary.html?%(query_dump)s">Context info</a>&nbsp;&nbsp;&nbsp; <a href="summary.html?%(query_dump)s">Context info</a>&nbsp;&nbsp;&nbsp;
<a href="info.html?%(query_dump)s">Dump info</a>&nbsp;&nbsp;&nbsp; <a href="info.html?%(query_dump)s">Dump info</a>&nbsp;&nbsp;&nbsp;
<a href="modules.html?%(query_dump)s">Modules</a>&nbsp;&nbsp;&nbsp; <a href="modules.html?%(query_dump)s">Modules</a>&nbsp;&nbsp;&nbsp;
...@@ -2105,7 +2111,7 @@ class InspectionWebHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -2105,7 +2111,7 @@ class InspectionWebHandler(BaseHTTPServer.BaseHTTPRequestHandler):
elif parsedurl.path == "/modules.html": elif parsedurl.path == "/modules.html":
self.send_success_html_headers() self.send_success_html_headers()
self.formatter(query_components).output_modules(self.wfile) self.formatter(query_components).output_modules(self.wfile)
elif parsedurl.path == "/search.html": elif parsedurl.path == "/search.html" or parsedurl.path == "/s":
address = query_components.get("val", []) address = query_components.get("val", [])
if len(address) != 1: if len(address) != 1:
self.send_error(404, "Invalid params") self.send_error(404, "Invalid params")
...@@ -2235,8 +2241,8 @@ class InspectionWebFormatter(object): ...@@ -2235,8 +2241,8 @@ class InspectionWebFormatter(object):
straddress = "0x" + self.reader.FormatIntPtr(maybeaddress) straddress = "0x" + self.reader.FormatIntPtr(maybeaddress)
style_class = "" style_class = ""
if not self.reader.IsValidAddress(maybeaddress): if not self.reader.IsValidAddress(maybeaddress):
style_class = " class=\"nodump\"" style_class = "class=nd"
return ("<a %s href=\"search.html?%s&amp;val=%s\">%s</a>" % return ("<a %s href=s?%s&amp;val=%s>%s</a>" %
(style_class, self.encfilename, straddress, straddress)) (style_class, self.encfilename, straddress, straddress))
def output_header(self, f): def output_header(self, f):
...@@ -2268,14 +2274,14 @@ class InspectionWebFormatter(object): ...@@ -2268,14 +2274,14 @@ class InspectionWebFormatter(object):
def output_info(self, f): def output_info(self, f):
self.output_header(f) self.output_header(f)
f.write("<h3>Dump info</h3>\n") f.write("<h3>Dump info</h3>")
f.write("Description: ") f.write("Description: ")
self.server.output_dump_desc_field(f, self.dumpfilename) self.server.output_dump_desc_field(f, self.dumpfilename)
f.write("<br>\n") f.write("<br>")
f.write("Filename: ") f.write("Filename: ")
f.write("<span class=\"code\">%s</span><br>\n" % (self.dumpfilename)) f.write("<span class=\"code\">%s</span><br>" % (self.dumpfilename))
dt = datetime.datetime.fromtimestamp(self.reader.header.time_date_stampt) dt = datetime.datetime.fromtimestamp(self.reader.header.time_date_stampt)
f.write("Timestamp: %s<br>\n" % dt.strftime('%Y-%m-%d %H:%M:%S')) f.write("Timestamp: %s<br>" % dt.strftime('%Y-%m-%d %H:%M:%S'))
self.output_context(f, InspectionWebFormatter.CONTEXT_FULL) self.output_context(f, InspectionWebFormatter.CONTEXT_FULL)
self.output_address_ranges(f) self.output_address_ranges(f)
self.output_footer(f) self.output_footer(f)
...@@ -2286,22 +2292,22 @@ class InspectionWebFormatter(object): ...@@ -2286,22 +2292,22 @@ class InspectionWebFormatter(object):
def print_region(_reader, start, size, _location): def print_region(_reader, start, size, _location):
regions[start] = size regions[start] = size
self.reader.ForEachMemoryRegion(print_region) self.reader.ForEachMemoryRegion(print_region)
f.write("<h3>Available memory regions</h3>\n") f.write("<h3>Available memory regions</h3>")
f.write('<div class="code">') f.write('<div class="code">')
f.write("<table class=\"regions\">\n") f.write("<table class=\"regions\">")
f.write("<thead><tr>") f.write("<thead><tr>")
f.write("<th>Start address</th>") f.write("<th>Start address</th>")
f.write("<th>End address</th>") f.write("<th>End address</th>")
f.write("<th>Number of bytes</th>") f.write("<th>Number of bytes</th>")
f.write("</tr></thead>\n") f.write("</tr></thead>")
for start in sorted(regions): for start in sorted(regions):
size = regions[start] size = regions[start]
f.write("<tr>") f.write("<tr>")
f.write("<td>%s</td>" % self.format_address(start)) f.write("<td>%s</td>" % self.format_address(start))
f.write("<td>&nbsp;%s</td>" % self.format_address(start + size)) f.write("<td>&nbsp;%s</td>" % self.format_address(start + size))
f.write("<td>&nbsp;%d</td>" % size) f.write("<td>&nbsp;%d</td>" % size)
f.write("</tr>\n") f.write("</tr>")
f.write("</table>\n") f.write("</table>")
f.write('</div>') f.write('</div>')
return return
...@@ -2311,19 +2317,19 @@ class InspectionWebFormatter(object): ...@@ -2311,19 +2317,19 @@ class InspectionWebFormatter(object):
module.version_info.dwFileVersionLS) module.version_info.dwFileVersionLS)
product_version = GetVersionString(module.version_info.dwProductVersionMS, product_version = GetVersionString(module.version_info.dwProductVersionMS,
module.version_info.dwProductVersionLS) module.version_info.dwProductVersionLS)
f.write("<br>&nbsp;&nbsp;\n") f.write("<br>&nbsp;&nbsp;")
f.write("base: %s" % self.reader.FormatIntPtr(module.base_of_image)) f.write("base: %s" % self.reader.FormatIntPtr(module.base_of_image))
f.write("<br>&nbsp;&nbsp;\n") f.write("<br>&nbsp;&nbsp;")
f.write(" end: %s" % self.reader.FormatIntPtr(module.base_of_image + f.write(" end: %s" % self.reader.FormatIntPtr(module.base_of_image +
module.size_of_image)) module.size_of_image))
f.write("<br>&nbsp;&nbsp;\n") f.write("<br>&nbsp;&nbsp;")
f.write(" file version: %s" % file_version) f.write(" file version: %s" % file_version)
f.write("<br>&nbsp;&nbsp;\n") f.write("<br>&nbsp;&nbsp;")
f.write(" product version: %s" % product_version) f.write(" product version: %s" % product_version)
f.write("<br>&nbsp;&nbsp;\n") f.write("<br>&nbsp;&nbsp;")
time_date_stamp = datetime.datetime.fromtimestamp(module.time_date_stamp) time_date_stamp = datetime.datetime.fromtimestamp(module.time_date_stamp)
f.write(" timestamp: %s" % time_date_stamp) f.write(" timestamp: %s" % time_date_stamp)
f.write("<br>\n"); f.write("<br>");
def output_modules(self, f): def output_modules(self, f):
self.output_header(f) self.output_header(f)
...@@ -2337,16 +2343,16 @@ class InspectionWebFormatter(object): ...@@ -2337,16 +2343,16 @@ class InspectionWebFormatter(object):
def output_context(self, f, details): def output_context(self, f, details):
exception_thread = self.reader.thread_map[self.reader.exception.thread_id] exception_thread = self.reader.thread_map[self.reader.exception.thread_id]
f.write("<h3>Exception context</h3>") f.write("<h3>Exception context</h3>")
f.write('<div class="code">\n') f.write('<div class="code">')
f.write("Thread id: %d" % exception_thread.id) f.write("Thread id: %d" % exception_thread.id)
f.write("&nbsp;&nbsp; Exception code: %08X<br/>\n" % f.write("&nbsp;&nbsp; Exception code: %08X<br/>" %
self.reader.exception.exception.code) self.reader.exception.exception.code)
if details == InspectionWebFormatter.CONTEXT_FULL: if details == InspectionWebFormatter.CONTEXT_FULL:
if self.reader.exception.exception.parameter_count > 0: if self.reader.exception.exception.parameter_count > 0:
f.write("&nbsp;&nbsp; Exception parameters: \n") f.write("&nbsp;&nbsp; Exception parameters: ")
for i in xrange(0, self.reader.exception.exception.parameter_count): for i in xrange(0, self.reader.exception.exception.parameter_count):
f.write("%08x" % self.reader.exception.exception.information[i]) f.write("%08x" % self.reader.exception.exception.information[i])
f.write("<br><br>\n") f.write("<br><br>")
for r in CONTEXT_FOR_ARCH[self.reader.arch]: for r in CONTEXT_FOR_ARCH[self.reader.arch]:
f.write(HTML_REG_FORMAT % f.write(HTML_REG_FORMAT %
...@@ -2357,7 +2363,7 @@ class InspectionWebFormatter(object): ...@@ -2357,7 +2363,7 @@ class InspectionWebFormatter(object):
else: else:
f.write("<b>eflags</b>: %s" % f.write("<b>eflags</b>: %s" %
bin(self.reader.exception_context.eflags)[2:]) bin(self.reader.exception_context.eflags)[2:])
f.write('</div>\n') f.write('</div>')
return return
def align_down(self, a, size): def align_down(self, a, size):
...@@ -2394,7 +2400,7 @@ class InspectionWebFormatter(object): ...@@ -2394,7 +2400,7 @@ class InspectionWebFormatter(object):
highlight_address, desc): highlight_address, desc):
region = self.reader.FindRegion(highlight_address) region = self.reader.FindRegion(highlight_address)
if region is None: if region is None:
f.write("<h3>Address 0x%x not found in the dump.</h3>\n" % f.write("<h3>Address 0x%x not found in the dump.</h3>" %
(highlight_address)) (highlight_address))
return return
size = self.heap.PointerSize() size = self.heap.PointerSize()
...@@ -2415,10 +2421,10 @@ class InspectionWebFormatter(object): ...@@ -2415,10 +2421,10 @@ class InspectionWebFormatter(object):
(self.encfilename, highlight_address)) (self.encfilename, highlight_address))
f.write("<h3>%s 0x%x - 0x%x, " f.write("<h3>%s 0x%x - 0x%x, "
"highlighting <a href=\"#highlight\">0x%x</a> %s</h3>\n" % "highlighting <a href=\"#highlight\">0x%x</a> %s</h3>" %
(desc, start_address, end_address, highlight_address, expand)) (desc, start_address, end_address, highlight_address, expand))
f.write('<div class="code">') f.write('<div class="code">')
f.write("<table class=\"codedump\">\n") f.write("<table class=codedump>")
for j in xrange(0, end_address - start_address, size): for j in xrange(0, end_address - start_address, size):
slot = start_address + j slot = start_address + j
...@@ -2440,33 +2446,31 @@ class InspectionWebFormatter(object): ...@@ -2440,33 +2446,31 @@ class InspectionWebFormatter(object):
if maybe_address: if maybe_address:
heap_object = self.format_object(maybe_address) heap_object = self.format_object(maybe_address)
address_fmt = "%s&nbsp;</td>\n" address_fmt = "%s&nbsp;</td>"
if slot == highlight_address: if slot == highlight_address:
f.write("<tr class=\"highlight-line\">\n") f.write("<tr class=highlight-line>")
address_fmt = "<a id=\"highlight\"></a>%s&nbsp;</td>\n" address_fmt = "<a id=highlight></a>%s&nbsp;</td>"
elif slot < highlight_address and highlight_address < slot + size: elif slot < highlight_address and highlight_address < slot + size:
f.write("<tr class=\"inexact-highlight-line\">\n") f.write("<tr class=inexact-highlight-line>")
address_fmt = "<a id=\"highlight\"></a>%s&nbsp;</td>\n" address_fmt = "<a id=highlight></a>%s&nbsp;</td>"
else: else:
f.write("<tr>\n") f.write("<tr>")
f.write(" <td>") f.write("<td>")
self.output_comment_box(f, "da-", slot) self.output_comment_box(f, "da-", slot)
f.write("</td>\n") f.write("</td>")
f.write(" ")
self.td_from_address(f, slot) self.td_from_address(f, slot)
f.write(address_fmt % self.format_address(slot)) f.write(address_fmt % self.format_address(slot))
f.write(" ")
self.td_from_address(f, maybe_address) self.td_from_address(f, maybe_address)
f.write(":&nbsp;%s&nbsp;</td>\n" % straddress) f.write(":&nbsp;%s&nbsp;</td>" % straddress)
f.write(" <td>") f.write("<td>")
if maybe_address != None: if maybe_address != None:
self.output_comment_box( self.output_comment_box(
f, "sv-" + self.reader.FormatIntPtr(slot), maybe_address) f, "sv-" + self.reader.FormatIntPtr(slot), maybe_address)
f.write(" </td>\n") f.write("</td>")
f.write(" <td>%s</td>\n" % (heap_object or '')) f.write("<td>%s</td>" % (heap_object or ''))
f.write("</tr>\n") f.write("</tr>")
f.write("</table>\n") f.write("</table>")
f.write("</div>") f.write("</div>")
return return
...@@ -2565,7 +2569,7 @@ class InspectionWebFormatter(object): ...@@ -2565,7 +2569,7 @@ class InspectionWebFormatter(object):
f.write("<h3>Disassembling 0x%x - 0x%x, highlighting 0x%x %s</h3>" % f.write("<h3>Disassembling 0x%x - 0x%x, highlighting 0x%x %s</h3>" %
(start_address, end_address, highlight_address, expand)) (start_address, end_address, highlight_address, expand))
f.write('<div class="code">') f.write('<div class="code">')
f.write("<table class=\"codedump\">\n"); f.write("<table class=\"codedump\">");
for i in xrange(len(lines)): for i in xrange(len(lines)):
line = lines[i] line = lines[i]
next_address = count next_address = count
...@@ -2574,7 +2578,7 @@ class InspectionWebFormatter(object): ...@@ -2574,7 +2578,7 @@ class InspectionWebFormatter(object):
next_address = next_line[0] next_address = next_line[0]
self.format_disasm_line( self.format_disasm_line(
f, start_address, line, next_address, highlight_address) f, start_address, line, next_address, highlight_address)
f.write("</table>\n") f.write("</table>")
f.write("</div>") f.write("</div>")
return return
...@@ -2590,22 +2594,22 @@ class InspectionWebFormatter(object): ...@@ -2590,22 +2594,22 @@ class InspectionWebFormatter(object):
extra.append(cgi.escape(str(object_info))) extra.append(cgi.escape(str(object_info)))
if len(extra) == 0: if len(extra) == 0:
return line return line
return ("%s <span class=\"disasmcomment\">;; %s</span>" % return ("%s <span class=disasmcomment>;; %s</span>" %
(line, ", ".join(extra))) (line, ", ".join(extra)))
def format_disasm_line( def format_disasm_line(
self, f, start, line, next_address, highlight_address): self, f, start, line, next_address, highlight_address):
line_address = start + line[0] line_address = start + line[0]
address_fmt = " <td>%s</td>\n" address_fmt = " <td>%s</td>"
if line_address == highlight_address: if line_address == highlight_address:
f.write("<tr class=\"highlight-line\">\n") f.write("<tr class=highlight-line>")
address_fmt = " <td><a id=\"highlight\">%s</a></td>\n" address_fmt = " <td><a id=highlight>%s</a></td>"
elif (line_address < highlight_address and elif (line_address < highlight_address and
highlight_address < next_address + start): highlight_address < next_address + start):
f.write("<tr class=\"inexact-highlight-line\">\n") f.write("<tr class=inexact-highlight-line>")
address_fmt = " <td><a id=\"highlight\">%s</a></td>\n" address_fmt = " <td><a id=highlight>%s</a></td>"
else: else:
f.write("<tr>\n") f.write("<tr>")
num_bytes = next_address - line[0] num_bytes = next_address - line[0]
stack_slot = self.heap.stack_map.get(line_address) stack_slot = self.heap.stack_map.get(line_address)
marker = "" marker = ""
...@@ -2630,22 +2634,26 @@ class InspectionWebFormatter(object): ...@@ -2630,22 +2634,26 @@ class InspectionWebFormatter(object):
code = self.annotate_disasm_addresses(code[op_offset:]) code = self.annotate_disasm_addresses(code[op_offset:])
f.write(" <td>") f.write(" <td>")
self.output_comment_box(f, "codel-", line_address) self.output_comment_box(f, "codel-", line_address)
f.write("</td>\n") f.write("</td>")
f.write(address_fmt % marker) f.write(address_fmt % marker)
f.write(" ") f.write(" ")
self.td_from_address(f, line_address) self.td_from_address(f, line_address)
f.write("%s (+0x%x)</td>\n" % f.write(self.format_address(line_address))
(self.format_address(line_address), line[0])) f.write(" (+0x%x)</td>" % line[0])
f.write(" <td>:&nbsp;%s&nbsp;</td>\n" % opcodes) f.write("<td>:&nbsp;%s&nbsp;</td>" % opcodes)
f.write(" <td>%s</td>\n" % code) f.write("<td>%s</td>" % code)
f.write("</tr>\n") f.write("</tr>")
def output_comment_box(self, f, prefix, address): def output_comment_box(self, f, prefix, address):
f.write("<input type=\"text\" class=\"commentinput\" " comment = self.comments.get_comment(address)
"id=\"%s-address-0x%s\" onchange=\"comment()\" value=\"%s\">" % value = ""
if comment:
value = " value=\"%s\"" % cgi.escape(comment)
f.write("<input type=text class=ci "
"id=%s-address-0x%s onchange=c()%s>" %
(prefix, (prefix,
self.reader.FormatIntPtr(address), self.reader.FormatIntPtr(address),
cgi.escape(self.comments.get_comment(address)) or "")) value))
MAX_FOUND_RESULTS = 100 MAX_FOUND_RESULTS = 100
...@@ -2655,27 +2663,27 @@ class InspectionWebFormatter(object): ...@@ -2655,27 +2663,27 @@ class InspectionWebFormatter(object):
if toomany: if toomany:
f.write("(found %i results, displaying only first %i)" % f.write("(found %i results, displaying only first %i)" %
(len(results), self.MAX_FOUND_RESULTS)) (len(results), self.MAX_FOUND_RESULTS))
f.write(": \n") f.write(": ")
results = sorted(results) results = sorted(results)
results = results[:min(len(results), self.MAX_FOUND_RESULTS)] results = results[:min(len(results), self.MAX_FOUND_RESULTS)]
for address in results: for address in results:
f.write("<span %s>%s</span>\n" % f.write("<span %s>%s</span>" %
(self.comments.get_style_class_string(address), (self.comments.get_style_class_string(address),
self.format_address(address))) self.format_address(address)))
if toomany: if toomany:
f.write("...\n") f.write("...")
def output_page_info(self, f, page_kind, page_address, my_page_address): def output_page_info(self, f, page_kind, page_address, my_page_address):
if my_page_address == page_address and page_address != 0: if my_page_address == page_address and page_address != 0:
f.write("Marked first %s page.\n" % page_kind) f.write("Marked first %s page." % page_kind)
else: else:
f.write("<span id=\"%spage\" style=\"display:none\">" % page_kind) f.write("<span id=\"%spage\" style=\"display:none\">" % page_kind)
f.write("Marked first %s page." % page_kind) f.write("Marked first %s page." % page_kind)
f.write("</span>\n") f.write("</span>\n")
f.write("<button onclick=\"onpage('%spage', '0x%x')\">" % f.write("<button onclick=\"onpage('%spage', '0x%x')\">" %
(page_kind, my_page_address)) (page_kind, my_page_address))
f.write("Mark as first %s page</button>\n" % page_kind) f.write("Mark as first %s page</button>" % page_kind)
return return
def output_search_res(self, f, straddress): def output_search_res(self, f, straddress):
...@@ -2687,11 +2695,11 @@ class InspectionWebFormatter(object): ...@@ -2687,11 +2695,11 @@ class InspectionWebFormatter(object):
f.write("Comment: ") f.write("Comment: ")
self.output_comment_box(f, "search-", address) self.output_comment_box(f, "search-", address)
f.write("<br>\n") f.write("<br>")
page_address = address & ~self.heap.PageAlignmentMask() page_address = address & ~self.heap.PageAlignmentMask()
f.write("Page info: \n") f.write("Page info: ")
self.output_page_info(f, "old", self.padawan.known_first_old_page, \ self.output_page_info(f, "old", self.padawan.known_first_old_page, \
page_address) page_address)
self.output_page_info(f, "map", self.padawan.known_first_map_page, \ self.output_page_info(f, "map", self.padawan.known_first_map_page, \
...@@ -2705,27 +2713,27 @@ class InspectionWebFormatter(object): ...@@ -2705,27 +2713,27 @@ class InspectionWebFormatter(object):
self.output_words(f, address - 8, address + 32, address, "Dump") self.output_words(f, address - 8, address + 32, address, "Dump")
# Print as ASCII # Print as ASCII
f.write("<hr>\n") f.write("<hr>")
self.output_ascii(f, address, address + 256, address) self.output_ascii(f, address, address + 256, address)
# Print as code # Print as code
f.write("<hr>\n") f.write("<hr>")
self.output_disasm_range(f, address - 16, address + 16, address, True) self.output_disasm_range(f, address - 16, address + 16, address, True)
aligned_res, unaligned_res = self.reader.FindWordList(address) aligned_res, unaligned_res = self.reader.FindWordList(address)
if len(aligned_res) > 0: if len(aligned_res) > 0:
f.write("<h3>Occurrences of 0x%x at aligned addresses</h3>\n" % f.write("<h3>Occurrences of 0x%x at aligned addresses</h3>" %
address) address)
self.output_find_results(f, aligned_res) self.output_find_results(f, aligned_res)
if len(unaligned_res) > 0: if len(unaligned_res) > 0:
f.write("<h3>Occurrences of 0x%x at unaligned addresses</h3>\n" % \ f.write("<h3>Occurrences of 0x%x at unaligned addresses</h3>" % \
address) address)
self.output_find_results(f, unaligned_res) self.output_find_results(f, unaligned_res)
if len(aligned_res) + len(unaligned_res) == 0: if len(aligned_res) + len(unaligned_res) == 0:
f.write("<h3>No occurences of 0x%x found in the dump</h3>\n" % address) f.write("<h3>No occurences of 0x%x found in the dump</h3>" % address)
self.output_footer(f) self.output_footer(f)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment