From: Adam Megacz Date: Thu, 16 Jul 2009 18:56:13 +0000 (-0700) Subject: fix bug in encoding of SET instruction for Marina X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8b1a948e7dd11e188ccbed082791aec6338196f9;p=fleet.git fix bug in encoding of SET instruction for Marina --- diff --git a/src/edu/berkeley/fleet/two/FleetTwoFleet.java b/src/edu/berkeley/fleet/two/FleetTwoFleet.java index c5cae65..7936ad0 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoFleet.java +++ b/src/edu/berkeley/fleet/two/FleetTwoFleet.java @@ -130,13 +130,13 @@ public abstract class FleetTwoFleet extends Fleet { PATH_DATA = new Mask("............1..........00............"); PATH_NOCHANGE = new Mask("............1..........01............"); + 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_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_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");