Skip to content

Commit

Permalink
fixing issue #77 i_LEA with 32/16 bits operands
Browse files Browse the repository at this point in the history
  • Loading branch information
bdcht committed Oct 3, 2018
1 parent a06a520 commit f45bcd3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions amoco/arch/x64/asm.py
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,11 @@ def i_LEA(i,fmap):
op1 = i.operands[0]
op2 = i.operands[1]
adr = op2.addr(fmap)
if op1.size>adr.size: adr = adr.zeroextend(op1.size)
elif op1.size<adr.size: adr = adr[0:op1.size]
if op1.size==32:
adr = adr.zeroextend(64)
op1 = op1.x
elif op1.size==16:
adr = adr[0:op1.size]
fmap[op1] = adr

def i_XCHG(i,fmap):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

setup(
name = 'amoco',
version = '2.5.1',
version = '2.5.2',
description = 'yet another binary analysis framework',
long_description = long_descr,
# Metadata
Expand All @@ -51,7 +51,7 @@
keywords='binary analysis symbolic execution',
packages=find_packages(exclude=['doc','tests*']),
url = 'https://github.com/bdcht/amoco',
install_requires = ['grandalf>=0.55555', 'crysp>=0.9', 'pyparsing'],
install_requires = ['grandalf>=0.6', 'crysp>0.9', 'pyparsing'],
extras_require={
'test': ['pytest'],
'app' : ['pygments','SQLAlchemy','Click','blinker'],
Expand Down

0 comments on commit f45bcd3

Please sign in to comment.