jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added functionality to llvm.mc.Instr to print itself

Browse source 
uses binding of printInst on MCInstPrinter for printing
instruction.

also fixed a bug in llvm.mc.Disassembler.decode: idx should
start at zero, and we should pass code.getBase() + idx to
getInstruction. idx must start at zero because the while loop
compares it against code.getExtent() which returns only the
length of bs.
This commit is contained in:
anthony cantor 2013-08-18 16:39:26 -06:00 • committed by Siu Kwan Lam
commit 8dbfc377ad
4 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
llvm/mc/__init__.py
View file

@ -5,7 +5,7 @@ if llvm.version < (3, 4):
from io import BytesIO
import contextlib
from llvmpy import api
from llvmpy import api, extra
from llvmpy.api.llvm import MCDisassembler
class Operand(object):
@ -22,7 +22,7 @@ class Operand(object):
self.tm = target_machine
def __repr__(self):
def __str__(self):
s = "invalid"
if self.op.isReg():
s = "reg(%s)" % (self.reg_name())
@ -37,6 +37,9 @@ class Operand(object):
return s
def __repr__(self):
return str(self)
def reg_name(self):
if self.op.isReg():
s = self.tm.reg_info.getName(self.op.getReg())
@ -61,10 +64,16 @@ class Instr(object):
self.tm = target_machine
def __str__(self):
os = extra.make_raw_ostream_for_printing()
self.tm.inst_printer.printInst(self.mcinst, os, "")
return str(os.str())
def __repr__(self):
return repr(self.mcinst)
return str(self)
def __len__(self):
''' the number of operands '''
return int(self.mcinst.size())
def operands(self):
@ -100,28 +109,29 @@ class Disassembler(object):
def bad_instr(self, mcinst):
return BadInstr(mcinst, self.tm)
def decode(self, bs, addr):
def decode(self, bs, base_addr):
'''
decodes some the bytes in @bs into instructions and yields
each instructionas it is decoded. @addr is the base address
each instructionas it is decoded. @base_addr is the base address
where the instruction bytes are from (not an offset into
@bs)
'''
code = api.llvm.StringRefMemoryObject.new(bs, addr)
idx = code.getBase()
code = api.llvm.StringRefMemoryObject.new(bs, base_addr)
idx = 0
align = self.mai.getMinInstAlignment()
while(idx < code.getExtent()):
inst = api.llvm.MCInst.new()
status, size = self.mdasm.getInstruction(inst, code, idx)
addr = code.getBase() + idx
status, size = self.mdasm.getInstruction(inst, code, addr)
if status == MCDisassembler.DecodeStatus.Fail:
yield (idx, None)
yield (addr, None)
elif status == MCDisassembler.DecodeStatus.SoftFail:
yield (idx, self.bad_instr(inst))
yield (addr, self.bad_instr(inst))
else:
yield (idx, self.instr(inst))
yield (addr, self.instr(inst))
if size < 1:
idx += (align - (idx % align))