Implement idiv

mehfooz09 · May 25, 2018 · f3a4e7b · f3a4e7b
1 parent 210f2c5
commit f3a4e7b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/emu/gadgets-x86/math.S b/emu/gadgets-x86/math.S
@@ -125,6 +125,18 @@
         div\ss %r10\s
         gret
 .endm
+.macro do_idiv size, s, ss
+    .gadget idiv_\size
+        idiv\ss %r10\s
+        gret
+.endm
+.macro do_imul size, s, ss
+    .if \size != 8
+        .gadget imul_\size
+            imul\ss (%_ip), %r10\s
+            gret 1
+    .endif
+.endm
 .macro do_neg size, s, ss
     .gadget neg_\size
         setf_a src=$0 dst=%r10\s ss=\ss
@@ -138,17 +150,18 @@
         not\ss %r10\s
         gret
 .endm
-.macro do_imul size, s, ss
-    .if \size != 8
-        .gadget imul_\size
-            imul\ss (%_ip), %r10\s
-            gret 1
-    .endif
-.endm
 
-.irp op, div,neg,not,imul
+.irp op, idiv,div,imul,neg,not
     .irp size, SIZE_LIST
         ss \size, do_\op
     .endr
     .gadget_list \op, SIZE_LIST
 .endr
+
+.gadget cvt_16
+    cwd
+    gret
+.gadget cvt_32
+    cdq
+    gret
+.gadget_list cvt, SIZE_LIST
diff --git a/emu/gen.c b/emu/gen.c
@@ -175,9 +175,9 @@ static inline void gen_op(struct gen_state *state, gadget_t *gadgets, enum arg a
 #define IMUL2(val, reg,z) UNDEFINED
 #define IMUL3(imm, src, dst,z) load(src,z); gag(imul, sz(z), imm); store(dst,z)
 #define DIV(val, z) load(val, z); ga(div, sz(z)); store(val, z)
-#define IDIV(val, z) UNDEFINED
+#define IDIV(val, z) load(val, z); ga(idiv, sz(z)); store(val, z)
 
-#define CVT UNDEFINED
+#define CVT ga(cvt, sz(oz))
 #define CVTE UNDEFINED
 
 #define ROL(count, val,z) UNDEFINED