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

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / dlatch4.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
index 27361df..87f5370 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
@@ -354,28 +354,14 @@
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {},
     "atomicHighLevelStates": {
-      "q1": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch#0",
-          "subStateID": "q"
-        }
-      },
-      "q2": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch#1",
-          "subStateID": "q"
-        }
-      },
       "q": {
         "id": "bitVectorSplitting",
         "params": {
           "vectorPartTargets": [
-            "q1",
-            "q2",
+            "q4",
             "q3",
-            "q4"
+            "q2",
+            "q1"
           ],
           "vectorPartLengthes": [
             1,
@@ -385,6 +371,20 @@
           ]
         }
       },
+      "q1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch#0",
+          "subStateID": "q"
+        }
+      },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch#1",
+          "subStateID": "q"
+        }
+      },
       "q3": {
         "id": "delegating",
         "params": {