FPGA-Fleet updates

[fleet.git] / src / edu / berkeley / fleet / slipway / Slipway.java

diff --git a/src/edu/berkeley/fleet/slipway/Slipway.java b/src/edu/berkeley/fleet/slipway/Slipway.java
index 9303c5a..24b63a9 100644 (file)
--- a/src/edu/berkeley/fleet/slipway/Slipway.java
+++ b/src/edu/berkeley/fleet/slipway/Slipway.java
@@ -25,21 +25,21 @@ public class Slipway extends Fleet {
         new Slipway().dumpFabric(false);
     }
 
-    public Slipway() { this("valentine.bit"); }
+    public Slipway() { this("groundhog.bit"); }
     public Slipway(String bitfile) {
         this.bitfile = bitfile;
         createShip("Debug",   "debug");
         createShip("Alu2",    "alu2a");
         createShip("Alu2",    "alu2b");
-        //createShip("Alu2",    "alu2c");
-        //createShip("Alu2",    "alu2d");
+        createShip("Alu2",    "alu2c");
+        createShip("Alu2",    "alu2d");
         createShip("Execute", "execute");
         createShip("Fifo",    "fifo1");
         createShip("Fifo",    "fifo2");
-        //createShip("Fifo",    "fifo3");
-        //createShip("Fifo",    "fifo4");
+        createShip("Fifo",    "fifo3");
+        createShip("Fifo",    "fifo4");
+        createShip("Memory",    "Memory");
         createShip("Memory",    "Memory");
-        //createShip("Memory",    "Memory");
         createShip("Lut3",      "lut3");
         createShip("Alu1",      "alu1");
         createShip("Choice",    "Choice");
@@ -224,11 +224,11 @@ public class Slipway extends Fleet {
                 } else if (prefix.equals("dest")) {
                     p.addr = addr;
                     p.bits = bits;
-                    int count = 1;
+                    int count = 0;
                     for(Destination d : p.getDestinations()) {
                         if (!(d instanceof SlipwayBenkoBox.VirtualPort)) continue;
                         SlipwayBenkoBox.VirtualPort vp = (SlipwayBenkoBox.VirtualPort)d;
-                        vp.addr = p.addr | (count << (bits+1));
+                        vp.addr = p.addr | (count << bits);
                         count++;
                     }
                 }
@@ -327,7 +327,7 @@ public class Slipway extends Fleet {
             FileOutputStream out = new FileOutputStream(outf);
             PrintWriter pw = new PrintWriter(out);
 
-            boolean auto = filename.equals("alu2") || filename.equals("alu1") || filename.equals("lut3");
+            boolean auto = filename.equals("alu2") || filename.equals("alu1") || filename.equals("lut3") || filename.equals("choice");
             if (auto) {
                 pw.println("`include \"macros.v\"");
                 pw.println();
@@ -357,7 +357,7 @@ public class Slipway extends Fleet {
                                    bb_name+"_r,  "+
                                    bb_name+"_a,  "+
                                    bb_name+"_a_, "+
-                                   "[(`DATAWIDTH-1):0],"+
+                                   "[(`PACKET_WIDTH-1):0],"+
                                    bb_name+"_d)"
                                    );
                     } else {
@@ -365,12 +365,12 @@ public class Slipway extends Fleet {
                                    bb_name+"_r,  "+
                                    bb_name+"_r_, "+
                                    bb_name+"_a,  "+
-                                   "[(`DATAWIDTH-1):0],"+
+                                   "[(`PACKET_WIDTH-1):0],"+
                                    bb_name+"_d_)"
                                    );
                         pw.println("`defreg(" +
                                    bb_name+"_d_,  "+
-                                   "[(`DATAWIDTH-1):0],"+
+                                   "[(`PACKET_WIDTH-1):0],"+
                                    bb_name+"_d)"
                                    );
                     }