Ticket #530: jit.patch

src/jit/i386/jit_defs.c

@@ -2476 +2476 @@
 const char i_map[] =
     { emit_EDI, emit_ESI, emit_EDX, emit_ECX };
 const char floatval_map[] =
-    { 1, 2, 3, 4, 5 };         /* ST(1) .. (ST(4) */
+    { };         /* XXX see TT #530, #501, #38 */
 
 const char i_map_sub[] =
     { emit_EDX, emit_ECX, emit_EBX, emit_EDI, emit_ESI };
@@ -2494 +2494 @@
             4,                  /* 4 mapped ints */
             2,                  /* first 2 are preserved */
             i_map,
-            4,                  /* 4 mapped float regs */
+            0,                  /* 0 mapped float regs see TT #530, #38, #501 */
             0,                  /* ABI sez it's not preserved */
             floatval_map
         },

src/jit/i386/jit_emit.h

@@ -1223 +1223 @@
         jit_emit_fstore_mb_n((interp), (pc), emit_EBX, (d)); \
     } \
     else { \
-        jit_emit_fst_mb_n((interp), (pc), emit_EBX, (d)); \
+        jit_emit_fstore_mb_n((interp), (pc), emit_EBX, (d)); \
     } \
 }
 

src/jit/i386/core.jit

@@ -1740 +1740 @@
         emitm_fstp(NATIVECODE, (MAP[1] + 1));              /* store res */
     }
     else {
-        jit_emit_fstore_m_n(interp, NATIVECODE, ROFFS_NUM(1));
+        jit_emit_fstore_mb_n(interp, NATIVECODE, emit_EBX, ROFFS_NUM(1));
     }
     if (saved)
         emitm_popl_r(NATIVECODE, emit_ECX);

src/jit_debug.c

@@ -286 +286 @@
         char * const src = Parrot_str_to_cstring(interp,
             Parrot_debug_pc_to_filename(interp,
             interp->code->debugs, 0));
-        pasmfile = string_make(interp, src, strlen(src), NULL,
-                PObj_external_FLAG);
+        pasmfile = string_make(interp, src, strlen(src), NULL, 0);
         file = Parrot_str_copy(interp, pasmfile);
         /* chop pasm/pir */
 

t/op/trans.t

@@ -205 +205 @@
 ok 2
 OUTPUT
 
-my $runcore = $ENV{TEST_PROG_ARGS} || '';
-my @bsdtodo = (
-    $runcore =~ /--runcore=jit/ &&  $^O =~ m/bsd/i
-        ? ( todo => 'broken under JIT TT #501' )
-        : ()
-);
-
-pasm_output_is( <<"CODE", <<OUTPUT, "sinh", @bsdtodo );
+pasm_output_is( <<"CODE", <<OUTPUT, "sinh" );
         .include 'include/fp_equality.pasm'
         set N1, 1.0
         sinh N2, N1
@@ -232 +225 @@
 ok 2
 OUTPUT
 
-pasm_output_is( <<"CODE", <<OUTPUT, "tanh", @bsdtodo );
+pasm_output_is( <<"CODE", <<OUTPUT, "tanh" );
         .include 'include/fp_equality.pasm'
         set N1, 1.0
         tanh N2, N1
@@ -477 +470 @@
 ok 2
 OUTPUT
 
-pasm_output_is( <<"CODE", <<OUTPUT, "pow", @bsdtodo );
+pasm_output_is( <<"CODE", <<OUTPUT, "pow" );
         .include 'include/fp_equality.pasm'
         set N1, 3.0
         set I1, 3