Ticket #353: tt353-jit-i386-set_i_n.patch

src/jit/i386/core.jit

@@ -103 +103 @@
 
 ; These are wrong: first does rounding, but we should truncate
 ; TODO: [5487]: JIT/i386 set_i_n did round. Test t/op/jitn.t 
-;Parrot_set_i_n {
-;    if (MAP[2]) {
-;        jit_emit_mov_MR_in(interp, NATIVECODE, ROFFS_INT(1), MAP[2]);
-;    }
-;    else {
-;        jit_emit_mov_RM_n(interp, NATIVECODE, FSR1, ROFFS_NUM(2));
-;        jit_emit_mov_MR_in(interp, NATIVECODE, ROFFS_INT(1), FSR1);
-;    }
-;    if (MAP[1]) {
-;        jit_emit_mov_RM_i(interp, NATIVECODE, MAP[1], ROFFS_INT(1));
-;    }
-;}
-;
-;Parrot_set_i_nc {
-;    jit_emit_mov_ri_n(interp, NATIVECODE, FSR1, &NUM_CONST[2]);
-;    jit_emit_mov_MR_in(NATIVECODE, ROFFS_INT(1), FSR1);
-;    if (MAP[1]) {
-;        jit_emit_mov_RM_i(interp, NATIVECODE, MAP[1], ROFFS_INT(1));
-;    }
-;}
+Parrot_set_i_n {
+    if (MAP[2]) {
+        jit_emit_mov_MR_in(interp, NATIVECODE, ROFFS_INT(1), MAP[2]);
+    }
+    else {
+        jit_emit_mov_RM_n(interp, NATIVECODE, FSR1, ROFFS_NUM(2));
+        jit_emit_mov_MR_in(interp, NATIVECODE, ROFFS_INT(1), FSR1);
+    }
+    if (MAP[1]) {
+        jit_emit_mov_RM_i(interp, NATIVECODE, MAP[1], ROFFS_INT(1));
+    }
+}
+
+Parrot_set_i_nc {
+    jit_emit_mov_ri_n(interp, NATIVECODE, FSR1, &NUM_CONST[2]);
+    jit_emit_mov_MR_in(interp, NATIVECODE, ROFFS_INT(1), FSR1);
+    if (MAP[1]) {
+        jit_emit_mov_RM_i(interp, NATIVECODE, MAP[1], ROFFS_INT(1));
+    }
+}
 
 ; -- null op.
 TEMPLATE Parrot_null_x {

src/jit/i386/jit_emit.h

@@ -737 +737 @@
       emitm_fildl((interp), (pc), emit_None, emit_None, emit_None, (address))
 #  define jit_emit_fload_mb_i(interp, pc, offs) \
       emitm_fildl((interp), (pc), emit_EBX, emit_None, 1, (offs))
-#  define jit_emit_fstore_m_i(pc, m) \
-      emitm_fistpl((pc), emit_None, emit_None, emit_None, (m))
+#  define jit_emit_fstore_m_i(interp, pc, m) \
+      emitm_fistpl((interp), (pc), emit_None, emit_None, emit_None, (m))
+#  define jit_emit_fst_m_i(interp, pc, base, offs) \
+      emitm_fstl((interp), (pc), (base), emit_None, 1, (offs))
 
 #else /* INTVAL_SIZE = 8 */
 
@@ -746 +748 @@
       emitm_fildll((interp), (pc), emit_None, emit_None, emit_None, (address))
 #  define jit_emit_fload_mb_i(interp, pc, offs) \
       emitm_fildll((interp), (pc), emit_EBX, emit_None, 1, (offs))
-#  define jit_emit_fstore_m_i(pc, m) \
-      emitm_fistpll((pc), emit_None, emit_None, emit_None, (m))
+#  define jit_emit_fstore_m_i(interp, pc, m) \
+      emitm_fistpll((interp), (pc), emit_None, emit_None, emit_None, (m))
+#  define jit_emit_fst_m_i(interp, pc, base, offs) \
+      emitm_fstll((interp), (pc), (base), emit_None, 1, (offs))
 
 #endif /* INTVAL_SIZE */
 
@@ -1215 +1219 @@
 /* INT_REG <= ST(i) */
 /* TODO: unused. jit_emit_mov_MR_in is used instead.
    TODO: rounding => trunc */
-#  define jit_emit_mov_mr_in(pc, mem, r) { \
+#  define jit_emit_mov_mr_in(interp, pc, mem, r) { \
     emitm_fld((pc), (r)); \
-    jit_emit_fstore_m_i((pc), (mem)); \
+    jit_emit_fstore_m_i((interp), (pc), (mem)); \
 }
 
 /* TODO: rounding => trunc */
 #  define jit_emit_mov_MR_in(interp, pc, mem, r) {       \
     if (r) { \
         emitm_fld((pc), (r)); \
-        jit_emit_fstore_m_i((pc), (mem)); \
+        jit_emit_fstore_m_i((interp), (pc), (mem)); \
     } \
     else { \
-        jit_emit_fst_m_i((interp), (pc), emit_EBX, (d)); \
+        jit_emit_fst_m_i((interp), (pc), emit_EBX, (mem)); \
     } \
 }