X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2910%2FTestableAm2910Impl.java;h=a4eb5ed43c1ce385af1a2b81652eea384321788d;hb=590c4809a069b0d30529735bf58f0db5382f8a88;hp=48b85698315cfd63d1452f9e00976c0c78f09a9f;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
index 48b85698..a4eb5ed4 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
@@ -55,79 +55,79 @@ public class TestableAm2910Impl implements TestableAm2910
 	@Override
 	public void set_CCEN(String val_1_bit)
 	{
-		_CCEN.setState(BitVector.parse(val_1_bit));
+		_CCEN.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setD(String val_12_bit)
 	{
-		D.setState(BitVector.parse(val_12_bit));
+		D.setState(BitVector.parseBitstring(val_12_bit));
 	}
 
 	@Override
 	public void set_CC(String val_1_bit)
 	{
-		_CC.setState(BitVector.parse(val_1_bit));
+		_CC.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setCI(String val_1_bit)
 	{
-		CI.setState(BitVector.parse(val_1_bit));
+		CI.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_RLD(String val_1_bit)
 	{
-		_RLD.setState(BitVector.parse(val_1_bit));
+		_RLD.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_OE(String val_1_bit)
 	{
-		_OE.setState(BitVector.parse(val_1_bit));
+		_OE.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setDirectly(Register r, String val_X_bit)
 	{
-		am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_X_bit));
+		am2901.setHighLevelState(regToStateID(r), BitVector.parseBitstring(val_X_bit));
 	}
 
 	@Override
 	public String getY()
 	{
-		return Y.getDisplayedValue().toString();
+		return Y.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String get_FULL()
 	{
-		return _FULL.getDisplayedValue().toString();
+		return _FULL.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String get_PL()
 	{
-		return _PL.getDisplayedValue().toString();
+		return _PL.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String get_MAP()
 	{
-		return _MAP.getDisplayedValue().toString();
+		return _MAP.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String get_VECT()
 	{
-		return _VECT.getDisplayedValue().toString();
+		return _VECT.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String getDirectly(Register r)
 	{
-		return am2901.getHighLevelState(regToStateID(r)).toString();
+		return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toBitstring();
 	}
 
 	private static String regToStateID(Register r)
@@ -139,7 +139,7 @@ public class TestableAm2910Impl implements TestableAm2910
 		case S_2:
 		case S_3:
 		case S_4:
-			return "stack.c" + BitVector.from(r.ordinal(), 3);
+			return "stack.c" + BitVector.from(r.ordinal(), 3) + ".q";
 		case SP:
 			return "sp.q";
 		case PC: