add x64 arch + full x86/64 SSE decoder

bdcht · Nov 23, 2014 · b97e480 · b97e480
1 parent b7dc45e
commit b97e480
Show file tree

Hide file tree

Showing 22 changed files with 4,835 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
 tags
 *.pyc
-<<<<<<< HEAD
-=======
 *.swp
->>>>>>> develop
 build/
 tests/
diff --git a/amoco/arch/core.py b/amoco/arch/core.py
@@ -389,7 +389,13 @@ def decode(self,istr,endian=1,i=None,ival=None):
             if type(v)==type(lambda:1): v=v(b)
             kargs[k] = v
         # and call hooks:
-        self.hook(obj=i,**kargs)
+        try:
+            self.hook(obj=i,**kargs)
+        except InstructionError:
+            # clean up:
+            i.bytes = i.bytes[:-len(bs)]
+            for k in self.iattr.iterkeys(): delattr(i,k)
+            raise InstructionError(i)
         return i
 
     def encode(self,i):

diff --git a/amoco/arch/x64/__init__.py b/amoco/arch/x64/__init__.py