X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FGUIAm2904ShiftInstrDecode.java;h=2a3ce4efc2d9f3e90cf203dd1816c000dac84777;hb=30b24889d4ae001113c6cac543fb8c29d15d0ff2;hp=64935e86c48b0847893751d59b0f3c232e304a7d;hpb=dfea76c599b2875bcdfe7e785cc3b168f8983967;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java index 64935e86..2a3ce4ef 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java @@ -14,6 +14,7 @@ import net.mograsim.logic.core.wires.Wire.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; +import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; @@ -22,15 +23,16 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp public GUIAm2904ShiftInstrDecode(ViewModelModifiable model, String name) { super(model, name, "Shift \ninstruction\ndecode"); - setSize(60, 70); - addPin(new Pin(this, "I", 5, 0, 35), Usage.INPUT, Position.RIGHT); + setSize(60, 80); + addPin(new Pin(this, "I", 5, PinUsage.INPUT, 0, 25), Position.RIGHT); + addPin(new Pin(this, "_SE", 1, PinUsage.INPUT, 0, 55), Position.RIGHT); // SIO0 MUX: // 000: 0 // 001: 1 // 01x: SIOn // 10x: QIOn // 11x: MC - addPin(new Pin(this, "SIO0_MUX", 3, 60, 5), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "SIO0_MUX", 3, PinUsage.OUTPUT, 60, 5), Position.LEFT); // SIOn MUX: // 000: 0 // 001: 1 @@ -40,34 +42,66 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp // 101: MN // 110: IC // 111: IN xor IVOR - addPin(new Pin(this, "SIOn_MUX", 3, 60, 15), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "SIOn_MUX", 3, PinUsage.OUTPUT, 60, 15), Position.LEFT); // QIO0 MUX: // 000: 0 // 001: 1 // 01x: SIOn // 10x: QIOn // 11x: MC - addPin(new Pin(this, "QIO0_MUX", 3, 60, 25), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "QIO0_MUX", 3, PinUsage.OUTPUT, 60, 25), Position.LEFT); // QIOn MUX: // 000: 0 // 001: 1 // 01x: SIO0 // 10x: QIO0 // 11x: MN - addPin(new Pin(this, "QIOn_MUX", 3, 60, 35), Usage.OUTPUT, Position.LEFT); - addPin(new Pin(this, "LSHIFT", 1, 60, 45), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "QIOn_MUX", 3, PinUsage.OUTPUT, 60, 35), Position.LEFT); + addPin(new Pin(this, "OEn", 1, PinUsage.OUTPUT, 60, 45), Position.LEFT); + addPin(new Pin(this, "OE0", 1, PinUsage.OUTPUT, 60, 55), Position.LEFT); // 00: SIO0 // 01: QIO0 // 1x: SIOn - addPin(new Pin(this, "MC_MUX", 2, 60, 55), Usage.OUTPUT, Position.LEFT); - addPin(new Pin(this, "MC_EN", 1, 60, 65), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "MC_MUX", 2, PinUsage.OUTPUT, 60, 65), Position.LEFT); + addPin(new Pin(this, "MC_EN", 1, PinUsage.OUTPUT, 60, 75), Position.LEFT); } @Override - protected Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) + public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) { + Bit _SE = readEnds.get("_SE").getValue(); Bit[] IBits = readEnds.get("I").getValues().getBits(); - readWriteEnds.get("LSHIFT").feedSignals(IBits[0]); + readWriteEnds.get("OEn").feedSignals(IBits[0].not().and(_SE.not())); + readWriteEnds.get("OE0").feedSignals(IBits[0].and(_SE.not())); + if (_SE == Z || _SE == X) + { + readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("MC_MUX").feedSignals(X, X); + readWriteEnds.get("MC_EN").feedSignals(X); + return null; + } else if (_SE == U) + { + + readWriteEnds.get("SIO0_MUX").feedSignals(U, U, U); + readWriteEnds.get("SIOn_MUX").feedSignals(U, U, U); + readWriteEnds.get("QIO0_MUX").feedSignals(U, U, U); + readWriteEnds.get("QIOn_MUX").feedSignals(U, U, U); + readWriteEnds.get("MC_MUX").feedSignals(U, U); + readWriteEnds.get("MC_EN").feedSignals(U); + return null; + } else if (_SE == ONE) + { + readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("MC_MUX").feedSignals(X, X); + readWriteEnds.get("MC_EN").feedSignals(ZERO); + return null; + } // TODO move the following loop to BitVector. int IAsInt = 0; for (int i = 0; i < 5; i++) @@ -77,20 +111,20 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp IAsInt |= 1 << i; break; case U: - readWriteEnds.get("SIO0_MUX").feedSignals(U); - readWriteEnds.get("SIOn_MUX").feedSignals(U); - readWriteEnds.get("QIO0_MUX").feedSignals(U); - readWriteEnds.get("QIOn_MUX").feedSignals(U); - readWriteEnds.get("MC_MUX").feedSignals(U); + readWriteEnds.get("SIO0_MUX").feedSignals(U, U, U); + readWriteEnds.get("SIOn_MUX").feedSignals(U, U, U); + readWriteEnds.get("QIO0_MUX").feedSignals(U, U, U); + readWriteEnds.get("QIOn_MUX").feedSignals(U, U, U); + readWriteEnds.get("MC_MUX").feedSignals(U, U); readWriteEnds.get("MC_EN").feedSignals(U); return null; case X: case Z: - readWriteEnds.get("SIO0_MUX").feedSignals(X); - readWriteEnds.get("SIOn_MUX").feedSignals(X); - readWriteEnds.get("QIO0_MUX").feedSignals(X); - readWriteEnds.get("QIOn_MUX").feedSignals(X); - readWriteEnds.get("MC_MUX").feedSignals(X); + readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("MC_MUX").feedSignals(X, X); readWriteEnds.get("MC_EN").feedSignals(X); return null; case ZERO: @@ -100,8 +134,8 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp } if (IAsInt < 16) { - readWriteEnds.get("SIO0_MUX").feedSignals(Z, Z, Z); - readWriteEnds.get("QIO0_MUX").feedSignals(Z, Z, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); switch (IAsInt) { case 0: @@ -148,7 +182,7 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ZERO, ONE); break; case 2: - readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ONE, Z); + readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ONE, X); break; case 3: case 4: @@ -160,20 +194,20 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp case 13: case 14: case 15: - readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ONE, Z); + readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ONE, X); break; case 8: case 9: case 10: - readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ZERO, Z); + readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ZERO, X); break; default: throw new IllegalStateException("can't happen"); } } else { - readWriteEnds.get("SIOn_MUX").feedSignals(Z, Z, Z); - readWriteEnds.get("QIOn_MUX").feedSignals(Z, Z, Z); + readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); + readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); switch (IAsInt) { case 16: @@ -192,15 +226,15 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp case 29: case 30: case 31: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, X); break; case 24: case 26: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, X); break; case 25: case 27: - readWriteEnds.get("SIO0_MUX").feedSignals(ZERO, ONE, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(ZERO, ONE, X); break; default: throw new IllegalStateException("can't happen"); @@ -223,15 +257,15 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp case 24: case 25: case 26: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, X); break; case 28: case 30: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, Z); + readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, X); break; case 29: case 31: - readWriteEnds.get("QIO0_MUX").feedSignals(ZERO, ONE, Z); + readWriteEnds.get("QIO0_MUX").feedSignals(ZERO, ONE, X); break; default: throw new IllegalStateException("can't happen"); @@ -259,7 +293,7 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp case 30: case 31: readWriteEnds.get("MC_EN").feedSignals(ZERO); - readWriteEnds.get("MC_MUX").feedSignals(Z, Z); + readWriteEnds.get("MC_MUX").feedSignals(X, X); break; case 2: case 8: @@ -282,7 +316,7 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp case 28: case 29: readWriteEnds.get("MC_EN").feedSignals(ONE); - readWriteEnds.get("MC_MUX").feedSignals(ONE, Z); + readWriteEnds.get("MC_MUX").feedSignals(ONE, X); break; default: throw new IllegalStateException("can't happen");