X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2910%2FTestableAm2910Impl.java;h=8b2cddf4ffaebc3f4e8daebdf68e19226de7d2eb;hb=76fdc144f22b60491e61a32860fe2e6881751505;hp=f3686aa2d192bcce9c90d31f88e48c40d5369938;hpb=25b455d400c8f7e5c7ece19e3c64cf80c106ac3d;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
index f3686aa2..8b2cddf4 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
@@ -1,12 +1,9 @@
 package net.mograsim.logic.model.am2900.am2910;
 
-import org.junit.Test;
-
 import net.mograsim.logic.core.components.BitDisplay;
 import net.mograsim.logic.core.components.ManualSwitch;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.model.am2900.TestEnvironmentHelper;
 import net.mograsim.logic.model.am2900.TestEnvironmentHelper.DebugState;
 import net.mograsim.logic.model.model.components.GUIComponent;
@@ -22,13 +19,13 @@ public class TestableAm2910Impl implements TestableAm2910
 	private ManualSwitch D;
 	private ManualSwitch _CC;
 	private ManualSwitch _CCEN;
-	private ManualSwitch _RDL;
+	private ManualSwitch _RLD;
 	private ManualSwitch _OE;
 	private BitDisplay _FULL;
 	private BitDisplay Y;
 	private BitDisplay _PL, _MAP, _VECT;
 
-	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2910");
+	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "file:components/am2910/GUIAm2910.json");
 
 	@Override
 	public void setup()
@@ -84,7 +81,7 @@ public class TestableAm2910Impl implements TestableAm2910
 	@Override
 	public void set_RLD(String val_1_bit)
 	{
-		_RDL.setState(BitVector.parse(val_1_bit));
+		_RLD.setState(BitVector.parse(val_1_bit));
 	}
 
 	@Override
@@ -93,6 +90,12 @@ public class TestableAm2910Impl implements TestableAm2910
 		_OE.setState(BitVector.parse(val_1_bit));
 	}
 
+	@Override
+	public void setDirectly(Register r, String val_X_bit)
+	{
+		am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_X_bit));
+	}
+
 	@Override
 	public String getY()
 	{
@@ -123,4 +126,30 @@ public class TestableAm2910Impl implements TestableAm2910
 		return _VECT.getDisplayedValue().toString();
 	}
 
+	@Override
+	public String getDirectly(Register r)
+	{
+		return am2901.getHighLevelState(regToStateID(r)).toString();
+	}
+
+	private static String regToStateID(Register r)
+	{
+		switch (r)
+		{
+		case S_0:
+		case S_1:
+		case S_2:
+		case S_3:
+		case S_4:
+			return "stack.c" + BitVector.from(r.ordinal(), 3);
+		case SP:
+			return "sp.q";
+		case PC:
+			return "mupc.q";
+		case REG_COUNT:
+			return "r.q";
+		default:
+			throw new IllegalArgumentException("unknown: " + r);
+		}
+	}
 }