Fixed and added a lot of tests

[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..a4dd04a 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
@@ -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
@@ -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
@@ -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.parse(val_4_bit));\r
+       }\r
+\r
+       @Override\r
+       public String getDirectly(Register r)\r
+       {\r
+               return am2901.getHighLevelState(regToStateID(r)).toString();\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