lots of changes to Marina test code, mostly for scan chain counters

[fleet.git] / ships / Fifo.ship

diff --git a/ships/Fifo.ship b/ships/Fifo.ship
index 0b93764..616c97b 100644 (file)
--- a/ships/Fifo.ship
+++ b/ships/Fifo.ship
@@ -2,10 +2,20 @@ ship: Fifo
 
 == Ports ===========================================================
 data  in:   in
+
 data  out:  out
 
 == Constants ========================================================
+
 == TeX ==============================================================
+
+The {\tt Fifo} ship is a simple fifo.  Word-sized delivered to the {\tt
+in} port are enqueued into the fifo, and values which arrive at the
+end of the fifo are provided to the {\tt out} port.
+
+The internal capacity of the fifo is unspecified, but guaranteed to be
+at least 16 words.
+
 == Fleeterpreter ====================================================
     private Queue<Long> fifo = new LinkedList<Long>();
     public void service() {
@@ -19,6 +29,10 @@ data  out:  out
 
 == FleetSim ==============================================================
 
+== FPGA ==============================================================
+
+// not used
+
 == Test =================================================================
 // expected output
 #expect 9
@@ -27,14 +41,21 @@ data  out:  out
 #ship debug        : Debug
 #ship fifo         : Fifo
 
-debug.in:   [*] take, deliver;
+debug.in:   set ilc=*;  recv, deliver;
 fifo.in:
-  literal 9;
+  set word= 9;
   deliver;
-  [100] take, deliver;
+  set ilc=63;
+  recv, deliver;
+  set ilc=37;
+  recv, deliver;
+
 fifo.out:
-  [99] take, sendto fifo.in;
-  [1]  take, sendto debug.in;
+  set ilc=63;
+  collect, send to fifo.in;
+  set ilc=36;
+  collect, send to fifo.in;
+  collect, send to debug.in;