From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sun, 18 Aug 2019 19:01:34 +0000 (+0200)
Subject: Renamed GUIAm2904RegCTInstrDecode and added it to standardCompIDMapping
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=422779cc67647f9495b06f5fb84e9b27de95e0c2;p=Mograsim.git

Renamed GUIAm2904RegCTInstrDecode and added it to standardCompIDMapping
---

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java
new file mode 100644
index 00000000..d010b302
--- /dev/null
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java
@@ -0,0 +1,267 @@
+package net.mograsim.logic.model.am2900.components.am2904;
+
+import static net.mograsim.logic.core.types.Bit.ONE;
+import static net.mograsim.logic.core.types.Bit.U;
+import static net.mograsim.logic.core.types.Bit.X;
+import static net.mograsim.logic.core.types.Bit.ZERO;
+
+import java.util.Map;
+
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+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.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
+
+public class GUIAm2904RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent
+{
+	public GUIAm2904RegCTInstrDecode(ViewModelModifiable model, String name)
+	{
+		super(model, name, "Instruction\ndecode");
+		setSize(80, 80);
+		addPin(new Pin(this, "I", 6, 0, 40), Usage.INPUT, Position.RIGHT);
+		// muSR MUX:
+		// 00: 0
+		// 01: 1
+		// 10: M
+		// 11: I
+		addPin(new Pin(this, "muSR_MUX", 2, 80, 10), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR_OVRRET", 1, 80, 20), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR_CINV", 1, 80, 30), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR__WEZ", 1, 80, 40), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR__WEC", 1, 80, 50), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR__WEN", 1, 80, 60), Usage.OUTPUT, Position.LEFT);
+		addPin(new Pin(this, "muSR__WEOVR", 1, 80, 70), Usage.OUTPUT, Position.LEFT);
+		// MSR MUX:
+		// 000: 0
+		// 001: 1
+		// 010: mu
+		// 011: Y
+		// 100: I
+		// 101: I, invert C
+		// 110: Swap OVR and C
+		// 111: _M
+		addPin(new Pin(this, "MSR_MUX", 3, 40, 0), Usage.OUTPUT, Position.BOTTOM);
+		// CT SRC MUX:
+		// 00: mu
+		// 01: mu
+		// 10: M
+		// 11: I
+		addPin(new Pin(this, "CT_SRC_MUX", 2, 10, 80), Usage.OUTPUT, Position.TOP);
+		// CT MUX:
+		// see Am2900 Family Data Book, Am2904, Table 4 (CT_MUX2-0 = I3-1)
+		addPin(new Pin(this, "CT_MUX", 3, 30, 80), Usage.OUTPUT, Position.TOP);
+		addPin(new Pin(this, "CT_INV", 1, 50, 80), Usage.OUTPUT, Position.TOP);
+		addPin(new Pin(this, "CT_EXP", 1, 70, 80), Usage.OUTPUT, Position.TOP);
+	}
+
+	@Override
+	protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+	{
+		Bit[] IBits = readEnds.get("I").getValues().getBits();
+		int IAsInt = 0;
+		for (int i = 0; i < 6; i++)
+			switch (IBits[5 - i])
+			{
+			case ONE:
+				IAsInt |= 1 << i;
+				break;
+			case U:
+				for (ReadWriteEnd e : readWriteEnds.values())
+					e.feedSignals(U);
+				return null;
+			case X:
+			case Z:
+				for (ReadWriteEnd e : readWriteEnds.values())
+					e.feedSignals(X);
+				return null;
+			case ZERO:
+				break;
+			default:
+				throw new IllegalArgumentException("Unknown enum constant: " + IBits[i]);
+			}
+		switch (IAsInt)
+		{
+		case 0:
+		case 2:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 1:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 3:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 6:
+		case 7:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ONE);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 8:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 9:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 10:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 11:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 12:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 13:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
+			break;
+		case 14:
+			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 15:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		case 24:
+		case 25:
+		case 40:
+		case 41:
+		case 56:
+		case 57:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ONE);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+			break;
+		default:
+			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
+			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
+			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
+			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
+		}
+		switch (IAsInt)
+		{
+		case 0:
+			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ZERO);
+			break;
+		case 1:
+			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ZERO);
+			break;
+		case 2:
+			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ZERO);
+			break;
+		case 3:
+			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ZERO);
+			break;
+		case 4:
+			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ONE);
+			break;
+		case 5:
+			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ONE);
+			break;
+		case 8:
+		case 9:
+		case 24:
+		case 25:
+		case 40:
+		case 41:
+		case 56:
+		case 57:
+			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ONE);
+			break;
+		default:
+			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ONE);
+			break;
+		}
+		readWriteEnds.get("CT_SRC_MUX").feedSignals(IBits[0], IBits[1]);
+		readWriteEnds.get("CT_INV").feedSignals(IBits[5]);
+		readWriteEnds.get("CT_MUX").feedSignals(IBits[2], IBits[3], IBits[4]);
+		readWriteEnds.get("CT_EXP").feedSignals((IAsInt & 0b1110) == 0b1110 ? ONE : ZERO);
+		return null;
+	}
+
+	static
+	{
+		IndirectGUIComponentCreator.setComponentSupplier(GUIAm2904RegCTInstrDecode.class.getCanonicalName(),
+				(m, p, n) -> new GUIAm2904RegCTInstrDecode(m, n));
+	}
+}
\ No newline at end of file
diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java
deleted file mode 100644
index 436eaffb..00000000
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package net.mograsim.logic.model.am2900.components.am2904;
-
-import static net.mograsim.logic.core.types.Bit.ONE;
-import static net.mograsim.logic.core.types.Bit.U;
-import static net.mograsim.logic.core.types.Bit.X;
-import static net.mograsim.logic.core.types.Bit.ZERO;
-
-import java.util.Map;
-
-import net.mograsim.logic.core.types.Bit;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-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.serializing.IndirectGUIComponentCreator;
-import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
-
-public class RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent
-{
-	public RegCTInstrDecode(ViewModelModifiable model, String name)
-	{
-		super(model, name, "Instruction\ndecode");
-		setSize(80, 80);
-		addPin(new Pin(this, "I", 6, 0, 40), Usage.INPUT, Position.RIGHT);
-		// muSR MUX:
-		// 00: 0
-		// 01: 1
-		// 10: M
-		// 11: I
-		addPin(new Pin(this, "muSR_MUX", 2, 80, 10), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR_OVRRET", 1, 80, 20), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR_CINV", 1, 80, 30), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR__WEZ", 1, 80, 40), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR__WEC", 1, 80, 50), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR__WEN", 1, 80, 60), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "muSR__WEOVR", 1, 80, 70), Usage.OUTPUT, Position.LEFT);
-		// MSR MUX:
-		// 000: 0
-		// 001: 1
-		// 010: mu
-		// 011: Y
-		// 100: I
-		// 101: I, invert C
-		// 110: Swap OVR and C
-		// 111: _M
-		addPin(new Pin(this, "MSR_MUX", 3, 40, 0), Usage.OUTPUT, Position.BOTTOM);
-		// CT SRC MUX:
-		// 00: mu
-		// 01: mu
-		// 10: M
-		// 11: I
-		addPin(new Pin(this, "CT_SRC_MUX", 2, 10, 80), Usage.OUTPUT, Position.TOP);
-		// CT MUX:
-		// see Am2900 Family Data Book, Am2904, Table 4 (CT_MUX2-0 = I3-1)
-		addPin(new Pin(this, "CT_MUX", 3, 30, 80), Usage.OUTPUT, Position.TOP);
-		addPin(new Pin(this, "CT_INV", 1, 50, 80), Usage.OUTPUT, Position.TOP);
-		addPin(new Pin(this, "CT_EXP", 1, 70, 80), Usage.OUTPUT, Position.TOP);
-	}
-
-	@Override
-	protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
-	{
-		Bit[] IBits = readEnds.get("I").getValues().getBits();
-		int IAsInt = 0;
-		for (int i = 0; i < 6; i++)
-			switch (IBits[5 - i])
-			{
-			case ONE:
-				IAsInt |= 1 << i;
-				break;
-			case U:
-				for (ReadWriteEnd e : readWriteEnds.values())
-					e.feedSignals(U);
-				return null;
-			case X:
-			case Z:
-				for (ReadWriteEnd e : readWriteEnds.values())
-					e.feedSignals(X);
-				return null;
-			case ZERO:
-				break;
-			default:
-				throw new IllegalArgumentException("Unknown enum constant: " + IBits[i]);
-			}
-		switch (IAsInt)
-		{
-		case 0:
-		case 2:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 1:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 3:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 6:
-		case 7:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ONE);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 8:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 9:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 10:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 11:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 12:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 13:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ONE);
-			break;
-		case 14:
-			readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 15:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEC").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEN").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		case 24:
-		case 25:
-		case 40:
-		case 41:
-		case 56:
-		case 57:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ONE);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-			break;
-		default:
-			readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE);
-			readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO);
-			readWriteEnds.get("muSR_CINV").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEZ").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEC").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEN").feedSignals(ZERO);
-			readWriteEnds.get("muSR__WEOVR").feedSignals(ZERO);
-		}
-		switch (IAsInt)
-		{
-		case 0:
-			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ZERO);
-			break;
-		case 1:
-			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ZERO);
-			break;
-		case 2:
-			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ZERO);
-			break;
-		case 3:
-			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ZERO);
-			break;
-		case 4:
-			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ONE);
-			break;
-		case 5:
-			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ONE);
-			break;
-		case 8:
-		case 9:
-		case 24:
-		case 25:
-		case 40:
-		case 41:
-		case 56:
-		case 57:
-			readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ONE);
-			break;
-		default:
-			readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ONE);
-			break;
-		}
-		readWriteEnds.get("CT_SRC_MUX").feedSignals(IBits[0], IBits[1]);
-		readWriteEnds.get("CT_INV").feedSignals(IBits[5]);
-		readWriteEnds.get("CT_MUX").feedSignals(IBits[2], IBits[3], IBits[4]);
-		readWriteEnds.get("CT_EXP").feedSignals((IAsInt & 0b1110) == 0b1110 ? ONE : ZERO);
-		return null;
-	}
-
-	static
-	{
-		IndirectGUIComponentCreator.setComponentSupplier(RegCTInstrDecode.class.getCanonicalName(),
-				(m, p, n) -> new RegCTInstrDecode(m, n));
-	}
-}
\ No newline at end of file
diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
index 57813223..45f538cc 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
@@ -26,7 +26,7 @@ public class GUIComponentTestbench
 	public static void createTestbench(ViewModelModifiable model)
 	{
 		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model,
-				"class:net.mograsim.logic.model.am2900.components.am2904.RegCTInstrDecode");
+				"class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode");
 
 		// guess which pins are outputs and which are inputs
 		// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
index 92cd2f5b..9fa80d0c 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
@@ -7,6 +7,7 @@ mograsim version: 0.1.3
   "GUIAm2901ALUInclDecode": "file:components/am2901/GUIAm2901ALUInclDecode.json",
   "GUIAm2901ALUInclSourceDecodeInclFunctionDecode": "file:components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json",
   "GUIAm2901ALUOneBit": "file:components/am2901/GUIAm2901ALUOneBit.json",
+  "GUIAm2904RegCTInstrDecode": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode",
   "GUIAm2901DestDecode": "file:components/am2901/GUIAm2901DestDecode.json",
   "GUIAm2901SourceDecode": "file:components/am2901/GUIAm2901SourceDecode.json",
   "GUIAm2910InstrPLA": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",