update internal encoding of Set Flags
authoradam <adam@megacz.com>
Tue, 11 Nov 2008 06:02:58 +0000 (07:02 +0100)
committeradam <adam@megacz.com>
Tue, 11 Nov 2008 06:02:58 +0000 (07:02 +0100)
src/edu/berkeley/fleet/two/FleetTwoFleet.java

index 6f4ea64..788df9b 100644 (file)
@@ -131,8 +131,16 @@ public abstract class FleetTwoFleet extends Fleet {
             SET_IMMEDIATE_EXTEND       = new Mask("..........101111.0....v..............");
 
             SET_FLAGS                  = new Mask("..........111110.....................");
-            SET_FLAGS_A                = new Mask("..........111110.........vvvvvv......");
-            SET_FLAGS_B                = new Mask("..........111110...............vvvvvv");
+            SET_FLAGS_A                = new Mask("..........111110...............vvvvvv");
+            SET_FLAGS_B                = new Mask("..........111110.........vvvvvv......");
+
+            SET_FLAGS_VALUE_A          = new Mask(".....1");
+            SET_FLAGS_VALUE_NOT_A      = new Mask("....1.");
+            SET_FLAGS_VALUE_B          = new Mask("...1..");
+            SET_FLAGS_VALUE_NOT_B      = new Mask("..1...");
+            SET_FLAGS_VALUE_C          = new Mask(".1....");
+            SET_FLAGS_VALUE_NOT_C      = new Mask("1.....");
+
         } else {
             DISPATCH_PATH              = new Mask("vvvvvvvvvvv..........................");
             DISPATCH_INSTR             = new Mask("...........vvvvvvvvvvvvvvvvvvvvvvvvvv");
@@ -177,13 +185,14 @@ public abstract class FleetTwoFleet extends Fleet {
             SET_FLAGS                  = new Mask("................100001...............");
             SET_FLAGS_A                = new Mask("................100001...vvvvvv......");
             SET_FLAGS_B                = new Mask("................100001.........vvvvvv");
+
+            SET_FLAGS_VALUE_A          = new Mask("1.....");
+            SET_FLAGS_VALUE_NOT_A      = new Mask(".1....");
+            SET_FLAGS_VALUE_B          = new Mask("..1...");
+            SET_FLAGS_VALUE_NOT_B      = new Mask("...1..");
+            SET_FLAGS_VALUE_C          = new Mask("....1.");
+            SET_FLAGS_VALUE_NOT_C      = new Mask(".....1");
         }
-        SET_FLAGS_VALUE_A          = new Mask("1.....");
-        SET_FLAGS_VALUE_NOT_A      = new Mask(".1....");
-        SET_FLAGS_VALUE_B          = new Mask("..1...");
-        SET_FLAGS_VALUE_NOT_B      = new Mask("...1..");
-        SET_FLAGS_VALUE_C          = new Mask("....1.");
-        SET_FLAGS_VALUE_NOT_C      = new Mask(".....1");
 
         WIDTH_WORD                 = PACKET_DATA.valmaskwidth;
         WIDTH_PACKET               = PACKET_TOKEN.width;