From f45bcd31f076bd99cad63cd658fe40df1cc72062 Mon Sep 17 00:00:00 2001
From: Axel Tillequin <bdcht3@gmail.com>
Date: Wed, 3 Oct 2018 23:00:59 +0200
Subject: [PATCH] fixing issue #77 i_LEA with 32/16 bits operands

---
 amoco/arch/x64/asm.py | 7 +++++--
 setup.py              | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/amoco/arch/x64/asm.py b/amoco/arch/x64/asm.py
index e839071..c1891bb 100644
--- a/amoco/arch/x64/asm.py
+++ b/amoco/arch/x64/asm.py
@@ -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):
diff --git a/setup.py b/setup.py
index cce43f9..98eb350 100644
--- a/setup.py
+++ b/setup.py
@@ -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
@@ -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'],