From: Adam Megacz <adam.megacz@sun.com>
Date: Tue, 21 Apr 2009 06:22:34 +0000 (+0000)
Subject: fix another encoding bug
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=0dd7e9366b1eeb8c0a9b09e05c71e74bb0eacc10;p=fleet.git

fix another encoding bug
---

diff --git a/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java b/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java
index 5e76070..c6f074c 100644
--- a/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java
+++ b/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java
@@ -25,6 +25,7 @@ public abstract class FleetTwoFleet extends Fleet {
     public final Mask DISPATCH_PATH;
     public final Mask DISPATCH_INSTR;
     public final Mask NOT_INTERRUPTIBLE;
+    public final Mask IS_INTERRUPTIBLE;
     public final Mask P;
     public final Mask P_NOT_A;
     public final Mask P_A;
@@ -112,7 +113,8 @@ public abstract class FleetTwoFleet extends Fleet {
             TAIL                       = new Mask(".........1...........................");
 
             // actually "is interruptible"
-            NOT_INTERRUPTIBLE          = new Mask("...........1....1....................");
+            NOT_INTERRUPTIBLE          = new Mask("...........0....0....................");
+            IS_INTERRUPTIBLE           = new Mask("...........1....1....................");
 
             SHIFT                      = new Mask("..........1......1vvvvvvvvvvvvvvvvvvv");
             SET_IMMEDIATE              = new Mask("..........1......0.....vvvvvvvvvvvvvv");
@@ -152,6 +154,7 @@ public abstract class FleetTwoFleet extends Fleet {
             DISPATCH_PATH              = new Mask("vvvvvvvvvvv..........................");
             DISPATCH_INSTR             = new Mask("...........vvvvvvvvvvvvvvvvvvvvvvvvvv");
             NOT_INTERRUPTIBLE          = new Mask("...........1.........................");
+            IS_INTERRUPTIBLE           = new Mask("...........0.........................");
             P                          = new Mask(".............vvv.....................");
             P_NOT_A                    = new Mask(".............000.....................");
             P_A                        = new Mask(".............001.....................");
@@ -432,6 +435,7 @@ public abstract class FleetTwoFleet extends Fleet {
             if (inst.dataOut)                    instr = DO.set(instr);
             if (inst.tokenOut)                   instr = TO.set(instr);
             if (!inst.interruptible)             instr = NOT_INTERRUPTIBLE.set(instr);
+            else                                 instr = IS_INTERRUPTIBLE.set(instr);
 
             if (inst.latchPath)                  instr = PATH_DATA.set(instr);
             else if (inst.path!=null) {