uncomment resets in Memory.ship

[fleet.git] / ships / Alu3.ship

diff --git a/ships/Alu3.ship b/ships/Alu3.ship
index 5995e9c..24b3efd 100644 (file)
--- a/ships/Alu3.ship
+++ b/ships/Alu3.ship
@@ -122,7 +122,7 @@ public void service() {
 
 
 == Test ========================================================================
-#skip
+
 #ship alu3    : Alu3
 #ship lut3    : Lut3
 #ship bitfifo : BitFifo
@@ -138,11 +138,11 @@ public void service() {
 // r:  111000100110111000000
 
 bitfifo.in:
-  deliver;      // deliver a junk word
   literal 10000;
-  [37] deliver; // deliver it 37 times (once per bit)
+  deliver;      // deliver a junk word
+  load repeat counter with 37; deliver; // deliver it 37 times (once per bit)
   literal 0;
-  [38] deliver; // deliver it 37 times
+  load repeat counter with 38; deliver; // deliver it 37 times
 
 // insert bits in lsb order
 bitfifo.inOp:
@@ -155,32 +155,35 @@ bitfifo.outOp:
   [*] deliver;
 
 bitfifo.out:        [*] wait, take, sendto lut3.in2;
-lut3.in2:           [4] notify bitfifo.out;
-                    [74] take, deliver, notify bitfifo.out;
+lut3.in2:           load repeat counter with 4; notify bitfifo.out;
+                    load repeat counter with 63;
+                    take, deliver, notify bitfifo.out;
+                    load repeat counter with 11;
+                    take, deliver, notify bitfifo.out;
 
 // mux on second input
 lut3.inLut:         literal 226;
-                    [74] deliver;
+                    [*] deliver;
 
 lut3.in1:           literal 18683;
-                    [37] deliver;
+                    load repeat counter with 37; deliver;
                     literal 0;
-                    [37] deliver;
+                    load repeat counter with 37; deliver;
 
 lut3.in3:           literal 12000;
-                    [37] deliver;
+                    load repeat counter with 37; deliver;
                     literal 0;
-                    [37] deliver;
+                    load repeat counter with 37; deliver;
 
 lut3.out:           [*] wait, take, sendto alu3.in2;
 
 alu3.in1:      literal 0; deliver; [*] take, deliver;
-alu3.in2:      [1] notify lut3.out; [*] take, deliver, notify lut3.out;
+alu3.in2:      notify lut3.out; [*] take, deliver, notify lut3.out;
 alu3.in3:      literal 0; deliver; [*] take, deliver;
-alu3.out1:     [74] take, sendto alu3.in1;
-alu3.out2:     [74] take, sendto alu3.in3;
 alu3.outBits:  [*] take, sendto debug.in;
 
+alu3.out1:     [*] take, sendto alu3.in1;
+alu3.out2:     [*] take, sendto alu3.in3;
 
 debug.in:      [*] take, deliver;