formatting
authoradam <adam@megacz.com>
Sat, 24 Feb 2007 19:21:54 +0000 (20:21 +0100)
committeradam <adam@megacz.com>
Sat, 24 Feb 2007 19:21:54 +0000 (20:21 +0100)
src/edu/berkeley/fleet/slipway/Slipway.java

index 24b63a9..9fdefaf 100644 (file)
@@ -33,11 +33,11 @@ public class Slipway extends Fleet {
         createShip("Alu2",    "alu2b");
         createShip("Alu2",    "alu2c");
         createShip("Alu2",    "alu2d");
-        createShip("Execute", "execute");
         createShip("Fifo",    "fifo1");
         createShip("Fifo",    "fifo2");
         createShip("Fifo",    "fifo3");
         createShip("Fifo",    "fifo4");
+        createShip("Execute", "execute");
         createShip("Memory",    "Memory");
         createShip("Memory",    "Memory");
         createShip("Lut3",      "lut3");
@@ -237,7 +237,7 @@ public class Slipway extends Fleet {
             int len = end-start;
             return new Node(name,
                             component,
-                            mkNode(name+"_0", component, ports, start, start+len/2, addr, bits+1),
+                            mkNode(name+"_0", component, ports, start, start+len/2, addr,               bits+1),
                             mkNode(name+"_1", component, ports, start+len/2, end,   addr | (1 << bits), bits+1),
                             addr,
                             bits);