make bitfile= option work
authoradam <adam@megacz.com>
Tue, 13 Feb 2007 14:38:56 +0000 (15:38 +0100)
committeradam <adam@megacz.com>
Tue, 13 Feb 2007 14:38:56 +0000 (15:38 +0100)
src/edu/berkeley/fleet/slipway/Slipway.java

index a97d404..b694add 100644 (file)
@@ -16,8 +16,13 @@ import edu.berkeley.fleet.interpreter.ships.*;
 
 public class Slipway extends Interpreter {
 
+    private String bitfile;
+
     public Slipway() { this("superbowl.bit"); }
     public Slipway(String bitfile) {
+        this.bitfile = bitfile;
+        createShip("Debug",   "debug");
+        createShip("Fifo",    "fifo1");
         createShip("Alu2",    "alu2a");
         createShip("Alu2",    "alu2b");
         createShip("Alu2",    "alu2c");
@@ -54,7 +59,7 @@ public class Slipway extends Interpreter {
 
     public FleetProcess run(final byte[] instructions) {
         try {
-            return new Client(instructions);
+            return new Client(bitfile, instructions);
         } catch (IOException e) { throw new RuntimeException(e); }
     }