Implement xchg

mehfooz09 · May 25, 2018 · 24ee6d0 · 24ee6d0
1 parent 8d05e5e
commit 24ee6d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/emu/gadgets-x86/math.S b/emu/gadgets-x86/math.S
@@ -39,9 +39,9 @@
     .ifin(\op, add,sub,adc,sbb)
         setf_oc
     .endifin
-    .ifnc \op,imul
+    .ifin(\op, add,sub,adc,sbb,and,or,xor)
         setf_zsp %tmp\s, \ss
-    .endif
+    .endifin
 .endm
 .macro do_op op, size, arg
     ss \size, _do_op, \op, \arg
@@ -110,7 +110,7 @@
     .endr
 .endm
 
-.irp op, load,store,add,sub,adc,sbb,and,or,xor
+.irp op, load,store,xchg,add,sub,adc,sbb,and,or,xor
     .irp size, SIZE_LIST
         do_op_size \op, \size
     .endr

diff --git a/emu/gen.c b/emu/gen.c
@@ -134,7 +134,7 @@ static inline void gen_op(struct gen_state *state, gadget_t *gadgets, enum arg a
 #define MOV(src, dst,z) load(src, z); store(dst, z)
 #define MOVZX(src, dst,zs,zd) load(src, zs); store(dst, zd)
 #define MOVSX(src, dst,zs,zd) load(src, zs); ga(extend, sz(zs)); store(dst, zd)
-#define XCHG(src, dst,z) UNDEFINED
+#define XCHG(src, dst,z) los(xchg, src, dst, z)
 
 #define ADD(src, dst,z) los(add, src, dst, z)
 #define OR(src, dst,z) los(or, src, dst, z)