bugfixes to tests discoverd while getting interpreter working again

diff --git a/tests/codebags/torpedoing-loops.fleet b/tests/codebags/torpedoing-loops.fleet
new file mode 100644 (file)
index 0000000..e4f0542
--- /dev/null
+++ b/tests/codebags/torpedoing-loops.fleet
@@ -0,0 +1,42 @@
+#expect 5
+#expect 5
+#expect 3
+
+#ship debug  : Debug
+#ship memory : Memory
+#ship fifo   : Fifo
+
+debug.in:
+  [*] set olc=1;
+  set word=5;
+  head;
+    send token to fifo.out;
+    [T] recv token;
+    deliver;
+    [d] abort;
+    [d] send token to memory.inCBD;
+  tail;
+
+fifo.out:
+  [*] set olc=3;
+  head;
+    recv token;
+    set olc--;
+    send token to debug.in;
+    [d] abort;
+    [d] send token to debug.in:i;
+  tail;
+
+memory.out:
+ set ilc=*;
+ collect packet, send;
+
+memory.inCBD:
+  set word={
+    debug.in:
+      [*] set olc=1;
+      set word=3;
+      deliver;
+  };
+  recv token;
+  deliver;

diff --git a/tests/dock/one-instruction-loop.fleet b/tests/dock/one-instruction-loop.fleet
index b75874f..434fdfc 100644 (file)
--- a/tests/dock/one-instruction-loop.fleet
+++ b/tests/dock/one-instruction-loop.fleet
@@ -14,9 +14,9 @@ debug.in:
   deliver;
   set olc=4;
   head;
-  [Rq] set olc--;
+  set olc--;
   [d] abort;
+  [d] set word=4;
+  [d] deliver;
   tail;
-  [*] set word=4;
-  [*] deliver;
 

diff --git a/tests/dock/test-use-loop-counter.fleet b/tests/dock/test-use-loop-counter.fleet
index dc518c1..24b8239 100644 (file)
--- a/tests/dock/test-use-loop-counter.fleet
+++ b/tests/dock/test-use-loop-counter.fleet
@@ -27,6 +27,7 @@ fifo.in:
   [Rq] recv, deliver;
   [Rq] set olc--;
   [d] abort;
+  [d] send token to memory.out;
   tail;
 
 memory.out:
@@ -34,6 +35,7 @@ memory.out:
   set ilc=3;
   send to fifo.in;
 
+  recv token;
   set ilc=*;
   collect packet, send;
 

diff --git a/tests/torpedo/epilogue-fifo.test b/tests/torpedo/epilogue-fifo.test
index 4cadf30..e49ae4c 100644 (file)
--- a/tests/torpedo/epilogue-fifo.test
+++ b/tests/torpedo/epilogue-fifo.test
@@ -10,7 +10,8 @@ debug.in:
   deliver;
   set olc=0;
   [d] abort;
+  [d] deliver;
   tail;
-  [*] deliver;
+
 
 

diff --git a/tests/torpedo/epilogue-fifo2.test b/tests/torpedo/epilogue-fifo2.test
deleted file mode 100644 (file)
index 4cadf30..0000000
--- a/tests/torpedo/epilogue-fifo2.test
+++ /dev/null
@@ -1,16 +0,0 @@
-#expect 0
-#expect 0
-#ship debug : Debug
-#ship fifo  : Fifo
-
-debug.in:
-  set word= 0;
-  head;
-  [Rq] nop;
-  deliver;
-  set olc=0;
-  [d] abort;
-  tail;
-  [*] deliver;
-
-