From 5d1b6ef769712dd50229d6b259ebc9ab9ac5e452 Mon Sep 17 00:00:00 2001
From: Steven Massey <soundandform@gmail.com>
Date: Fri, 13 Dec 2019 11:39:58 -0800
Subject: [PATCH] another spec test working

---
 source/m3_compile.c   | 26 +++++++++++++++++---------
 test/run-spec-test.py |  3 +--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/source/m3_compile.c b/source/m3_compile.c
index 57ea95b..ea09d94 100644
--- a/source/m3_compile.c
+++ b/source/m3_compile.c
@@ -372,14 +372,16 @@ M3Result  UnwindBlockStack  (IM3Compilation o)
     
     i16 initStackIndex = o->block.initStackIndex;
 
-    if (o->stackIndex > initStackIndex)
+    u32 popCount = 0;
+    while (o->stackIndex > initStackIndex )
     {
-        m3log (compile, "unwinding stack top");
-        
-        while (o->stackIndex > initStackIndex )
-_           (Pop (o));
+_       (Pop (o));
+        ++popCount;
     }
     
+    if (popCount)
+        m3log (compile, "unwound stack top: %d", popCount);
+    
     _catch: return result;
 }
 
@@ -922,7 +924,11 @@ _           (MoveStackTopToRegister (o));
             op = op_ContinueLoopIf;
 _           (Pop (o));
         }
-        else op = op_ContinueLoop;
+        else
+        {
+            op = op_ContinueLoop;
+            o->block.isPolymorphic = true;
+        }
 
 _       (EmitOp (o, op));
         EmitPointer (o, scope->pc);
@@ -1241,7 +1247,6 @@ M3Result  Compile_If  (IM3Compilation o, u8 i_opcode)
 {
     M3Result result;
 
-_try {
 _   (PreserveNonTopRegisters (o));
 
     IM3Operation op = IsStackTopInRegister (o) ? op_If_r : op_If_s;
@@ -1270,7 +1275,7 @@ _       (Compile_ElseBlock (o, pc, blockType));
     }
     else * pc = GetPC (o);
 
-    } _catch: return result;
+    _catch: return result;
 }
 
 
@@ -1474,7 +1479,7 @@ const M3OpInfo c_operations [] =
     M3OP( "unreachable",         0, none,   d_singleOp (Unreachable),       Compile_Unreachable ),  // 0x00
     M3OP( "nop",                 0, none,   d_emptyOpList(),                Compile_Nop ),          // 0x01 .
     M3OP( "block",               0, none,   d_emptyOpList(),                Compile_LoopOrBlock ),  // 0x02
-    M3OP( "loop",                0, none,   d_emptyOpList(),                Compile_LoopOrBlock ),  // 0x03
+    M3OP( "loop",                0, none,   d_singleOp (Loop),              Compile_LoopOrBlock ),  // 0x03
     M3OP( "if",                 -1, none,   d_emptyOpList(),                Compile_If ),           // 0x04
     M3OP( "else",                0, none,   d_emptyOpList(),                Compile_Else_End ),     // 0x05
 
@@ -1691,6 +1696,9 @@ const M3OpInfo c_operations [] =
 
     M3OP( "SetGlobal_s",            0,  none,    op_SetGlobal_s),
 
+    M3OP( "ContinueLoop",           0,  none,    op_ContinueLoop),
+    M3OP( "ContinueLoopIf",         0,  none,    op_ContinueLoopIf),
+
     M3OP( "PreserveCopySlot",       0,  none,    op_PreserveCopySlot_64),
     M3OP( "CopySlot",               0,  none,    op_CopySlot_64),
     M3OP( "SetSlot_i32",            0,  none,    op_SetSlot_i32),
diff --git a/test/run-spec-test.py b/test/run-spec-test.py
index dfa8d4e..249d94e 100755
--- a/test/run-spec-test.py
+++ b/test/run-spec-test.py
@@ -446,10 +446,9 @@ else:
 
         "unreachable",
         "switch", "if", "br", "br_if", "br_table", "loop", "block",
-        "return", "nop", "start", "unwind"
+        "return", "nop", "start", "unwind", "labels"
 
         #--- TODO ---
-        #"labels",
         #"float_exprs",
     ]))