remove `flush macro, fold it into `cleanup

[fleet.git] / src / edu / berkeley / fleet / fpga / Fpga.java

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index 76016db..6f23308 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -97,12 +97,12 @@ public class Fpga extends FleetTwoFleet {
             for(int i=0; i<14; i++) createShip("Counter");
 
             // "really big" configuration: 138 docks
-            for(int i=0; i<10; i++)  createShip("Alu");
-            createShip("CarrySaveAdder");
-            createShip("Rotator");
-            createShip("Lut3");
+            for(int i=0; i<4; i++)  createShip("Alu");
+            //createShip("CarrySaveAdder");
+            //createShip("Rotator");
+            //createShip("Lut3");
 
-            //createShip("DRAM");
+            createShip("DDR2");
             //createShip("Video");
         }
 
@@ -197,18 +197,6 @@ public class Fpga extends FleetTwoFleet {
                 if (bb.isInputDock()) pw.print("if (!"+bb_name+"_r && "+bb_name+"_a) "+bb_name+"_a <= 0; ");
                 else                  pw.print("if ( "+bb_name+"_r && "+bb_name+"_a) "+bb_name+"_r <= 0; ");
             }
-            pw.println();
-
-            // FIXME: this corresponds to something
-            /*
-            pw.print("`define flush_happening (1");
-            for(DockDescription bb : sd.ports())
-                if (bb.isInputDock())
-                    pw.print(" && "+bb.getName()+"_r_ && !"+bb.getName()+"_a && "+bb.getName()+"_d["+WIDTH_WORD+"]");
-            pw.println(")");
-            */
-
-            pw.print("`define flush ");
             for(DockDescription bb : sd.ports())
                 if (bb.isInputDock())
                     pw.print(" if (!"+bb.getName()+"_r_) "+bb.getName()+"_f <= 0; ");
@@ -315,7 +303,7 @@ public class Fpga extends FleetTwoFleet {
                 pw.println("    if (!rst) begin");
                 pw.println("      `reset");
                 pw.println("    end else begin");
-                pw.println("      `flush");
+                pw.println("      `cleanup");
                 pw.println("      out_r <= out_r__;");
                 pw.println("      in_a  <= in_a__;");
                 pw.println("    end");