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

[Mograsim.git] / net.mograsim.logic.model.am2900 / test / net / mograsim / logic / model / am2900 / am2910 / TestableAm2910Impl.java

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
index 8b2cddf..48b8569 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
@@ -1,31 +1,29 @@
 package net.mograsim.logic.model.am2900.am2910;
 
-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.BitVector;
-import net.mograsim.logic.model.am2900.TestEnvironmentHelper;
-import net.mograsim.logic.model.am2900.TestEnvironmentHelper.DebugState;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
+import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
+import net.mograsim.logic.model.model.components.ModelComponent;
 
 public class TestableAm2910Impl implements TestableAm2910
 {
 
-       private GUIComponent am2901;
-       private Timeline timeline;
-       private ManualSwitch I;
-       private ManualSwitch C;
-       private ManualSwitch CI;
-       private ManualSwitch D;
-       private ManualSwitch _CC;
-       private ManualSwitch _CCEN;
-       private ManualSwitch _RLD;
-       private ManualSwitch _OE;
-       private BitDisplay _FULL;
-       private BitDisplay Y;
-       private BitDisplay _PL, _MAP, _VECT;
+       private ModelComponent am2901;
+       private CoreManualSwitch I;
+       private CoreManualSwitch C;
+       private CoreManualSwitch CI;
+       private CoreManualSwitch D;
+       private CoreManualSwitch _CC;
+       private CoreManualSwitch _CCEN;
+       private CoreManualSwitch _RLD;
+       private CoreManualSwitch _OE;
+       private CoreBitDisplay _FULL;
+       private CoreBitDisplay Y;
+       private CoreBitDisplay _PL, _MAP, _VECT;
 
-       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "file:components/am2910/GUIAm2910.json");
+       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2910");
 
        @Override
        public void setup()
@@ -152,4 +150,10 @@ public class TestableAm2910Impl implements TestableAm2910
                        throw new IllegalArgumentException("unknown: " + r);
                }
        }
+
+       @Override
+       public TestEnvironmentHelper getTestEnvironmentHelper()
+       {
+               return testHelper;
+       }
 }