use getConstant(String) rather than "magic numbers" in Process.java

diff --git a/src/edu/berkeley/fleet/ir/Process.java b/src/edu/berkeley/fleet/ir/Process.java
index 47a6604..bd5b977 100644 (file)
--- a/src/edu/berkeley/fleet/ir/Process.java
+++ b/src/edu/berkeley/fleet/ir/Process.java
@@ -253,6 +253,9 @@ public class Process {
                     lf.recvToken();
                 }
             }
+            public BitVector getConstant(String constantName) {
+                return dock.getConstant(constantName);
+            }
         }
 
         public /*final*/ class DockOutPort extends OutPort {
@@ -358,7 +361,9 @@ public class Process {
         public  final OutPort out   = new DockOutPort("out", ship.getDock("out"));
         public  final InPort  val   = new DockInPort("in1",  ship.getDock("in1"));
         public  final InPort  count = new DockInPort("in2",  ship.getDock("in2"), 0, new BitVector[] { null, bv(1) });
-        public  final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] { bv(6 /*PASS_C2_V1*/), bv(10 /*DROP_C2_V1*/) } );
+        public  final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+                ship.getDock("inOp").getConstant("PASS_C2_V1"),
+                ship.getDock("inOp").getConstant("DROP_C2_V1") } );
         public UnPunctuatorModule() { }
     }
 
@@ -367,7 +372,9 @@ public class Process {
         private final Ship    ship  = pool.allocateShip("Counter");
         public  final OutPort out   = new DockOutPort("out", ship.getDock("out"));
         public  final InPort  val   = new DockInPort("in1",  ship.getDock("in1"));
-        public  final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] { bv(6 /*PASS_C2_V1*/), bv(7 /*PASS_C2_V2*/) } );
+        public  final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+                ship.getDock("inOp").getConstant("PASS_C2_V1"),
+                ship.getDock("inOp").getConstant("PASS_C2_V2") } );
         public  final InPort  count;
         public PunctuatorModule(long punc) {
             this.punc = punc;
@@ -388,7 +395,8 @@ public class Process {
         public final Ship    ship  = pool.allocateShip("Counter");
         public final InPort  start = new DockInPort("in1",  ship.getDock("in1"));
         public final InPort  incr  = new DockInPort("in2",  ship.getDock("in2"));
-        public final InPort  inOp  = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] { bv(12 /*COUNTDOWN*/) });
+        public final InPort  inOp  = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+                ship.getDock("inOp").getConstant("COUNT") });
         public final OutPort out   = new DockOutPort("out", ship.getDock("out"));
         public DownCounterModule() { }
     }
@@ -397,7 +405,8 @@ public class Process {
         public final Ship    ship   = pool.allocateShip("Counter");
         public final InPort  count  = new DockInPort("in1",  ship.getDock("in1"));
         public final InPort  val    = new DockInPort("in2",  ship.getDock("in2"));
-        public final InPort  inOP   = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] { bv(1 /*REPEAT_C1_V2*/) });
+        public final InPort  inOP   = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+                ship.getDock("inOp").getConstant("REPEAT_C1_V2") });
         public final OutPort out    = new DockOutPort("out", ship.getDock("out"));
         public RepeatModule() { }
     }
@@ -406,7 +415,8 @@ public class Process {
         public final Ship    ship = pool.allocateShip("Alu");
         public final InPort  in1  = new DockInPort("in1",  ship.getDock("in1"));
         public final InPort  in2  = new DockInPort("in2",  ship.getDock("in2"));
-        public final InPort  inOp = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] { bv(9 /*MAXMERGE*/) });
+        public final InPort  inOp = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+                ship.getDock("inOp").getConstant("MAXMERGE") });
         public final OutPort out  = new DockOutPort("out", ship.getDock("out"));
         public SortedMergeModule() { }
     }
@@ -672,7 +682,7 @@ public class Process {
             AluModule alu = proc.new AluModule();
             alu.in1.connect(r1.out);
             alu.in2.connect(c0.out);
-            alu.inOp.connect(proc.new ForeverModule(2).out);  // ADD
+            alu.inOp.connect(proc.new ForeverModule(((Module.DockInPort)alu.inOp).getConstant("ADD")).out);
             alu.out.connect(i==0 ? mm.inAddrRead1 : mm.inAddrRead2);
 
             PunctuatorModule punc = proc.new PunctuatorModule(-1);
@@ -745,7 +755,7 @@ public class Process {
 
             Context ctx3 = new Context(fp.getFleet());
             lf = new LoopFactory(ctx3, counter.getDock("inOp"), 1);
-            lf.literal(9);
+            lf.literal("DROP_C1_V2");
             lf.deliver();
             lf.literal(5);
             lf.deliver();