projects / Mograsim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'fusebug' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019...
[Mograsim.git] / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / components / am2904 / GUIAm2904ShiftInstrDecode.java
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 64935e8..51b6da0 100644 (file)
--- 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
@@ -22,8 +22,9 @@ 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, 0, 25), Usage.INPUT, Position.RIGHT);
+               addPin(new Pin(this, "_SE", 1, 0, 55), Usage.INPUT, Position.RIGHT);
                // SIO0 MUX:
                // 000: 0
                // 001: 1
@@ -55,19 +56,51 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp
                // 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, "OEn", 1, 60, 45), Usage.OUTPUT, Position.LEFT);
+               addPin(new Pin(this, "OE0", 1, 60, 55), Usage.OUTPUT, 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, 60, 65), Usage.OUTPUT, Position.LEFT);
+               addPin(new Pin(this, "MC_EN", 1, 60, 75), Usage.OUTPUT, Position.LEFT);
        }
 
        @Override
        protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> 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 +110,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 +133,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 +181,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 +193,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 +225,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 +256,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 +292,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 +315,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");
Mirror of https://github.com/Mograsim-Team/Mograsim