From: adam <adam@megacz.com>
Date: Sat, 8 Nov 2008 03:00:59 +0000 (+0100)
Subject: change polarity of I-bit
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7df9fed5ebe3dd4375ced582fe9715f4d701fa0b;p=fleet.git

change polarity of I-bit
---

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDock.java b/src/edu/berkeley/fleet/fpga/FpgaDock.java
index 21feeaa..527b631 100644
--- a/src/edu/berkeley/fleet/fpga/FpgaDock.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDock.java
@@ -249,7 +249,7 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
                     token_out,
                     predicate_met,
                     fpga.MOVE.verilog(ondeck.getName()),
-                    fpga.I.verilog(ondeck.getName()),
+                    "!"+fpga.NOT_INTERRUPTIBLE.verilog(ondeck.getName()),
                     torpedoWaiting.isFull()
                 },
                 new Object[] {
@@ -269,7 +269,7 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
                                      data_out,
                                      token_out,
                                      predicate_met,
-                                     "(!"+fpga.MOVE.verilog(ondeck.getName())+" || !"+fpga.I.verilog(ondeck.getName())+" || !"+torpedoWaiting.isFull()+")",
+                                     "(!"+fpga.MOVE.verilog(ondeck.getName())+" || "+fpga.NOT_INTERRUPTIBLE.verilog(ondeck.getName())+" || !"+torpedoWaiting.isFull()+")",
                                      new ConditionalTrigger(fpga.DI.verilog(ondeck.getName()), data_in),
                                      new ConditionalTrigger(fpga.TI.verilog(ondeck.getName()), token_in)
                       },
diff --git a/src/edu/berkeley/fleet/two/FleetTwoFleet.java b/src/edu/berkeley/fleet/two/FleetTwoFleet.java
index 0f44bc3..d73fcb6 100644
--- a/src/edu/berkeley/fleet/two/FleetTwoFleet.java
+++ b/src/edu/berkeley/fleet/two/FleetTwoFleet.java
@@ -21,7 +21,7 @@ public abstract class FleetTwoFleet extends Fleet {
     public final Mask WHOLE_WORD;
     public final Mask DISPATCH_PATH;
     public final Mask DISPATCH_INSTR;
-    public final Mask I;
+    public final Mask NOT_INTERRUPTIBLE;
     public final Mask OS;
     public final Mask P;
     public final Mask P_NOT_A;
@@ -92,7 +92,7 @@ public abstract class FleetTwoFleet extends Fleet {
 
             DISPATCH_PATH              = new Mask("v....................................");
             DISPATCH_INSTR             = new Mask(".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv");
-            I                          = new Mask(".................1...................");
+            NOT_INTERRUPTIBLE          = new Mask(".................1...................");
             OS                         = new Mask(".......1.............................");
             P                          = new Mask(".vvvvvv..............................");
             P_NOT_A                    = new Mask(".100001..............................");
@@ -136,7 +136,7 @@ public abstract class FleetTwoFleet extends Fleet {
         } else {
             DISPATCH_PATH              = new Mask("vvvvvvvvvvv..........................");
             DISPATCH_INSTR             = new Mask("...........vvvvvvvvvvvvvvvvvvvvvvvvvv");
-            I                          = new Mask("...........1.........................");
+            NOT_INTERRUPTIBLE          = new Mask("...........1.........................");
             OS                         = new Mask("............1........................");
             P                          = new Mask(".............vvv.....................");
             P_NOT_A                    = new Mask(".............000.....................");
@@ -295,7 +295,7 @@ public abstract class FleetTwoFleet extends Fleet {
             return new Move(dock,
                             looping,
                             predicate,
-                            I.get(inst),
+                            !NOT_INTERRUPTIBLE.get(inst),
                             getPathByAddr(dock, PATH_IMMEDIATE.getvalAsBitVector(inst)),
                             TI.get(inst),
                             DI.get(inst),
@@ -395,7 +395,7 @@ public abstract class FleetTwoFleet extends Fleet {
             if (inst.latchData)                  instr = DC.set(instr);
             if (inst.dataOut)                    instr = DO.set(instr);
             if (inst.tokenOut)                   instr = TO.set(instr);
-            if (inst.interruptible)              instr = I.set(instr);
+            if (!inst.interruptible)             instr = NOT_INTERRUPTIBLE.set(instr);
 
             if (inst.latchPath)                  instr = PATH_DATA.set(instr);
             else {