Skip to content

Commit f45bcd3

Browse files
committed
fixing issue #77 i_LEA with 32/16 bits operands
1 parent a06a520 commit f45bcd3

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

amoco/arch/x64/asm.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,8 +762,11 @@ def i_LEA(i,fmap):
762762
op1 = i.operands[0]
763763
op2 = i.operands[1]
764764
adr = op2.addr(fmap)
765-
if op1.size>adr.size: adr = adr.zeroextend(op1.size)
766-
elif op1.size<adr.size: adr = adr[0:op1.size]
765+
if op1.size==32:
766+
adr = adr.zeroextend(64)
767+
op1 = op1.x
768+
elif op1.size==16:
769+
adr = adr[0:op1.size]
767770
fmap[op1] = adr
768771

769772
def i_XCHG(i,fmap):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
setup(
3232
name = 'amoco',
33-
version = '2.5.1',
33+
version = '2.5.2',
3434
description = 'yet another binary analysis framework',
3535
long_description = long_descr,
3636
# Metadata
@@ -51,7 +51,7 @@
5151
keywords='binary analysis symbolic execution',
5252
packages=find_packages(exclude=['doc','tests*']),
5353
url = 'https://github.com/bdcht/amoco',
54-
install_requires = ['grandalf>=0.55555', 'crysp>=0.9', 'pyparsing'],
54+
install_requires = ['grandalf>=0.6', 'crysp>0.9', 'pyparsing'],
5555
extras_require={
5656
'test': ['pytest'],
5757
'app' : ['pygments','SQLAlchemy','Click','blinker'],

0 commit comments

Comments
 (0)