Some work on improving BitVector<->String conversions

[Mograsim.git] / tests / net.mograsim.logic.model.am2900.tests / src / net / mograsim / logic / model / am2900 / am2904 / TestableAm2904Impl.java

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 b43f130..99ea5a2 100644 (file)
--- 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)