implement crappy multiplier

diff --git a/ships/BitFifo.ship b/ships/BitFifo.ship
index b64ddc5..feb2c72 100644 (file)
--- a/ships/BitFifo.ship
+++ b/ships/BitFifo.ship
@@ -89,7 +89,7 @@ was actually {\tt 37-Offset-Count} for all directions below.
 
 == Fleeterpreter ====================================================
 // Internal storage
-private static class BitStorage {
+static class BitStorage {
   long[] bits;
   int numbits = 0;
   int start = 0;

diff --git a/ships/Mul.ship b/ships/Mul.ship
new file mode 100644 (file)
index 0000000..3e30d8c
--- /dev/null
+++ b/ships/Mul.ship
@@ -0,0 +1,114 @@
+ship: Mul
+
+== Ports ===========================================================
+data  in:   in1
+data  in:   in2
+data  in:   in3
+
+data  out:  out1
+data  out:  out2
+data  out:  out3
+data  out:  bits
+
+== Constants ========================================================
+== TeX ==============================================================
+
+== Fleeterpreter ====================================================
+int count = 74;
+Bitfifo.BitStorage bits = new Bitfifo.BitStorage(74);
+public void service() {
+  if (box_in1.dataReadyForShip() &&
+      box_in2.dataReadyForShip() &&
+      box_in3.dataReadyForShip() &&
+      bits.hasSpace(1) &&
+      box_out1.readyForDataFromShip() &&
+      box_out2.readyForDataFromShip() &&
+      box_out3.readyForDataFromShip()) {
+      long v1 = box_in1.removeDataForShip();
+      long v2 = box_in2.removeDataForShip();
+      long v3 = box_in3.removeDataForShip();
+      long o1, o2, o3;
+      if (count % 2 == 0) {
+        o1 = v1;
+        o2 = v2 >>> 1;
+        o3 = ((v2 & 0x1L) == 0) ? 0 : v1;
+      } else {
+        o1 = ((v1 & v2) | (v2 & v3) | (v1 & v3))/* << 1*/;
+        o2 = (v1 ^ v2 ^ v3) >> 1;
+        o3 = 0;
+        bits.add((v1 ^ v2 ^ v3) & 0x1L, 1);
+        System.out.println("size is now " + bits.size());
+      }
+      box_out1.addDataFromShip(o1);
+      box_out2.addDataFromShip(o2);
+      box_out3.addDataFromShip(o3);
+      count--;
+      // This should be removed
+      if (count == 0) {
+        for (int i = 0; i < 37; i++) {
+          v1 = o1;
+          v2 = o2;
+          v3 = o3;
+          o1 = ((v1 & v2) | (v2 & v3) | (v1 & v3))/* << 1*/;
+          o2 = (v1 ^ v2 ^ v3) >> 1;
+          o3 = 0;
+          bits.add((v1 ^ v2 ^ v3) & 0x1L, 1);
+          System.out.println("size is now " + bits.size());
+        }
+        count = 74;
+      }
+  }
+  if (box_bits.readyForDataFromShip() &&
+      bits.size() >= 37) {
+      box_bits.addDataFromShip(bits.get(37));
+  }
+}
+
+== FleetSim ==============================================================
+
+== FPGA ==============================================================
+
+  reg                    have_a;
+  reg [(`DATAWIDTH-1):0] a;
+  reg                    have_b;
+  reg [(`DATAWIDTH-1):0] b;
+  reg                    have_c;
+  reg [(`DATAWIDTH-1):0] c;
+  reg                    have_out1;
+  reg                    have_out2;
+
+  always @(posedge clk) begin
+    if (have_out1) begin
+      `onwrite(out1_r, out1_a) have_out1 <= 0; end
+
+    end else if (have_out2) begin
+      `onwrite(out2_r, out2_a) have_out2 <= 0; end
+
+    end else if (!have_out1 && !have_out2) begin
+      if (!have_a) begin
+        `onread(in1_r, in1_a) have_a <= 1; a <= in1_d; end
+        end
+      if (!have_b) begin
+        `onread(in2_r, in2_a) have_b <= 1; b <= in2_d; end
+        end
+      if (!have_c) begin
+        `onread(in3_r, in3_a) have_c <= 1; c <= in3_d; end
+        end
+  
+      if (have_a && have_b && have_c) begin
+        out1_d    <= { { ((a & b) | (b & c) | (a & c)) } , 1'b0 };
+        out2_d    <= a ^ b ^ c;
+        have_a    <= 0;
+        have_b    <= 0;
+        have_c    <= 0;
+        have_out1 <= 1;
+        have_out2 <= 1;
+      end
+    end
+  end
+
+
+
+
+== Contributors =========================================================
+Adam Megacz <megacz@cs.berkeley.edu>