From: megacz Date: Fri, 20 Mar 2009 02:10:33 +0000 (-0700) Subject: correct encoding of Marina predicate bits X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=197cece1073d289013bed8585d401f0d3b998a46;p=fleet.git correct encoding of Marina predicate bits --- diff --git a/src/edu/berkeley/fleet/two/FleetTwoFleet.java b/src/edu/berkeley/fleet/two/FleetTwoFleet.java index 19d5e9b..fea301d 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoFleet.java +++ b/src/edu/berkeley/fleet/two/FleetTwoFleet.java @@ -98,14 +98,14 @@ 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(".011110.............................."); - P_A = new Mask(".011101.............................."); - P_NOT_B = new Mask(".011011.............................."); - P_B = new Mask(".010111.............................."); - P_UNUSED = new Mask(".000000.............................."); - P_OLC_ZERO = new Mask(".101111.............................."); - P_OLC_NONZERO = new Mask(".011111.............................."); - P_ALWAYS = new Mask(".111111.............................."); + P_NOT_A = new Mask(".100001.............................."); + P_A = new Mask(".100010.............................."); + P_NOT_B = new Mask(".100100.............................."); + P_B = new Mask(".101000.............................."); + P_UNUSED = new Mask(".111111.............................."); + P_OLC_ZERO = new Mask(".010000.............................."); + P_OLC_NONZERO = new Mask(".100000.............................."); + P_ALWAYS = new Mask(".000000.............................."); // use these when Marina gets updated to 07-Jan-2009 version of internal encoding