X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FTestableAm2904Impl.java;fp=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FTestableAm2904Impl.java;h=99ea5a29489498eddc025d88adf2eb1fa4f9a591;hb=9f4b106057a7b291aa880620dc80faa9cb7fc8f3;hp=b43f130e570da85c8dcf948e06f10a626e31d711;hpb=ce59b30bcd1139d2cdd497e2903f239a2d0084dd;p=Mograsim.git

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
index b43f130e..99ea5a29 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
@@ -62,7 +62,7 @@ public class TestableAm2904Impl implements TestableAm2904
 	@Override
 	public void setShiftCode(String val_4_bit)
 	{
-		I_6_9.setState(BitVector.parse(val_4_bit));
+		I_6_9.setState(BitVector.parseBitstring(val_4_bit));
 	}
 
 	@Override
@@ -80,13 +80,13 @@ public class TestableAm2904Impl implements TestableAm2904
 	@Override
 	public void setCX(String val_1_bit)
 	{
-		Cx.setState(BitVector.parse(val_1_bit));
+		Cx.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setY(String z_c_n_ovr)
 	{
-		var bv = BitVector.parse(z_c_n_ovr);
+		var bv = BitVector.parseBitstring(z_c_n_ovr);
 		// correct order apparently unknown, most likely Z-C-N-OVR
 		YZ.setState(bv.getLSBit(3).toVector());
 		YC.setState(bv.getLSBit(2).toVector());
@@ -97,103 +97,103 @@ public class TestableAm2904Impl implements TestableAm2904
 	@Override
 	public void setIZ(String val_1_bit)
 	{
-		IZ.setState(BitVector.parse(val_1_bit));
+		IZ.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setIC(String val_1_bit)
 	{
-		IC.setState(BitVector.parse(val_1_bit));
+		IC.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setIOVR(String val_1_bit)
 	{
-		IOVR.setState(BitVector.parse(val_1_bit));
+		IOVR.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setIN(String val_1_bit)
 	{
-		IN.setState(BitVector.parse(val_1_bit));
+		IN.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_CEM(String val_1_bit)
 	{
-		_CEM.setState(BitVector.parse(val_1_bit));
+		_CEM.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_CEµ(String val_1_bit)
 	{
-		_CEmu.setState(BitVector.parse(val_1_bit));
+		_CEmu.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_OEY(String val_1_bit)
 	{
-		_OEY.setState(BitVector.parse(val_1_bit));
+		_OEY.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_OECT(String val_1_bit)
 	{
-		_OECT.setState(BitVector.parse(val_1_bit));
+		_OECT.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_SE(String val_1_bit)
 	{
-		_SE.setState(BitVector.parse(val_1_bit));
+		_SE.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_EZ(String val_1_bit)
 	{
-		_EZ.setState(BitVector.parse(val_1_bit));
+		_EZ.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_EC(String val_1_bit)
 	{
-		_EC.setState(BitVector.parse(val_1_bit));
+		_EC.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_EOVR(String val_1_bit)
 	{
-		_EOVR.setState(BitVector.parse(val_1_bit));
+		_EOVR.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void set_EN(String val_1_bit)
 	{
-		_EN.setState(BitVector.parse(val_1_bit));
+		_EN.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setSIO0(String val_1_bit)
 	{
-		SIO0.setState(BitVector.parse(val_1_bit));
+		SIO0.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setSIO3(String val_1_bit)
 	{
-		SIOn.setState(BitVector.parse(val_1_bit));
+		SIOn.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setQIO0(String val_1_bit)
 	{
-		QIO0.setState(BitVector.parse(val_1_bit));
+		QIO0.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
 	public void setQIO3(String val_1_bit)
 	{
-		QIOn.setState(BitVector.parse(val_1_bit));
+		QIOn.setState(BitVector.parseBitstring(val_1_bit));
 	}
 
 	@Override
@@ -207,19 +207,19 @@ public class TestableAm2904Impl implements TestableAm2904
 	@Override
 	public void setDirectly(CompleteStatus r, String z_c_n_ovr)
 	{
-		am2904.setHighLevelState(regToStateID(r), BitVector.parse(z_c_n_ovr));
+		am2904.setHighLevelState(regToStateID(r), BitVector.parseBitstring(z_c_n_ovr));
 	}
 
 	@Override
 	public String getC0()
 	{
-		return C0.getDisplayedValue().toString();
+		return C0.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String getCT()
 	{
-		return CT.getDisplayedValue().toString();
+		return CT.getDisplayedValue().toBitstring();
 	}
 
 	@Override
@@ -230,31 +230,31 @@ public class TestableAm2904Impl implements TestableAm2904
 		var y2 = YC.getDisplayedValue();
 		var y1 = YN.getDisplayedValue();
 		var y0 = YOVR.getDisplayedValue();
-		return y3.concat(y2).concat(y1).concat(y0).toString();
+		return y3.concat(y2).concat(y1).concat(y0).toBitstring();
 	}
 
 	@Override
 	public String getSIO0()
 	{
-		return SIO0.getDisplayedValue().toString();
+		return SIO0.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String getSIO3()
 	{
-		return SIOn.getDisplayedValue().toString();
+		return SIOn.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String getQIO0()
 	{
-		return QIO0.getDisplayedValue().toString();
+		return QIO0.getDisplayedValue().toBitstring();
 	}
 
 	@Override
 	public String getQIO3()
 	{
-		return QIOn.getDisplayedValue().toString();
+		return QIOn.getDisplayedValue().toBitstring();
 	}
 
 	@Override
@@ -268,7 +268,7 @@ public class TestableAm2904Impl implements TestableAm2904
 	public String getDirectly(CompleteStatus r)
 	{
 		var bv = (BitVector) am2904.getHighLevelState(regToStateID(r));
-		return bv.toString();
+		return bv.toBitstring();
 	}
 
 	private static String regToStateID(Register r)