promote Mul to Alu3

diff --git a/ships/Mul.ship b/ships/Alu3.ship
similarity index 88%
rename from ships/Mul.ship
rename to ships/Alu3.ship
index 3e30d8c..56f2c2a 100644 (file)
--- a/ships/Mul.ship
+++ b/ships/Alu3.ship
@@ -1,4 +1,4 @@
-ship: Mul
+ship: Alu3
 
 == Ports ===========================================================
 data  in:   in1
@@ -6,9 +6,12 @@ data  in:   in2
 data  in:   in3
 
 data  out:  out1
+  shortcut to: in1
 data  out:  out2
+  shortcut to: in2
 data  out:  out3
-data  out:  bits
+  shortcut to: in3
+data  out:  outBits
 
 == Constants ========================================================
 == TeX ==============================================================
@@ -58,9 +61,9 @@ public void service() {
         count = 74;
       }
   }
-  if (box_bits.readyForDataFromShip() &&
+  if (box_outBits.readyForDataFromShip() &&
       bits.size() >= 37) {
-      box_bits.addDataFromShip(bits.get(37));
+      box_outBits.addDataFromShip(bits.get(37));
   }
 }
 
@@ -108,7 +111,16 @@ public void service() {
   end
 
 
+== Test ========================================================================
+#expect 25
+
+#ship alu3 : Alu3
+#ship debug : Debug
+
+25: sendto debug.in;
+debug.in: [*] take, deliver;
 
 
 == Contributors =========================================================
+Amir Kamil <kamil@cs.berkeley.edu>
 Adam Megacz <megacz@cs.berkeley.edu>

diff --git a/tests/alu3/alu3-simple-test.fleet b/tests/alu3/alu3-simple-test.fleet
deleted file mode 100644 (file)
index 3174b76..0000000
--- a/tests/alu3/alu3-simple-test.fleet
+++ /dev/null
@@ -1,29 +0,0 @@
-#skip
-#expect 25
-
-#ship alu3 : Alu3
-#ship alu2 : Alu2
-#ship debug : Debug
-
-12: sendto alu3.in1;
-4:  sendto alu3.in2;
-9:  sendto alu3.in3;
-
-
-alu3.in1:  [*] take, deliver;
-alu3.in2:  [*] take, deliver;
-alu3.in3:  [*] take, deliver;
-
-alu2.in1: [*] take, deliver;
-alu2.in2: [*] take, deliver;
-alu2.inOp: take; [*] deliver;
-
-alu3.out1: [*] take, sendto alu2.in1;
-alu3.out2: [*] take, sendto alu2.in2;
-Alu2.ADD:  sendto alu2.inOp;
-
-alu2.out: [*] take, sendto debug.in;
-
-debug.in: [*] take, deliver;
-
-