maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Tidy up the input file given to 'llvm-mc -disassemble' and also append the gdb 

assembler code to the memory dump.

llvm-svn: 127823
This commit is contained in:
Johnny Chen 2011-03-17 19:05:34 +00:00
parent 73963b67c1
commit 0d825132c6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lldb/utils/test/disasm.py
View File

@ -28,6 +28,7 @@ def which(program):
return None return None
def do_llvm_mc_disassembly(exe, func, mc, mc_options = None): def do_llvm_mc_disassembly(exe, func, mc, mc_options = None):
from cStringIO import StringIO
import pexpect import pexpect
gdb_prompt = "\r\n\(gdb\) " gdb_prompt = "\r\n\(gdb\) "
@ -42,8 +43,8 @@ def do_llvm_mc_disassembly(exe, func, mc, mc_options = None):
# Get the output from gdb. # Get the output from gdb.
gdb_output = gdb.before gdb_output = gdb.before
# Open disasm-input.txt for writing the hex strings for llvm-mc to work on. # Use StringIO to record the memory dump as well as the gdb assembler code.
mc_input = open('disasm-input.txt', 'w') mc_input = StringIO()
# These keep track of the states of our simple gdb_output parser. # These keep track of the states of our simple gdb_output parser.
prev_line = None prev_line = None
@ -74,14 +75,15 @@ def do_llvm_mc_disassembly(exe, func, mc, mc_options = None):
if prev_addr and curr_addr: if prev_addr and curr_addr:
addr_diff = int(curr_addr, 16) - int(prev_addr, 16) addr_diff = int(curr_addr, 16) - int(prev_addr, 16)
if prev_addr: if prev_addr and addr_diff > 0:
# Feed the examining memory command to gdb. # Feed the examining memory command to gdb.
gdb.sendline('x /%db %s' % (addr_diff, prev_addr)) gdb.sendline('x /%db %s' % (addr_diff, prev_addr))
gdb.expect(gdb_prompt) gdb.expect(gdb_prompt)
x_output = gdb.before x_output = gdb.before
memory_dump = x_output.split(os.linesep)[-1].split(':')[-1] memory_dump = x_output.split(os.linesep)[-1].split(':')[-1].strip()
#print "\nbytes:", memory_dump #print "\nbytes:", memory_dump
mc_input.write(memory_dump + '\n') disasm_str = prev_line.split(':')[1]
print >> mc_input, '%s # %s' % (memory_dump, disasm_str)
# We're done with the processing. Assign the current line to be prev_line. # We're done with the processing. Assign the current line to be prev_line.
prev_line = line prev_line = line
@ -91,8 +93,9 @@ def do_llvm_mc_disassembly(exe, func, mc, mc_options = None):
gdb.expect(pexpect.EOF) gdb.expect(pexpect.EOF)
gdb.close() gdb.close()
# Close the mc_input now that we are done writing it. # Write the memory dump into a file.
mc_input.close() with open('disasm-input.txt', 'w') as f:
f.write(mc_input.getvalue())
mc_cmd = '%s -disassemble %s disasm-input.txt' % (mc, mc_options) mc_cmd = '%s -disassemble %s disasm-input.txt' % (mc, mc_options)
print "\nExecuting command:", mc_cmd print "\nExecuting command:", mc_cmd