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 / dff4_invwe.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
index 0bcf571..005cabe 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
@@ -5,7 +5,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 45.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 5.0
       },
       "name": "D1",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 35.0
+        "y": 15.0
       },
       "name": "D2",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 25.0
       },
       "name": "D3",
       "logicWidth": 1,
@@ -41,7 +41,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 35.0
       },
       "name": "D4",
       "logicWidth": 1,
@@ -86,7 +86,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 55.0
       },
       "name": "_WE",
       "logicWidth": 1,
@@ -96,52 +96,12 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 55.0,
-          "y": 70.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#0",
-        "pos": {
-          "x": 115.0,
-          "y": 20.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#1",
-        "pos": {
-          "x": 115.0,
-          "y": 70.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#2",
-        "pos": {
-          "x": 115.0,
-          "y": 120.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#3",
-        "pos": {
-          "x": 115.0,
-          "y": 170.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 104.0,
-          "y": 24.0
+          "y": 184.0
         },
         "params": 1
       },
@@ -150,7 +110,7 @@
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 104.0,
-          "y": 74.0
+          "y": 84.0
         },
         "params": 1
       },
@@ -159,7 +119,7 @@
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 104.0,
-          "y": 124.0
+          "y": 134.0
         },
         "params": 1
       },
@@ -198,24 +158,69 @@
           "y": 174.0
         },
         "params": 1
+      },
+      {
+        "id": "dff",
+        "name": "dff#0",
+        "pos": {
+          "x": 115.0,
+          "y": 20.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#1",
+        "pos": {
+          "x": 115.0,
+          "y": 70.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#2",
+        "pos": {
+          "x": 115.0,
+          "y": 120.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#3",
+        "pos": {
+          "x": 115.0,
+          "y": 170.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 55.0,
+          "y": 60.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "dff#0",
+          "pinName": "C"
         },
         "name": "unnamedWire#0",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 35.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -226,11 +231,11 @@
         "path": [
           {
             "x": 100.0,
-            "y": 75.0
+            "y": 65.0
           },
           {
             "x": 100.0,
-            "y": 35.0
+            "y": 25.0
           }
         ]
       },
@@ -240,18 +245,18 @@
           "pinName": "D1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 10.0,
-            "y": 125.0
+            "x": 25.0,
+            "y": 25.0
           },
           {
-            "x": 10.0,
-            "y": 85.0
+            "x": 25.0,
+            "y": 75.0
           }
         ]
       },
@@ -261,18 +266,18 @@
           "pinName": "D2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#11",
         "path": [
           {
-            "x": 15.0,
-            "y": 175.0
+            "x": 20.0,
+            "y": 75.0
           },
           {
-            "x": 15.0,
-            "y": 95.0
+            "x": 20.0,
+            "y": 85.0
           }
         ]
       },
@@ -282,18 +287,18 @@
           "pinName": "D3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#12",
         "path": [
           {
             "x": 20.0,
-            "y": 225.0
+            "y": 125.0
           },
           {
             "x": 20.0,
-            "y": 105.0
+            "y": 95.0
           }
         ]
       },
@@ -351,18 +356,18 @@
           "pinName": "D4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#17",
         "path": [
           {
             "x": 25.0,
-            "y": 275.0
+            "y": 175.0
           },
           {
             "x": 25.0,
-            "y": 115.0
+            "y": 105.0
           }
         ]
       },
@@ -392,7 +397,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "pin2": {
@@ -428,7 +433,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -439,17 +444,17 @@
         "path": [
           {
             "x": 100.0,
-            "y": 95.0
+            "y": 85.0
           },
           {
             "x": 100.0,
-            "y": 135.0
+            "y": 125.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "pin2": {
@@ -460,11 +465,11 @@
         "path": [
           {
             "x": 95.0,
-            "y": 105.0
+            "y": 95.0
           },
           {
             "x": 95.0,
-            "y": 185.0
+            "y": 175.0
           }
         ]
       },
@@ -474,7 +479,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#24",
@@ -489,7 +494,7 @@
           },
           {
             "x": 50.0,
-            "y": 125.0
+            "y": 115.0
           }
         ]
       },
@@ -499,7 +504,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#25",
@@ -514,7 +519,7 @@
           },
           {
             "x": 45.0,
-            "y": 135.0
+            "y": 125.0
           }
         ]
       },
@@ -524,7 +529,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#26",
@@ -539,7 +544,7 @@
           },
           {
             "x": 40.0,
-            "y": 145.0
+            "y": 135.0
           }
         ]
       },
@@ -549,22 +554,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#27",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 155.0,
@@ -576,7 +569,7 @@
           },
           {
             "x": 35.0,
-            "y": 155.0
+            "y": 145.0
           }
         ]
       },
@@ -586,7 +579,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#0",
+          "compName": "dff#3",
           "pinName": "C"
         },
         "name": "unnamedWire#3",
@@ -598,7 +591,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#4",
@@ -642,18 +635,22 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "C"
         },
         "pin2": {
-          "compName": "dff#3",
-          "pinName": "C"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "name": "unnamedWire#8",
         "path": [
           {
-            "x": 105.0,
-            "y": 175.0
+            "x": 20.0,
+            "y": 225.0
+          },
+          {
+            "x": 20.0,
+            "y": 185.0
           }
         ]
       },
@@ -663,11 +660,20 @@
           "pinName": "_WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 10.0,
+            "y": 275.0
+          },
+          {
+            "x": 10.0,
+            "y": 65.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"
@@ -685,28 +691,14 @@
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {},
     "atomicHighLevelStates": {
-      "q1": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#0",
-          "subStateID": "q"
-        }
-      },
-      "q2": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#1",
-          "subStateID": "q"
-        }
-      },
       "q": {
         "id": "bitVectorSplitting",
         "params": {
           "vectorPartTargets": [
-            "q1",
-            "q2",
+            "q4",
             "q3",
-            "q4"
+            "q2",
+            "q1"
           ],
           "vectorPartLengthes": [
             1,
@@ -716,6 +708,20 @@
           ]
         }
       },
+      "q1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#0",
+          "subStateID": "q"
+        }
+      },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#1",
+          "subStateID": "q"
+        }
+      },
       "q3": {
         "id": "delegating",
         "params": {