make bitfile= option work

diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java
index 7381036..2b8d0e1 100644 (file)
--- a/src/edu/berkeley/fleet/Main.java
+++ b/src/edu/berkeley/fleet/Main.java
@@ -34,7 +34,8 @@ public class Main {
         String target = options.get("target");
         Fleet fleet;
         if ("fpga".equals(target)) {
-            fleet = new Slipway();
+            String bitfile = options.get("bitfile");
+            fleet = bitfile == null ? new Slipway() : new Slipway(bitfile);
         } else if ("sim".equals(target) || "fleetsim".equals(target)) {
             fleet = (Fleet)Class.forName("com.sunlabs.fleetsim.fleet.FleetDescription").newInstance();
         } else {
@@ -124,13 +125,7 @@ public class Main {
             if (numread==-1) break;
             baos.write(buf, 0, numread);
         }
-        String bitfile = options.get("bitfile");
         FleetProcess client = fleet.run(baos.toByteArray());
-            /*
-            bitfile==null
-            ? fleet.run(baos.toByteArray())
-            : fleet.run(bitfile, baos.toByteArray());
-            */
         while(true) {
             long result = client.readWord();
             System.err.print(result);

diff --git a/src/edu/berkeley/fleet/slipway/Slipway.java b/src/edu/berkeley/fleet/slipway/Slipway.java
index 46c9ca9..26a7dd2 100644 (file)
--- a/src/edu/berkeley/fleet/slipway/Slipway.java
+++ b/src/edu/berkeley/fleet/slipway/Slipway.java
@@ -16,7 +16,8 @@ import edu.berkeley.fleet.interpreter.ships.*;
 
 public class Slipway extends Interpreter {
 
-    public Slipway() {
+    public Slipway() { this("superbowl.bit"); }
+    public Slipway(String bitfile) {
         createShip("Alu2",    "alu2a");
         createShip("Alu2",    "alu2b");
         createShip("Alu2",    "alu2c");