X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FTestableAm2904Impl.java;h=b43f130e570da85c8dcf948e06f10a626e31d711;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=cebd986bf2ec015695333aa921362d425d561b8e;hpb=45942cbbb4b10a99cef716c56fe14642f7c45722;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
index cebd986b..b43f130e 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
@@ -1,32 +1,36 @@
 package net.mograsim.logic.model.am2900.am2904;
 
-import net.mograsim.logic.core.components.BitDisplay;
-import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.components.CoreBitDisplay;
+import net.mograsim.logic.core.components.CoreManualSwitch;
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.model.am2900.util.SwitchWithDisplay;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.components.ModelComponent;
 
 public class TestableAm2904Impl implements TestableAm2904
 {
 
-	private GUIComponent am2904;
-	private ManualSwitch I;
-	private ManualSwitch C;
-	private ManualSwitch Cx;
-	private ManualSwitch IC, IN, IOVR, IZ;
-	private ManualSwitch _CEM, _CEmu;
-	private ManualSwitch _EC, _EN, _EOVR, _EZ;
-	private ManualSwitch _OECT, _OEY;
-	private ManualSwitch _SE;
-	private BitDisplay C0;
-	private BitDisplay CT;
+	private ModelComponent am2904;
+	private CoreManualSwitch I_5_0;
+	private CoreManualSwitch I_6_9;
+	private CoreManualSwitch I_10;
+	private CoreManualSwitch I_11_12;
+	private CoreManualSwitch C;
+	private CoreManualSwitch Cx;
+	private CoreManualSwitch IC, IN, IOVR, IZ;
+	private CoreManualSwitch _CEM, _CEmu;
+	private CoreManualSwitch _EC, _EN, _EOVR, _EZ;
+	private CoreManualSwitch _OECT, _OEY;
+	private CoreManualSwitch _SE;
+	private CoreBitDisplay C0;
+	private CoreBitDisplay CT;
 	private SwitchWithDisplay SIO0, SIOn, QIO0, QIOn;
 	private SwitchWithDisplay YC, YN, YOVR, YZ;
 
-	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2904");
+	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this,
+			"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/am2904/TestableAm2904.json");
 
 	@Override
 	public void setup()
@@ -52,33 +56,25 @@ public class TestableAm2904Impl implements TestableAm2904
 	@Override
 	public void setInstruction(Am2904_Inst inst)
 	{
-		var old = I.getValues();
-		var newPart = BitVector.from(inst.ordinal(), 6);
-		I.setState(old.subVector(0, 7).concat(newPart));
+		I_5_0.setState(BitVector.from(inst.ordinal(), 6));
 	}
 
 	@Override
 	public void setShiftCode(String val_4_bit)
 	{
-		var old = I.getValues();
-		var newPart = BitVector.parse(val_4_bit);
-		I.setState(old.subVector(0, 3).concat(newPart).concat(old.subVector(7)));
+		I_6_9.setState(BitVector.parse(val_4_bit));
 	}
 
 	@Override
 	public void setI10(Am2904_ShiftDir dir)
 	{
-		var old = I.getValues();
-		var newPart = BitVector.from(dir.ordinal(), 1);
-		I.setState(old.subVector(0, 2).concat(newPart).concat(old.subVector(3)));
+		I_10.setState(BitVector.from(dir.ordinal(), 1));
 	}
 
 	@Override
 	public void setCarry(Am2904_Carry carry)
 	{
-		var old = I.getValues();
-		var newPart = BitVector.from(carry.ordinal(), 2);
-		I.setState(newPart.concat(old.subVector(2)));
+		I_11_12.setState(BitVector.from(carry.ordinal(), 2));
 	}
 
 	@Override