Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model.am2900 / test / net / mograsim / logic / model / am2900 / am2901 / TestableAm2901Impl.java

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
index 34c68c1..bddddea 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
@@ -1,31 +1,29 @@
 package net.mograsim.logic.model.am2900.am2901;
 
-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.components.CoreBitDisplay;
+import net.mograsim.logic.core.components.CoreManualSwitch;
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.model.am2900.TestEnvironmentHelper;
-import net.mograsim.logic.model.am2900.TestEnvironmentHelper.DebugState;
-import net.mograsim.logic.model.am2900.TestUtil;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.am2900.util.SwitchWithDisplay;
+import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
+import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
+import net.mograsim.logic.model.am2900.util.TestUtil;
+import net.mograsim.logic.model.model.components.ModelComponent;
 
 public class TestableAm2901Impl implements TestableAm2901
 {
-       private GUIComponent am2901;
-       private Timeline timeline;
-       private ManualSwitch I8, I7, I6, I5, I4, I3, I2, I1, I0;
-       private ManualSwitch C;
-       private ManualSwitch Cn;
-       private ManualSwitch D1, D2, D3, D4;
-       private ManualSwitch A0, A1, A2, A3;
-       private ManualSwitch B0, B1, B2, B3;
-       private ManualSwitch IRAMn, IRAMn_3, IQn, IQn_3;
-       private BitDisplay Y1, Y2, Y3, Y4;
-       private BitDisplay F_0, Cn_4, OVR, F3;
-       private BitDisplay ORAMn, ORAMn_3, OQn, OQn_3;
-
-       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2901");
+       private ModelComponent am2901;
+       private CoreManualSwitch I;
+       private CoreManualSwitch C;
+       private CoreManualSwitch Cn;
+       private CoreManualSwitch D;
+       private CoreManualSwitch A;
+       private CoreManualSwitch B;
+       private CoreBitDisplay Y;
+       private CoreBitDisplay F_0, Cn_4, OVR, F3;
+       private SwitchWithDisplay RAMn, RAMn_3, Qn, Qn_3;
+
+       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2901");
 
        @Override
        public Result run()
@@ -42,48 +40,34 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override
        public void setDest(Am2901_Dest dest)
        {
-               var bits = TestUtil.of(dest.ordinal(), 3);
-               I8.setState(bits.getLSBit(2));
-               I7.setState(bits.getLSBit(1));
-               I6.setState(bits.getLSBit(0));
+               BitVector oldI = I.getValues();
+               I.setState(TestUtil.of(dest.ordinal(), 3).concat(oldI.subVector(3)));
        }
 
        @Override
        public void setFunc(Am2901_Func func)
        {
-               var bits = TestUtil.of(func.ordinal(), 3);
-               I5.setState(bits.getLSBit(2));
-               I4.setState(bits.getLSBit(1));
-               I3.setState(bits.getLSBit(0));
+               BitVector oldI = I.getValues();
+               I.setState(oldI.subVector(0, 3).concat(TestUtil.of(func.ordinal(), 3)).concat(oldI.subVector(6)));
        }
 
        @Override
        public void setSrc(Am2901_Src src)
        {
-               var bits = TestUtil.of(src.ordinal(), 3);
-               I2.setState(bits.getLSBit(2));
-               I1.setState(bits.getLSBit(1));
-               I0.setState(bits.getLSBit(0));
+               BitVector oldI = I.getValues();
+               I.setState(oldI.subVector(0, 6).concat(TestUtil.of(src.ordinal(), 3)));
        }
 
        @Override
        public void setReg_A(String val_4_bit)
        {
-               var bits = BitVector.parse(val_4_bit);
-               A3.setState(bits.getLSBit(3));
-               A2.setState(bits.getLSBit(2));
-               A1.setState(bits.getLSBit(1));
-               A0.setState(bits.getLSBit(0));
+               A.setState(BitVector.parse(val_4_bit));
        }
 
        @Override
        public void setReg_B(String val_4_bit)
        {
-               var bits = BitVector.parse(val_4_bit);
-               B3.setState(bits.getLSBit(3));
-               B2.setState(bits.getLSBit(2));
-               B1.setState(bits.getLSBit(1));
-               B0.setState(bits.getLSBit(0));
+               B.setState(BitVector.parse(val_4_bit));
        }
 
        @Override
@@ -101,35 +85,31 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override
        public void setD(String val_4_bit)
        {
-               var bits = BitVector.parse(val_4_bit);
-               D4.setState(bits.getLSBit(3));
-               D3.setState(bits.getLSBit(2));
-               D2.setState(bits.getLSBit(1));
-               D1.setState(bits.getLSBit(0));
+               D.setState(BitVector.parse(val_4_bit));
        }
 
        @Override
        public void setQ_0(String val_1_bit)
        {
-               IQn.setState(Bit.parse(val_1_bit));
+               Qn.setState(Bit.parse(val_1_bit).toVector());
        }
 
        @Override
        public void setQ_3(String val_1_bit)
        {
-               IQn_3.setState(Bit.parse(val_1_bit));
+               Qn_3.setState(Bit.parse(val_1_bit).toVector());
        }
 
        @Override
        public void setRAM_0(String val_1_bit)
        {
-               IRAMn.setState(Bit.parse(val_1_bit));
+               RAMn.setState(Bit.parse(val_1_bit).toVector());
        }
 
        @Override
        public void setRAM_3(String val_1_bit)
        {
-               IRAMn_3.setState(Bit.parse(val_1_bit));
+               RAMn_3.setState(Bit.parse(val_1_bit).toVector());
        }
 
        @Override
@@ -141,25 +121,25 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override
        public String getQ_0()
        {
-               return OQn.getDisplayedValue().toString();
+               return Qn.getDisplayedValue().toString();
        }
 
        @Override
        public String getQ_3()
        {
-               return OQn_3.getDisplayedValue().toString();
+               return Qn_3.getDisplayedValue().toString();
        }
 
        @Override
        public String getRAM_0()
        {
-               return ORAMn.getDisplayedValue().toString();
+               return RAMn.getDisplayedValue().toString();
        }
 
        @Override
        public String getRAM_3()
        {
-               return ORAMn_3.getDisplayedValue().toString();
+               return RAMn_3.getDisplayedValue().toString();
        }
 
        @Override
@@ -201,11 +181,7 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override
        public String getY()
        {
-               var y3 = Y4.getDisplayedValue();
-               var y2 = Y3.getDisplayedValue();
-               var y1 = Y2.getDisplayedValue();
-               var y0 = Y1.getDisplayedValue();
-               return y3.concat(y2).concat(y1).concat(y0).toString();
+               return Y.getDisplayedValue().toString();
        }
 
        @Override
@@ -226,4 +202,10 @@ public class TestableAm2901Impl implements TestableAm2901
                        return "qreg.q";
                return "regs.c" + r.toBitString() + ".q";
        }
+
+       @Override
+       public TestEnvironmentHelper getTestEnvironmentHelper()
+       {
+               return testHelper;
+       }
 }