From: megacz Date: Sat, 14 Mar 2009 22:03:34 +0000 (-0700) Subject: update internal encoding for Marina2 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=029cb8a7b57efa415929b51e235a17d101ac7a6e;p=fleet.git update internal encoding for Marina2 --- diff --git a/src/edu/berkeley/fleet/two/FleetTwoFleet.java b/src/edu/berkeley/fleet/two/FleetTwoFleet.java index e446dd0..8f54036 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoFleet.java +++ b/src/edu/berkeley/fleet/two/FleetTwoFleet.java @@ -98,8 +98,6 @@ public abstract class FleetTwoFleet extends Fleet { DISPATCH_PATH = new Mask("v...................................."); DISPATCH_INSTR = new Mask(".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv"); - NOT_INTERRUPTIBLE = new Mask(".................1..................."); - OS = new Mask(".......1............................."); P = new Mask(".vvvvvv.............................."); P_NOT_A = new Mask(".011110.............................."); P_A = new Mask(".011101.............................."); @@ -110,44 +108,42 @@ public abstract class FleetTwoFleet extends Fleet { P_OLC_NONZERO = new Mask(".011111.............................."); P_ALWAYS = new Mask(".111111.............................."); - SHIFT = new Mask("..........101111.1vvvvvvvvvvvvvvvvvvv"); - /* // use these when Marina gets updated to 07-Jan-2009 version of internal encoding HEAD = new Mask(".......1............................."); ABORT = new Mask("........1............................"); TAIL = new Mask(".........1..........................."); - */ - - TAIL = new Mask("................1...................0"); - HEAD = null; - ABORT = null; - - MOVE = new Mask("..........110111....................."); - TI = new Mask("..........110111..1.................."); - DI = new Mask("..........110111...1................."); - FLUSH = new Mask(".........1110111....................."); - DC = new Mask("..........110111....1................"); - DO = new Mask("..........110111.....1..............."); - TO = new Mask("..........110111......1.............."); - PATH_IMMEDIATE = new Mask("..........110111.......1vvvvvvvvvvvvv"); - PATH_DATA = new Mask("..........110111.......00............"); - PATH_NOCHANGE = new Mask("..........110111.......01............"); - - SET_OLC_FROM_IMMEDIATE = new Mask("..........111101.0.............vvvvvv"); - SET_OLC_FROM_DATA_LATCH = new Mask("..........111101.1..................."); - SET_OLC_FROM_OLC_MINUS_ONE = new Mask("..........111011....................."); - - SET_ILC_FROM_IMMEDIATE = new Mask("..........011111.0...........0.vvvvvv"); - SET_ILC_FROM_INFINITY = new Mask("..........011111.............1......."); - SET_ILC_FROM_DATA_LATCH = new Mask("..........011111.1..................."); - - SET_IMMEDIATE = new Mask("..........101111.0.....vvvvvvvvvvvvvv"); - 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......"); + + OS = new Mask(".......1............................."); + + // actually "is interruptible" + NOT_INTERRUPTIBLE = new Mask("...........1....1...................."); + + SHIFT = new Mask("..........1......1vvvvvvvvvvvvvvvvvvv"); + SET_IMMEDIATE = new Mask("..........1......0.....vvvvvvvvvvvvvv"); + SET_IMMEDIATE_EXTEND = new Mask("..........1......0....v.............."); + MOVE = new Mask("............1........................"); + TI = new Mask("............1.....1.................."); + DI = new Mask("............1......1................."); + FLUSH = new Mask("..........1......0.....011..........."); + DC = new Mask("............1.......1................"); + DO = new Mask("............1........1..............."); + TO = new Mask("............1.........1.............."); + PATH_IMMEDIATE = new Mask("............1..........1vvvvvvvvvvvvv"); + 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_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_FLAGS = new Mask("...............1....................."); + SET_FLAGS_A = new Mask("...............1...............vvvvvv"); + SET_FLAGS_B = new Mask("...............1.........vvvvvv......"); SET_FLAGS_VALUE_A = new Mask(".....1"); SET_FLAGS_VALUE_NOT_A = new Mask("....1.");