X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FGUIAm2910SP.java;h=2be4d04b5e999cb649f2987dd72a020f6aaa5a6b;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=fb449d25b57e7ea7a57a59c478084d96bc40d819;hpb=21ffb2a7f764069fb3c55b71647b43e8803e668c;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java index fb449d25..2be4d04b 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java @@ -9,8 +9,8 @@ import java.util.Map; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.Wire.ReadEnd; -import net.mograsim.logic.core.wires.Wire.ReadWriteEnd; +import net.mograsim.logic.core.wires.CoreWire.ReadEnd; +import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; import net.mograsim.logic.model.model.wires.Pin; @@ -22,7 +22,7 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent { public GUIAm2910SP(ViewModelModifiable model, String name) { - super(model, name, "Stack\npointer"); + super(model, "GUIAm2910SP", name, "Stack\npointer"); setSize(40, 30); addPin(new Pin(this, "STKI0", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); addPin(new Pin(this, "STKI1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); @@ -122,7 +122,6 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent return BitVector.of(X, 3); if (i == -2) return BitVector.of(U, 3); - // TODO maybe this is the wrong way around return BitVector.of((i & 0b100) > 0 ? ONE : ZERO, (i & 0b10) > 0 ? ONE : ZERO, (i & 0b1) > 0 ? ONE : ZERO); }