From b208d5c0e612392e96d1039d6ff5c47cb582b07a Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Thu, 23 Apr 2009 03:31:40 +0000 Subject: [PATCH] encoding bugfix --- testCode/edu/berkeley/fleet/two/FleetTwoFleet.java | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java b/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java index c6f074c..dfbca74 100644 --- a/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java +++ b/testCode/edu/berkeley/fleet/two/FleetTwoFleet.java @@ -99,13 +99,13 @@ public abstract class FleetTwoFleet extends Fleet { DISPATCH_PATH = new Mask("v...................................."); DISPATCH_INSTR = new Mask(".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv"); P = new Mask(".vvvvvv.............................."); - P_NOT_A = new Mask(".100001.............................."); - P_A = new Mask(".100010.............................."); - P_NOT_B = new Mask(".100100.............................."); - P_B = new Mask(".101000.............................."); + P_NOT_A = new Mask(".010001.............................."); + P_A = new Mask(".010010.............................."); + P_NOT_B = new Mask(".010100.............................."); + P_B = new Mask(".011000.............................."); P_UNUSED = new Mask(".111111.............................."); - P_OLC_ZERO = new Mask(".010000.............................."); - P_OLC_NONZERO = new Mask(".100000.............................."); + P_OLC_ZERO = new Mask(".100000.............................."); + P_OLC_NONZERO = new Mask(".010000.............................."); P_ALWAYS = new Mask(".000000.............................."); HEAD = new Mask(".......1............................."); @@ -131,13 +131,13 @@ public abstract class FleetTwoFleet extends Fleet { PATH_DATA = new Mask("............1..........00............"); PATH_NOCHANGE = new Mask("............1..........01............"); - SET_OLC_FROM_IMMEDIATE = new Mask(".............1..10.............vvvvvv"); - SET_OLC_FROM_DATA_LATCH = new Mask("..............1..11.................."); - SET_OLC_FROM_OLC_MINUS_ONE = new Mask("..............1..10.................."); + SET_OLC_FROM_OLC_MINUS_ONE = new Mask(".............1..1...................."); + SET_OLC_FROM_DATA_LATCH = new Mask("..............1.11..................."); + SET_OLC_FROM_IMMEDIATE = new Mask("..............1.10.............vvvvvv"); - SET_ILC_FROM_IMMEDIATE = new Mask("..............1..00..........0.vvvvvv"); - SET_ILC_FROM_INFINITY = new Mask("..............1..0...........1......."); - SET_ILC_FROM_DATA_LATCH = new Mask("..............1..01.................."); + SET_ILC_FROM_DATA_LATCH = new Mask("..............1.01..................."); + SET_ILC_FROM_IMMEDIATE = new Mask("..............1.00...........0.vvvvvv"); + SET_ILC_FROM_INFINITY = new Mask("..............1.0............1......."); SET_FLAGS = new Mask("...............1....................."); SET_FLAGS_A = new Mask("...............1...............vvvvvv"); -- 1.7.10.4