X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fui%2Fam2900%2FTestableAm2901Impl.java;h=1862ae381afe1e92c7cde1198a9e9815377c42fd;hb=4ac977cb31feb34f24e05e9d5e7976951dccf557;hp=5a734b177b505f115b231f3029806f5757b9bf06;hpb=a0f4b1a2ee3ce0391decb882aa14fa536d5b3a45;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
index 5a734b17..1862ae38 100644
--- a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
+++ b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
@@ -181,21 +181,21 @@ public class TestableAm2901Impl implements TestableAm2901
 	@Override
 	public void setReg_A(String val_4_bit)
 	{
-		var bits = BitVector.parse(val_4_bit);
-		A3.setToValueOf(bits.getBit(0));
-		A2.setToValueOf(bits.getBit(1));
-		A1.setToValueOf(bits.getBit(2));
-		A0.setToValueOf(bits.getBit(3));
+		var bits = BitVector.parseMSBFirst(val_4_bit);
+		A3.setToValueOf(bits.getBit(3));
+		A2.setToValueOf(bits.getBit(2));
+		A1.setToValueOf(bits.getBit(1));
+		A0.setToValueOf(bits.getBit(0));
 	}
 
 	@Override
 	public void setReg_B(String val_4_bit)
 	{
-		var bits = BitVector.parse(val_4_bit);
-		B3.setToValueOf(bits.getBit(0));
-		B2.setToValueOf(bits.getBit(1));
-		B1.setToValueOf(bits.getBit(2));
-		B0.setToValueOf(bits.getBit(3));
+		var bits = BitVector.parseMSBFirst(val_4_bit);
+		B3.setToValueOf(bits.getBit(3));
+		B2.setToValueOf(bits.getBit(2));
+		B1.setToValueOf(bits.getBit(1));
+		B0.setToValueOf(bits.getBit(0));
 	}
 
 	@Override
@@ -213,11 +213,11 @@ public class TestableAm2901Impl implements TestableAm2901
 	@Override
 	public void setD(String val_4_bit)
 	{
-		var bits = BitVector.parse(val_4_bit);
-		D4.setToValueOf(bits.getBit(0));
-		D3.setToValueOf(bits.getBit(1));
-		D2.setToValueOf(bits.getBit(2));
-		D1.setToValueOf(bits.getBit(3));
+		var bits = BitVector.parseMSBFirst(val_4_bit);
+		D4.setToValueOf(bits.getBit(3));
+		D3.setToValueOf(bits.getBit(2));
+		D2.setToValueOf(bits.getBit(1));
+		D1.setToValueOf(bits.getBit(0));
 	}
 
 	@Override
@@ -317,7 +317,7 @@ public class TestableAm2901Impl implements TestableAm2901
 		var y2 = Y3.getDisplayedValue();
 		var y1 = Y2.getDisplayedValue();
 		var y0 = Y1.getDisplayedValue();
-		return y3.concat(y2).concat(y1).concat(y0).toString();
+		return y0.concat(y1).concat(y2).concat(y3).toBitStringMSBFirst();
 	}
 
 	private void setField(String name, Object value)
@@ -349,13 +349,13 @@ public class TestableAm2901Impl implements TestableAm2901
 	@Override
 	public void setDirectly(Register r, String val_4_bit)
 	{
-		am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_4_bit));
+		am2901.setHighLevelState(regToStateID(r), BitVector.parseMSBFirst(val_4_bit));
 	}
 
 	@Override
 	public String getDirectly(Register r)
 	{
-		return am2901.getHighLevelState(regToStateID(r)).toString();
+		return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toBitStringMSBFirst();
 	}
 
 	private static String regToStateID(Register r)