Added MSB first versions of parse() and toString()

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

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 d8934ce..c06fcd4 100644 (file)
--- 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
@@ -62,7 +62,7 @@ public class TestableAm2901Impl implements TestableAm2901
                        timeline.executeNext();\r
                        if (!timeline.hasNext())\r
                        {\r
-                               System.out.println("run() took " + eventCounter + " events");\r
+//                             System.out.println("run() took " + eventCounter + " events");\r
                                return Result.SUCCESS;\r
                        }\r
                }\r
@@ -114,6 +114,7 @@ public class TestableAm2901Impl implements TestableAm2901
                for (String id : am2901.getOutputPinNames())\r
                {\r
                        GUIBitDisplay bd = new GUIBitDisplay(viewModel);\r
+//                     bd.addRedrawListener(() -> System.out.println(id + " " + bd.getBitDisplay().getDisplayedValue()));\r
                        new GUIWire(viewModel, am2901.getPin(id), bd.getInputPin());\r
                        idDisplayMap.put(id, bd);\r
                }\r
@@ -127,8 +128,6 @@ public class TestableAm2901Impl implements TestableAm2901
                        setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getManualSwitch());\r
                for (var entry : idDisplayMap.entrySet())\r
                        setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getBitDisplay());\r
-               // Switch Clock off first\r
-               C.switchOff();\r
 \r
                // Debug code\r
                HashSet<GUIWire> wiresIncludingSubmodels = new HashSet<>();\r
@@ -146,7 +145,6 @@ public class TestableAm2901Impl implements TestableAm2901
                {\r
                        if (debugWires)\r
                        {\r
-                               System.out.println(w);\r
                                wireDebugChangeSet.add(w.toString());\r
                        }\r
                }));\r
@@ -183,21 +181,21 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override\r
        public void setReg_A(String val_4_bit)\r
        {\r
-               var bits = BitVector.parse(val_4_bit);\r
-               A3.setToValueOf(bits.getBit(0));\r
-               A2.setToValueOf(bits.getBit(1));\r
-               A1.setToValueOf(bits.getBit(2));\r
-               A0.setToValueOf(bits.getBit(3));\r
+               var bits = BitVector.parseMSBFirst(val_4_bit);\r
+               A3.setToValueOf(bits.getBit(3));\r
+               A2.setToValueOf(bits.getBit(2));\r
+               A1.setToValueOf(bits.getBit(1));\r
+               A0.setToValueOf(bits.getBit(0));\r
        }\r
 \r
        @Override\r
        public void setReg_B(String val_4_bit)\r
        {\r
-               var bits = BitVector.parse(val_4_bit);\r
-               B3.setToValueOf(bits.getBit(0));\r
-               B2.setToValueOf(bits.getBit(1));\r
-               B1.setToValueOf(bits.getBit(2));\r
-               B0.setToValueOf(bits.getBit(3));\r
+               var bits = BitVector.parseMSBFirst(val_4_bit);\r
+               B3.setToValueOf(bits.getBit(3));\r
+               B2.setToValueOf(bits.getBit(2));\r
+               B1.setToValueOf(bits.getBit(1));\r
+               B0.setToValueOf(bits.getBit(0));\r
        }\r
 \r
        @Override\r
@@ -215,11 +213,11 @@ public class TestableAm2901Impl implements TestableAm2901
        @Override\r
        public void setD(String val_4_bit)\r
        {\r
-               var bits = BitVector.parse(val_4_bit);\r
-               D4.setToValueOf(bits.getBit(0));\r
-               D3.setToValueOf(bits.getBit(1));\r
-               D2.setToValueOf(bits.getBit(2));\r
-               D1.setToValueOf(bits.getBit(3));\r
+               var bits = BitVector.parseMSBFirst(val_4_bit);\r
+               D4.setToValueOf(bits.getBit(3));\r
+               D3.setToValueOf(bits.getBit(2));\r
+               D2.setToValueOf(bits.getBit(1));\r
+               D1.setToValueOf(bits.getBit(0));\r
        }\r
 \r
        @Override\r
@@ -247,9 +245,9 @@ public class TestableAm2901Impl implements TestableAm2901
        }\r
 \r
        @Override\r
-       public void toogleClock()\r
+       public void clockOn(boolean isClockOn)\r
        {\r
-               C.toggle();\r
+               C.setState(isClockOn);\r
        }\r
 \r
        @Override\r
@@ -319,7 +317,7 @@ public class TestableAm2901Impl implements TestableAm2901
                var y2 = Y3.getDisplayedValue();\r
                var y1 = Y2.getDisplayedValue();\r
                var y0 = Y1.getDisplayedValue();\r
-               return y3.concat(y2).concat(y1).concat(y0).toString();\r
+               return y0.concat(y1).concat(y2).concat(y3).toBitStringMSBFirst();\r
        }\r
 \r
        private void setField(String name, Object value)\r
@@ -347,4 +345,23 @@ public class TestableAm2901Impl implements TestableAm2901
                }\r
                return mutator.toBitVector();\r
        }\r
+\r
+       @Override\r
+       public void setDirectly(Register r, String val_4_bit)\r
+       {\r
+               am2901.setHighLevelState(regToStateID(r), BitVector.parseMSBFirst(val_4_bit));\r
+       }\r
+\r
+       @Override\r
+       public String getDirectly(Register r)\r
+       {\r
+               return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toBitStringMSBFirst();\r
+       }\r
+\r
+       private static String regToStateID(Register r)\r
+       {\r
+               if (r == Register.Q)\r
+                       return "qreg.q";\r
+               return "regs.c" + r.toBitString() + ".q";\r
+       }\r
 }\r