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

llvm.mc.Disassembler.decode now yields the byte sequence which generated the instruction

Browse source 
added custom method to extra.h to return a PyBytes object
from the bytes read from MemoryObject.readBytes.

also moved the generic methods from StringRefMemoryObject
up to MemoryObject
This commit is contained in:
anthony cantor 2013-09-02 23:55:51 -06:00 • committed by Siu Kwan Lam
commit 43f7330fda
5 changed files with 78 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
llvm/mc/__init__.py
View file

@ -126,9 +126,11 @@ class Disassembler(object):
def decode(self, bs, base_addr):
'''
decodes some the bytes in @bs into instructions and yields
each instructionas it is decoded. @base_addr is the base address
each instruction as it is decoded. @base_addr is the base address
where the instruction bytes are from (not an offset into
@bs)
@bs). yields instructions in the form of (addr, data, inst) where
addr is an integer, data is a bytearray and inst is an instance of
llvm.mc.Instr
'''
if not isinstance(bs, bytes):
@ -146,15 +148,27 @@ class Disassembler(object):
addr = code.getBase() + idx
status, size = self.mdasm.getInstruction(inst, code, addr)
if status == MCDisassembler.DecodeStatus.Fail:
yield (addr, None)
elif status == MCDisassembler.DecodeStatus.SoftFail:
yield (addr, self.bad_instr(inst))
else:
yield (addr, self.instr(inst))
if size < 1:
idx += (align - (idx % align))
else:
idx += size
size = (align - (idx % align))
amt_left = code.getExtent() - idx
if amt_left >= size:
data = code.readBytes(addr, size)
elif amt_left < 1:
break
else:
data = code.readBytes(addr, amt_left)
if sys.version_info.major < 3:
data = bytearray(map(lambda b: ord(b), data))
else:
data = bytearray(data)
if status == MCDisassembler.DecodeStatus.Fail:
yield (addr, data, None)
elif status == MCDisassembler.DecodeStatus.SoftFail:
yield (addr, data, self.bad_instr(inst))
else:
yield (addr, data, self.instr(inst))
idx += size