merge armv7/thumb fixed semantics, x86 fpu added

bdcht · Oct 19, 2014 · cf813ac · cf813ac
1 parent 79f1e9b
commit cf813ac
Show file tree

Hide file tree

Showing 13 changed files with 1,612 additions and 691 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 tags
 *.pyc
+<<<<<<< HEAD
+=======
+*.swp
+>>>>>>> develop
 build/
 tests/
diff --git a/amoco/arch/arm/cpu_armv7.py b/amoco/arch/arm/cpu_armv7.py
@@ -14,6 +14,10 @@
 from amoco.arch.arm.v7 import spec_armv7
 from amoco.arch.arm.v7 import spec_thumb
 
+from amoco.arch.arm.v7.formats import ARM_V7_full
+instruction.set_formatter(ARM_V7_full)
+
+
 mode   = (lambda : internals['isetstate'])
 endian = (lambda : 1 if internals['endianstate']==0 else -1)