Fix not_i

MoarVM · Aug 4, 2014 · c45061d · c45061d
1 parent 678f8c5
commit c45061d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/foo.nqp b/foo.nqp
@@ -1,10 +1,12 @@
 #!/usr/bin/env nqp-m
 
 sub quam() {
-    my num $i := 0.5;
-    while $i < 100.0 {
-        $i := $i * 1.1;
-        nqp::say("Value of \$i is $i");
+    my int $i := 1;
+    my int $j := !$i;
+    if $j {
+        nqp::say("OH HAI");
+    } else {
+    nqp::say("OH NO");
     }
 }
 

diff --git a/src/jit/emit_posix_x64.c b/src/jit/emit_posix_x64.c
@@ -62,7 +62,7 @@ static const unsigned char actions[1941] = {
   233,255,252,242,72,15,44,131,233,72,137,131,233,255,72,59,131,233,255,15,
   148,208,255,15,149,208,255,15,156,208,255,15,158,208,255,15,159,208,255,15,
   157,208,255,72,15,182,192,72,137,131,233,255,72,139,139,233,72,133,201,15,
-  149,210,72,15,182,210,72,137,147,233,255,252,242,15,16,131,233,102,15,46,
+  148,210,72,15,182,210,72,137,147,233,255,252,242,15,16,131,233,102,15,46,
   131,233,255,15,156,209,255,15,146,209,255,72,15,182,201,72,137,139,233,255,
   72,139,139,233,72,133,201,15,149,210,77,139,134,233,77,139,128,233,76,57,
   193,65,15,149,208,68,32,194,72,15,182,210,72,137,147,233,255,72,139,139,233,
@@ -1033,7 +1033,7 @@ void MVM_jit_emit_primitive(MVMThreadContext *tc, MVMJitGraph *jg,
         MVMint16 src = ins->operands[1].reg.orig;
         //| mov TMP1, WORK[src];
         //| test TMP1, TMP1;
-        //| setnz TMP2b;
+        //| setz TMP2b;
         //| movzx TMP2, TMP2b;
         //| mov WORK[dst], TMP2;
         dasm_put(Dst, 865, Dt13([src]), Dt13([dst]));

diff --git a/src/jit/emit_win32_x64.c b/src/jit/emit_win32_x64.c
@@ -61,7 +61,7 @@ static const unsigned char actions[1921] = {
   15,17,131,233,255,252,242,72,15,42,131,233,252,242,15,17,131,233,255,252,
   242,72,15,44,131,233,72,137,131,233,255,72,59,131,233,255,15,148,208,255,
   15,149,208,255,15,156,208,255,15,158,208,255,15,159,208,255,15,157,208,255,
-  72,15,182,192,72,137,131,233,255,72,139,139,233,72,133,201,15,149,210,72,
+  72,15,182,192,72,137,131,233,255,72,139,139,233,72,133,201,15,148,210,72,
   15,182,210,72,137,147,233,255,252,242,15,16,131,233,102,15,46,131,233,255,
   15,156,209,255,15,146,209,255,72,15,182,201,72,137,139,233,255,72,139,139,
   233,72,133,201,15,149,210,77,139,134,233,77,139,128,233,76,57,193,65,15,149,
@@ -1032,7 +1032,7 @@ void MVM_jit_emit_primitive(MVMThreadContext *tc, MVMJitGraph *jg,
         MVMint16 src = ins->operands[1].reg.orig;
         //| mov TMP1, WORK[src];
         //| test TMP1, TMP1;
-        //| setnz TMP2b;
+        //| setz TMP2b;
         //| movzx TMP2, TMP2b;
         //| mov WORK[dst], TMP2;
         dasm_put(Dst, 864, Dt13([src]), Dt13([dst]));

diff --git a/src/jit/emit_x64.dasc b/src/jit/emit_x64.dasc
@@ -696,7 +696,7 @@ void MVM_jit_emit_primitive(MVMThreadContext *tc, MVMJitGraph *jg,
         MVMint16 src = ins->operands[1].reg.orig;
         | mov TMP1, WORK[src];
         | test TMP1, TMP1;
-        | setnz TMP2b;
+        | setz TMP2b;
         | movzx TMP2, TMP2b;
         | mov WORK[dst], TMP2;
         break;

diff --git a/src/jit/graph.c b/src/jit/graph.c
@@ -444,7 +444,7 @@ static MVMint32 jgb_consume_ins(MVMThreadContext *tc, JitGraphBuilder *jgb,
         //    case MVM_OP_lt_n:
         /* comparison (objects) */
     case MVM_OP_eqaddr:
-        //    case MVM_OP_isconcrete:
+    case MVM_OP_isconcrete:
         /* constants */
     case MVM_OP_const_i64_16:
     case MVM_OP_const_i64:
@@ -487,7 +487,7 @@ static MVMint32 jgb_consume_ins(MVMThreadContext *tc, JitGraphBuilder *jgb,
     case MVM_OP_hllboxtype_s:
     case MVM_OP_null_s:
     case MVM_OP_isnull_s:
-        //    case MVM_OP_not_i:
+    case MVM_OP_not_i:
         //    case MVM_OP_isnull:
         //    case MVM_OP_isnonnull:
         jgb_append_primitive(tc, jgb, ins);