Reserialized components

author Daniel Kirschten <daniel.kirschten@gmx.de>

Tue, 17 Sep 2019 12:25:03 +0000 (14:25 +0200)

committer Daniel Kirschten <daniel.kirschten@gmx.de>

Tue, 17 Sep 2019 12:25:15 +0000 (14:25 +0200)
author Daniel Kirschten <daniel.kirschten@gmx.de>
Tue, 17 Sep 2019 12:25:03 +0000 (14:25 +0200)
committer Daniel Kirschten <daniel.kirschten@gmx.de>
Tue, 17 Sep 2019 12:25:15 +0000 (14:25 +0200)
diff --git a/plugins/net.mograsim.logic.model.am2900/Am2904Testbench.json b/plugins/net.mograsim.logic.model.am2900/Am2904Testbench.json

index c7bec19..853bf92 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/Am2904Testbench.json
+++ b/plugins/net.mograsim.logic.model.am2900/Am2904Testbench.json
@@ -121,6 +121,78 @@
          },
          "params": 1
        },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#2",
+        "pos": {
+          "x": 170.0,
+          "y": 112.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#3",
+        "pos": {
+          "x": 55.0,
+          "y": 122.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#4",
+        "pos": {
+          "x": 170.0,
+          "y": 127.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#5",
+        "pos": {
+          "x": 170.0,
+          "y": 142.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#6",
+        "pos": {
+          "x": 170.0,
+          "y": 157.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#7",
+        "pos": {
+          "x": 155.0,
+          "y": 172.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#8",
+        "pos": {
+          "x": 155.0,
+          "y": 187.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#9",
+        "pos": {
+          "x": 160.0,
+          "y": 232.5
+        },
+        "params": 1
+      },
        {
          "id": "ManualSwitch",
          "name": "ManualSwitch#10",
@@ -211,15 +283,6 @@
          },
          "params": 1
        },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#2",
-        "pos": {
-          "x": 170.0,
-          "y": 112.5
-        },
-        "params": 1
-      },
        {
          "id": "ManualSwitch",
          "name": "ManualSwitch#20",
@@ -310,15 +373,6 @@
          },
          "params": 1
        },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#3",
-        "pos": {
-          "x": 55.0,
-          "y": 122.5
-        },
-        "params": 1
-      },
        {
          "id": "ManualSwitch",
          "name": "ManualSwitch#30",
@@ -401,88 +455,106 @@
          "params": 1
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#4",
+        "id": "Splitter",
+        "name": "Splitter#0",
          "pos": {
-          "x": 170.0,
-          "y": 127.5
+          "x": 85.0,
+          "y": 130.0
          },
-        "params": 1
+        "params": {
+          "logicWidth": 13,
+          "orientation": "LEFT"
+        }
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#5",
+        "id": "TextComponent",
+        "name": "TextComponent#0",
          "pos": {
-          "x": 170.0,
-          "y": 142.5
+          "x": 140.0,
+          "y": 110.0
          },
-        "params": 1
+        "params": "IZ"
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#6",
+        "id": "TextComponent",
+        "name": "TextComponent#1",
          "pos": {
-          "x": 170.0,
-          "y": 157.5
+          "x": 140.0,
+          "y": 125.0
          },
-        "params": 1
+        "params": "IC"
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#7",
+        "id": "TextComponent",
+        "name": "TextComponent#2",
          "pos": {
-          "x": 155.0,
-          "y": 172.5
+          "x": 140.0,
+          "y": 140.0
          },
-        "params": 1
+        "params": "IN"
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#8",
+        "id": "TextComponent",
+        "name": "TextComponent#3",
          "pos": {
-          "x": 155.0,
-          "y": 187.5
+          "x": 140.0,
+          "y": 155.0
          },
-        "params": 1
+        "params": "IOVR"
        },
        {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#9",
+        "id": "TextComponent",
+        "name": "TextComponent#4",
          "pos": {
-          "x": 160.0,
-          "y": 232.5
+          "x": 115.0,
+          "y": 170.0
          },
-        "params": 1
+        "params": "_CEM"
        },
        {
-        "id": "Splitter",
-        "name": "Merger#0",
+        "id": "TextComponent",
+        "name": "TextComponent#5",
          "pos": {
-          "x": 85.0,
-          "y": 130.0
+          "x": 115.0,
+          "y": 185.0
          },
-        "params": {
-          "logicWidth": 13,
-          "orientation": "LEFT"
-        }
+        "params": "_CEmu"
        },
        {
          "id": "TextComponent",
-        "name": "TextComponent#0",
+        "name": "TextComponent#6",
          "pos": {
-          "x": 140.0,
-          "y": 110.0
+          "x": 125.0,
+          "y": 200.0
          },
-        "params": "IZ"
+        "params": "_EZ"
        },
        {
          "id": "TextComponent",
-        "name": "TextComponent#1",
+        "name": "TextComponent#7",
          "pos": {
-          "x": 140.0,
-          "y": 125.0
+          "x": 125.0,
+          "y": 215.0
          },
-        "params": "IC"
+        "params": "_EC"
+      },
+      {
+        "id": "TextComponent",
+        "name": "TextComponent#8",
+        "pos": {
+          "x": 125.0,
+          "y": 230.0
+        },
+        "params": "_EN"
+      },
+      {
+        "id": "TextComponent",
+        "name": "TextComponent#9",
+        "pos": {
+          "x": 125.0,
+          "y": 245.0
+        },
+        "params": "_EOVR"
        },
        {
          "id": "TextComponent",
@@ -574,15 +646,6 @@
          },
          "params": "I8"
        },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#2",
-        "pos": {
-          "x": 140.0,
-          "y": 140.0
-        },
-        "params": "IN"
-      },
        {
          "id": "TextComponent",
          "name": "TextComponent#20",
@@ -673,15 +736,6 @@
          },
          "params": "YOVR"
        },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#3",
-        "pos": {
-          "x": 140.0,
-          "y": 155.0
-        },
-        "params": "IOVR"
-      },
        {
          "id": "TextComponent",
          "name": "TextComponent#30",
@@ -772,15 +826,6 @@
          },
          "params": "SIO0"
        },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#4",
-        "pos": {
-          "x": 115.0,
-          "y": 170.0
-        },
-        "params": "_CEM"
-      },
        {
          "id": "TextComponent",
          "name": "TextComponent#40",
@@ -862,51 +907,6 @@
          },
          "params": "_OECT"
        },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#5",
-        "pos": {
-          "x": 115.0,
-          "y": 185.0
-        },
-        "params": "_CEmu"
-      },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#6",
-        "pos": {
-          "x": 125.0,
-          "y": 200.0
-        },
-        "params": "_EZ"
-      },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#7",
-        "pos": {
-          "x": 125.0,
-          "y": 215.0
-        },
-        "params": "_EC"
-      },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#8",
-        "pos": {
-          "x": 125.0,
-          "y": 230.0
-        },
-        "params": "_EN"
-      },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#9",
-        "pos": {
-          "x": 125.0,
-          "y": 245.0
-        },
-        "params": "_EOVR"
-      },
        {
          "id": "TriStateBuffer",
          "name": "TriStateBuffer#0",
@@ -1023,140 +1023,299 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 369.0,
-          "y": 174.0
+          "x": 209.0,
+          "y": 324.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 374.0,
-          "y": 189.0
+          "x": 214.0,
+          "y": 339.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 379.0,
-          "y": 199.0
+          "x": 354.0,
+          "y": 379.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 209.0,
-          "y": 324.0
+          "x": 359.0,
+          "y": 389.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 214.0,
-          "y": 339.0
+          "x": 344.0,
+          "y": 84.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 354.0,
-          "y": 379.0
+          "x": 359.0,
+          "y": 109.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 359.0,
-          "y": 389.0
+          "y": 124.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 344.0,
-          "y": 84.0
+          "x": 364.0,
+          "y": 159.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 359.0,
-          "y": 109.0
+          "x": 369.0,
+          "y": 174.0
          },
          "params": 1
        },
        {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 359.0,
-          "y": 124.0
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
+        "pos": {
+          "x": 374.0,
+          "y": 189.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
+        "pos": {
+          "x": 379.0,
+          "y": 199.0
+        },
+        "params": 1
+      }
+    ],
+    "wires": [
+      {
+        "pin1": {
+          "compName": "ManualSwitch#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_OEY"
+        },
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 280.0,
+            "y": 160.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "ManualSwitch#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 215.0,
+            "y": 90.0
+          },
+          {
+            "x": 215.0,
+            "y": 180.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "ManualSwitch#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IZ"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 210.0,
+            "y": 120.0
+          },
+          {
+            "x": 210.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IC"
+        },
+        "pin2": {
+          "compName": "ManualSwitch#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 190.0
+          },
+          {
+            "x": 205.0,
+            "y": 135.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "ManualSwitch#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 200.0,
+            "y": 150.0
+          },
+          {
+            "x": 200.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
          },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 364.0,
-          "y": 159.0
+        "pin2": {
+          "compName": "ManualSwitch#6",
+          "pinName": ""
          },
-        "params": 1
-      }
-    ],
-    "wires": [
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 195.0,
+            "y": 200.0
+          },
+          {
+            "x": 195.0,
+            "y": 165.0
+          }
+        ]
+      },
        {
          "pin1": {
-          "compName": "ManualSwitch#0",
+          "compName": "ManualSwitch#7",
            "pinName": ""
          },
          "pin2": {
            "compName": "Am2904#0",
-          "pinName": "_OEY"
+          "pinName": "_CEM"
          },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 280.0,
-            "y": 160.0
+            "x": 190.0,
+            "y": 180.0
+          },
+          {
+            "x": 190.0,
+            "y": 205.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ManualSwitch#1",
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
+        },
+        "pin2": {
+          "compName": "ManualSwitch#8",
            "pinName": ""
          },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 185.0,
+            "y": 205.0
+          },
+          {
+            "x": 185.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_EZ"
+        },
          "pin2": {
+          "compName": "ManualSwitch#12",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "Am2904#0",
-          "pinName": "C"
+          "pinName": "_EC"
          },
-        "name": "unnamedWire#1",
+        "pin2": {
+          "compName": "ManualSwitch#11",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 215.0,
-            "y": 90.0
+            "x": 195.0,
+            "y": 215.0
            },
            {
-            "x": 215.0,
-            "y": 180.0
+            "x": 195.0,
+            "y": 225.0
            }
          ]
        },
@@ -1204,7 +1363,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "I"
          },
          "pin2": {
@@ -1343,27 +1502,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IZ"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 120.0
-          },
-          {
-            "x": 210.0,
-            "y": 185.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "Am2904#0",
@@ -1494,27 +1632,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IC"
-        },
-        "pin2": {
-          "compName": "ManualSwitch#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 190.0
-          },
-          {
-            "x": 205.0,
-            "y": 135.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -1706,27 +1823,6 @@
          "name": "unnamedWire#39",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 150.0
-          },
-          {
-            "x": 200.0,
-            "y": 195.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#4",
@@ -1767,7 +1863,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O12"
          },
          "name": "unnamedWire#42",
@@ -1775,7 +1871,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O11"
          },
          "pin2": {
@@ -1791,7 +1887,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O10"
          },
          "name": "unnamedWire#44",
@@ -1799,7 +1895,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O9"
          },
          "pin2": {
@@ -1815,7 +1911,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O8"
          },
          "name": "unnamedWire#46",
@@ -1823,7 +1919,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O7"
          },
          "pin2": {
@@ -1839,7 +1935,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O6"
          },
          "name": "unnamedWire#48",
@@ -1847,7 +1943,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O5"
          },
          "pin2": {
@@ -1857,34 +1953,13 @@
          "name": "unnamedWire#49",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IOVR"
-        },
-        "pin2": {
-          "compName": "ManualSwitch#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 200.0
-          },
-          {
-            "x": 195.0,
-            "y": 165.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "ManualSwitch#28",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O4"
          },
          "name": "unnamedWire#50",
@@ -1892,7 +1967,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O3"
          },
          "pin2": {
@@ -1908,7 +1983,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O2"
          },
          "name": "unnamedWire#52",
@@ -1916,7 +1991,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O1"
          },
          "pin2": {
@@ -1932,7 +2007,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O0"
          },
          "name": "unnamedWire#54",
@@ -1998,27 +2073,6 @@
          "name": "unnamedWire#59",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#7",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEM"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 190.0,
-            "y": 180.0
-          },
-          {
-            "x": 190.0,
-            "y": 205.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -2164,27 +2218,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_CEmu"
-        },
-        "pin2": {
-          "compName": "ManualSwitch#8",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 205.0
-          },
-          {
-            "x": 185.0,
-            "y": 195.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#11",
@@ -2297,39 +2330,6 @@
              "y": 225.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EZ"
-        },
-        "pin2": {
-          "compName": "ManualSwitch#12",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "ManualSwitch#11",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 215.0
-          },
-          {
-            "x": 195.0,
-            "y": 225.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json

index 39a469c..136fcd0 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -5,15 +5,6 @@
    "innerScale": 0.4,
    "submodel": {
      "components": [
-      {
-        "id": "ManualSwitch",
-        "name": "@c",
-        "pos": {
-          "x": 120.0,
-          "y": 355.0
-        },
-        "params": 1
-      },
        {
          "id": "Am2900MainMemory",
          "name": "Am2900MainMemory#0",
@@ -209,6 +200,15 @@
            ]
          }
        },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#0",
+        "pos": {
+          "x": 120.0,
+          "y": 355.0
+        },
+        "params": 1
+      },
        {
          "id": "NandGate",
          "name": "NandGate#0",
@@ -265,7 +265,7 @@
        },
        {
          "id": "NandGate",
-        "name": "NandGate#7",
+        "name": "NandGate#6",
          "pos": {
            "x": 150.0,
            "y": 375.0
@@ -298,7 +298,43 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#2",
+        "pos": {
+          "x": 620.0,
+          "y": 255.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#3",
+        "pos": {
+          "x": 205.0,
+          "y": 390.0
+        },
+        "params": {
+          "logicWidth": 8,
+          "orientation": "DOWN"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#4",
+        "pos": {
+          "x": 205.0,
+          "y": 405.0
+        },
+        "params": {
+          "logicWidth": 12,
+          "orientation": "UP"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#5",
          "pos": {
            "x": 575.0,
            "y": 115.0
@@ -310,7 +346,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#6",
          "pos": {
            "x": 575.0,
            "y": 195.0
@@ -322,7 +358,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#7",
          "pos": {
            "x": 575.0,
            "y": 235.0
@@ -334,7 +370,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#8",
          "pos": {
            "x": 675.0,
            "y": 150.0
@@ -346,7 +382,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#9",
          "pos": {
            "x": 675.0,
            "y": 245.0
@@ -358,7 +394,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#10",
          "pos": {
            "x": 345.0,
            "y": 830.0
@@ -370,7 +406,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#11",
          "pos": {
            "x": 405.0,
            "y": 815.0
@@ -382,7 +418,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#12",
          "pos": {
            "x": 525.0,
            "y": 815.0
@@ -394,7 +430,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#13",
          "pos": {
            "x": 660.0,
            "y": 755.0
@@ -406,19 +442,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#2",
-        "pos": {
-          "x": 620.0,
-          "y": 255.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#14",
          "pos": {
            "x": 575.0,
            "y": 815.0
@@ -430,7 +454,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#21",
+        "name": "Splitter#15",
          "pos": {
            "x": 695.0,
            "y": 815.0
@@ -442,7 +466,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#22",
+        "name": "Splitter#16",
          "pos": {
            "x": 655.0,
            "y": 815.0
@@ -454,7 +478,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#23",
+        "name": "Splitter#17",
          "pos": {
            "x": 730.0,
            "y": 770.0
@@ -466,7 +490,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#24",
+        "name": "Splitter#18",
          "pos": {
            "x": 690.0,
            "y": 770.0
@@ -478,7 +502,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#25",
+        "name": "Splitter#19",
          "pos": {
            "x": 660.0,
            "y": 770.0
@@ -490,7 +514,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#26",
+        "name": "Splitter#20",
          "pos": {
            "x": 925.0,
            "y": 815.0
@@ -502,7 +526,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#27",
+        "name": "Splitter#21",
          "pos": {
            "x": 895.0,
            "y": 815.0
@@ -514,7 +538,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#28",
+        "name": "Splitter#22",
          "pos": {
            "x": 865.0,
            "y": 815.0
@@ -526,7 +550,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#29",
+        "name": "Splitter#23",
          "pos": {
            "x": 835.0,
            "y": 815.0
@@ -538,19 +562,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#3",
-        "pos": {
-          "x": 205.0,
-          "y": 390.0
-        },
-        "params": {
-          "logicWidth": 8,
-          "orientation": "DOWN"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#30",
+        "name": "Splitter#24",
          "pos": {
            "x": 795.0,
            "y": 815.0
@@ -562,7 +574,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#31",
+        "name": "Splitter#25",
          "pos": {
            "x": 745.0,
            "y": 815.0
@@ -574,7 +586,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#32",
+        "name": "Splitter#26",
          "pos": {
            "x": 895.0,
            "y": 800.0
@@ -586,7 +598,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#33",
+        "name": "Splitter#27",
          "pos": {
            "x": 835.0,
            "y": 800.0
@@ -598,7 +610,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#34",
+        "name": "Splitter#28",
          "pos": {
            "x": 865.0,
            "y": 800.0
@@ -610,7 +622,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#35",
+        "name": "Splitter#29",
          "pos": {
            "x": 835.0,
            "y": 780.0
@@ -622,7 +634,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#36",
+        "name": "Splitter#30",
          "pos": {
            "x": 895.0,
            "y": 330.0
@@ -634,7 +646,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#37",
+        "name": "Splitter#31",
          "pos": {
            "x": 895.0,
            "y": 580.0
@@ -646,7 +658,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#38",
+        "name": "Splitter#32",
          "pos": {
            "x": 895.0,
            "y": 565.0
@@ -658,7 +670,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#39",
+        "name": "Splitter#33",
          "pos": {
            "x": 935.0,
            "y": 565.0
@@ -670,19 +682,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#4",
-        "pos": {
-          "x": 205.0,
-          "y": 405.0
-        },
-        "params": {
-          "logicWidth": 12,
-          "orientation": "UP"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#40",
+        "name": "Splitter#34",
          "pos": {
            "x": 975.0,
            "y": 565.0
@@ -694,7 +694,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#41",
+        "name": "Splitter#35",
          "pos": {
            "x": 1015.0,
            "y": 565.0
@@ -706,7 +706,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#42",
+        "name": "Splitter#36",
          "pos": {
            "x": 895.0,
            "y": 345.0
@@ -718,7 +718,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#43",
+        "name": "Splitter#37",
          "pos": {
            "x": 935.0,
            "y": 345.0
@@ -730,7 +730,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#44",
+        "name": "Splitter#38",
          "pos": {
            "x": 975.0,
            "y": 345.0
@@ -742,7 +742,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#45",
+        "name": "Splitter#39",
          "pos": {
            "x": 1015.0,
            "y": 345.0
@@ -754,7 +754,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#46",
+        "name": "Splitter#40",
          "pos": {
            "x": 310.0,
            "y": 235.0
@@ -766,7 +766,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#47",
+        "name": "Splitter#41",
          "pos": {
            "x": 620.0,
            "y": 200.0
@@ -778,7 +778,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#48",
+        "name": "Splitter#42",
          "pos": {
            "x": 365.0,
            "y": 815.0
@@ -790,7 +790,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#49",
+        "name": "Splitter#43",
          "pos": {
            "x": 620.0,
            "y": 295.0
@@ -829,7 +829,7 @@
        },
        {
          "id": "TextComponent",
-        "name": "TextComponent#4",
+        "name": "TextComponent#3",
          "pos": {
            "x": 110.0,
            "y": 355.0
@@ -886,7 +886,7 @@
        },
        {
          "id": "TriStateBuffer",
-        "name": "TriStateBuffer#5",
+        "name": "TriStateBuffer#4",
          "pos": {
            "x": 205.0,
            "y": 70.0
@@ -914,6 +914,78 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 839.0,
+          "y": 394.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 964.0,
+          "y": 394.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 569.0,
+          "y": 234.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 559.0,
+          "y": 399.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 1074.0,
+          "y": 389.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 1069.0,
+          "y": 384.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 944.0,
+          "y": 384.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 949.0,
+          "y": 389.0
+        },
+        "params": 4
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#10",
@@ -1004,15 +1076,6 @@
          },
          "params": 16
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 839.0,
-          "y": 394.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -1103,15 +1166,6 @@
          },
          "params": 16
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 964.0,
-          "y": 394.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#30",
@@ -1202,15 +1256,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 569.0,
-          "y": 234.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#40",
@@ -1247,51 +1292,6 @@
          },
          "params": 12
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 559.0,
-          "y": 399.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 1074.0,
-          "y": 389.0
-        },
-        "params": 4
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 1069.0,
-          "y": 384.0
-        },
-        "params": 4
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 944.0,
-          "y": 384.0
-        },
-        "params": 4
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 949.0,
-          "y": 389.0
-        },
-        "params": 4
-      },
        {
          "id": "and",
          "name": "and#0",
@@ -1357,6 +1357,22 @@
          },
          "params": 16
        },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 635.0,
+          "y": 145.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 635.0,
+          "y": 240.0
+        }
+      },
        {
          "id": "mux1_12",
          "name": "mux1_12#0",
@@ -1380,22 +1396,6 @@
            "x": 910.0,
            "y": 215.0
          }
-      },
-      {
-        "id": "mux1_4",
-        "name": "mux1_4#0",
-        "pos": {
-          "x": 635.0,
-          "y": 145.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "mux1_4#1",
-        "pos": {
-          "x": 635.0,
-          "y": 240.0
-        }
        }
      ],
      "wires": [
@@ -1459,211 +1459,209 @@
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "QIOn"
+          "compName": "Am2901#0",
+          "pinName": "RAMn+3"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "Qn+3"
+          "compName": "Am2901#1",
+          "pinName": "RAMn"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 540.0,
-            "y": 530.0
-          },
-          {
-            "x": 540.0,
-            "y": 660.0
-          },
-          {
-            "x": 1215.0,
-            "y": 660.0
+            "x": 830.0,
+            "y": 510.0
            },
            {
-            "x": 1215.0,
-            "y": 515.0
+            "x": 830.0,
+            "y": 410.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
+          "compName": "Am2901#1",
+          "pinName": "Qn+3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "Am2901#2",
+          "pinName": "Qn"
          },
-        "name": "unnamedWire#100",
-        "path": []
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 960.0,
+            "y": 515.0
+          },
+          {
+            "x": 960.0,
+            "y": 420.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2900MicroInstructionMemory#0",
-          "pinName": "D"
+          "compName": "Am2901#2",
+          "pinName": "RAMn"
          },
          "pin2": {
-          "compName": "dlatch80#0",
-          "pinName": "D"
+          "compName": "Am2901#1",
+          "pinName": "RAMn+3"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 205.0,
-            "y": 615.0
+            "x": 955.0,
+            "y": 410.0
            },
            {
-            "x": 205.0,
-            "y": 760.0
+            "x": 955.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
+          "compName": "Am2901#3",
+          "pinName": "RAMn"
          },
          "pin2": {
-          "compName": "dlatch80#1",
-          "pinName": "E"
+          "compName": "Am2901#2",
+          "pinName": "RAMn+3"
          },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 180.0,
-            "y": 480.0
-          },
-          {
-            "x": 235.0,
-            "y": 480.0
-          },
-          {
-            "x": 235.0,
-            "y": 670.0
-          },
-          {
-            "x": 285.0,
-            "y": 670.0
+            "x": 1080.0,
+            "y": 410.0
            },
            {
-            "x": 285.0,
-            "y": 680.0
+            "x": 1080.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Am2901#2",
+          "pinName": "Qn+3"
          },
          "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "Am2901#3",
+          "pinName": "Qn"
          },
-        "name": "unnamedWire#103",
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 1085.0,
+            "y": 515.0
+          },
+          {
+            "x": 1085.0,
+            "y": 420.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Am2901#0",
+          "pinName": "Qn"
          },
          "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
+          "compName": "Am2904#0",
+          "pinName": "QIO0"
          },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 390.0,
-            "y": 200.0
+            "x": 685.0,
+            "y": 420.0
+          },
+          {
+            "x": 685.0,
+            "y": 530.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#46",
-          "pinName": "O2"
+          "compName": "Am2904#0",
+          "pinName": "SIO0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Am2901#0",
+          "pinName": "RAMn"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 320.0,
-            "y": 210.0
+            "x": 680.0,
+            "y": 525.0
+          },
+          {
+            "x": 680.0,
+            "y": 410.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
+          "compName": "Am2904#0",
+          "pinName": "SIOn"
          },
          "pin2": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "EN"
+          "compName": "Am2901#3",
+          "pinName": "RAMn+3"
          },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 450.0,
-            "y": 205.0
+            "x": 535.0,
+            "y": 525.0
            },
            {
-            "x": 450.0,
-            "y": 140.0
+            "x": 535.0,
+            "y": 655.0
            },
            {
-            "x": 435.0,
-            "y": 140.0
+            "x": 1210.0,
+            "y": 655.0
+          },
+          {
+            "x": 1210.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Am2904#0",
+          "pinName": "QIOn"
          },
          "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#107",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "B"
+          "compName": "Am2901#3",
+          "pinName": "Qn+3"
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#10",
          "path": [
            {
-            "x": 390.0,
-            "y": 235.0
+            "x": 540.0,
+            "y": 530.0
+          },
+          {
+            "x": 540.0,
+            "y": 660.0
+          },
+          {
+            "x": 1215.0,
+            "y": 660.0
+          },
+          {
+            "x": 1215.0,
+            "y": 515.0
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "Splitter#46",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
-        },
-        "name": "unnamedWire#109",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Am2904#0",
@@ -1695,5175 +1693,5177 @@
        },
        {
          "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
+          "compName": "Am2901#0",
+          "pinName": "F\u003d0"
          },
          "pin2": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "EN"
+          "compName": "and#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 435.0,
-            "y": 230.0
+            "x": 720.0,
+            "y": 445.0
+          },
+          {
+            "x": 720.0,
+            "y": 535.0
+          },
+          {
+            "x": 840.0,
+            "y": 535.0
+          },
+          {
+            "x": 840.0,
+            "y": 625.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Am2901#1",
+          "pinName": "F\u003d0"
          },
          "pin2": {
-          "compName": "NandGate#4",
+          "compName": "and#1",
            "pinName": "A"
          },
-        "name": "unnamedWire#111",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#4",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 930.0,
-            "y": 725.0
+            "x": 845.0,
+            "y": 445.0
+          },
+          {
+            "x": 845.0,
+            "y": 615.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "I"
+          "compName": "and#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "and#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 760.0,
-            "y": 165.0
+            "x": 900.0,
+            "y": 615.0
            },
            {
-            "x": 760.0,
-            "y": 385.0
+            "x": 900.0,
+            "y": 610.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "and#2",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "Splitter#15",
-          "pinName": "I"
+          "compName": "and#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 755.0,
-            "y": 390.0
+            "x": 900.0,
+            "y": 600.0
            },
            {
-            "x": 755.0,
-            "y": 260.0
+            "x": 900.0,
+            "y": 595.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "name": "unnamedWire#115",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#116",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#117",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "name": "unnamedWire#118",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "and#0",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O37"
+          "compName": "Am2901#2",
+          "pinName": "F\u003d0"
          },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 830.0,
-            "y": 715.0
+            "x": 850.0,
+            "y": 605.0
            },
            {
-            "x": 830.0,
-            "y": 810.0
+            "x": 850.0,
+            "y": 535.0
            },
            {
-            "x": 715.0,
-            "y": 810.0
+            "x": 970.0,
+            "y": 535.0
+          },
+          {
+            "x": 970.0,
+            "y": 445.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
+          "compName": "Am2901#3",
            "pinName": "F\u003d0"
          },
          "pin2": {
-          "compName": "and#1",
-          "pinName": "B"
+          "compName": "and#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 720.0,
+            "x": 1095.0,
              "y": 445.0
            },
            {
-            "x": 720.0,
-            "y": 535.0
+            "x": 1095.0,
+            "y": 540.0
            },
            {
-            "x": 840.0,
-            "y": 535.0
+            "x": 855.0,
+            "y": 540.0
            },
            {
-            "x": 840.0,
-            "y": 625.0
+            "x": 855.0,
+            "y": 595.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#4",
+          "compName": "and#2",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "EN"
+          "compName": "Am2904#0",
+          "pinName": "IZ"
          },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 1015.0,
-            "y": 720.0
+            "x": 945.0,
+            "y": 600.0
            },
            {
-            "x": 1015.0,
-            "y": 610.0
+            "x": 945.0,
+            "y": 635.0
            },
            {
-            "x": 1000.0,
-            "y": 610.0
+            "x": 515.0,
+            "y": 635.0
+          },
+          {
+            "x": 515.0,
+            "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "Am2901#3",
+          "pinName": "OVR"
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "A"
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
          },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 340.0,
-            "y": 700.0
+            "x": 1100.0,
+            "y": 450.0
            },
            {
-            "x": 340.0,
-            "y": 260.0
+            "x": 1100.0,
+            "y": 650.0
            },
            {
-            "x": 180.0,
-            "y": 260.0
+            "x": 530.0,
+            "y": 650.0
            },
            {
-            "x": 180.0,
-            "y": 105.0
+            "x": 530.0,
+            "y": 430.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Am2901#3",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
+          "compName": "Am2904#0",
+          "pinName": "IC"
          },
-        "name": "unnamedWire#122",
-        "path": []
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 1220.0,
+            "y": 520.0
+          },
+          {
+            "x": 1220.0,
+            "y": 640.0
+          },
+          {
+            "x": 520.0,
+            "y": 640.0
+          },
+          {
+            "x": 520.0,
+            "y": 420.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Am2901#0",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "A"
+          "compName": "Am2901#1",
+          "pinName": "Cn"
          },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 930.0,
-            "y": 690.0
+            "x": 840.0,
+            "y": 520.0
+          },
+          {
+            "x": 840.0,
+            "y": 505.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "EN"
+          "compName": "Am2901#1",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
+          "compName": "Am2901#2",
+          "pinName": "Cn"
          },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 1000.0,
-            "y": 695.0
+            "x": 965.0,
+            "y": 520.0
+          },
+          {
+            "x": 965.0,
+            "y": 505.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Am2901#2",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "A"
+          "compName": "Am2901#3",
+          "pinName": "Cn"
          },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#23",
+        "path": [
+          {
+            "x": 1090.0,
+            "y": 520.0
+          },
+          {
+            "x": 1090.0,
+            "y": 505.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "C"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "D"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "IN"
+          "compName": "NandGate#6",
+          "pinName": "A"
          },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#46",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_16#0",
-          "pinName": "S"
+          "compName": "Am2901#3",
+          "pinName": "C"
          },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#26",
          "path": [
            {
-            "x": 310.0,
-            "y": 225.0
-          },
-          {
-            "x": 240.0,
-            "y": 225.0
+            "x": 1090.0,
+            "y": 395.0
            },
            {
-            "x": 240.0,
-            "y": 115.0
+            "x": 1090.0,
+            "y": 495.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "inc#0",
-          "pinName": "Y"
+          "compName": "Am2901#2",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "dff16#0",
-          "pinName": "D"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 335.0,
-            "y": 130.0
+            "x": 965.0,
+            "y": 495.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "inc#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_16#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#129",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 160.0
-          }
-        ]
+        "name": "unnamedWire#28",
+        "path": []
        },
        {
          "pin1": {
            "compName": "Am2901#1",
-          "pinName": "F\u003d0"
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "and#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#29",
          "path": [
            {
-            "x": 845.0,
-            "y": 445.0
-          },
-          {
-            "x": 845.0,
-            "y": 615.0
+            "x": 840.0,
+            "y": 495.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "inc#0",
-          "pinName": "CI"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#130",
-        "path": [
-          {
-            "x": 360.0,
-            "y": 145.0
-          },
-          {
-            "x": 360.0,
-            "y": 175.0
-          }
-        ]
+        "name": "unnamedWire#30",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
+          "compName": "Am2901#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#31",
          "path": [
            {
-            "x": 330.0,
-            "y": 170.0
+            "x": 715.0,
+            "y": 495.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#132",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "FixedOutput#7",
-          "pinName": "out"
-        },
          "pin2": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 285.0,
-            "y": 380.0
+            "x": 715.0,
+            "y": 365.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Am2901#0",
+          "pinName": "Cn"
          },
          "pin2": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "IN"
+          "compName": "Am2904#0",
+          "pinName": "C0"
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#33",
          "path": [
            {
-            "x": 420.0,
-            "y": 155.0
+            "x": 675.0,
+            "y": 505.0
+          },
+          {
+            "x": 675.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Am2910#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#135",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 80.0
-          },
-          {
-            "x": 230.0,
-            "y": 45.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2910#0",
-          "pinName": "_MAP"
+          "compName": "FixedOutput#1",
+          "pinName": "out"
          },
          "pin2": {
-          "compName": "mux1_12#0",
-          "pinName": "S"
+          "compName": "Am2904#0",
+          "pinName": "_OECT"
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#35",
          "path": [
            {
-            "x": 420.0,
-            "y": 560.0
-          },
-          {
-            "x": 360.0,
-            "y": 560.0
-          },
-          {
-            "x": 360.0,
-            "y": 425.0
+            "x": 660.0,
+            "y": 390.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "FixedOutput#2",
+          "pinName": "out"
          },
          "pin2": {
-          "compName": "dff16#0",
-          "pinName": "Q"
+          "compName": "Am2910#0",
+          "pinName": "_RLD"
          },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch80#1",
-          "pinName": "Q"
+          "compName": "Am2910#0",
+          "pinName": "CI"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "I"
+          "compName": "FixedOutput#3",
+          "pinName": "out"
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 330.0,
-            "y": 760.0
-          },
-          {
-            "x": 330.0,
-            "y": 845.0
+            "x": 480.0,
+            "y": 540.0
            },
            {
-            "x": 740.0,
-            "y": 845.0
+            "x": 480.0,
+            "y": 570.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O22"
+          "compName": "Am2910#0",
+          "pinName": "_OE"
          },
          "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "_CCEN"
+          "compName": "FixedOutput#4",
+          "pinName": "out"
          },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#38",
          "path": [
            {
-            "x": 565.0,
-            "y": 735.0
-          },
-          {
-            "x": 395.0,
-            "y": 735.0
-          },
-          {
-            "x": 395.0,
-            "y": 525.0
+            "x": 445.0,
+            "y": 580.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and#1",
-          "pinName": "Y"
+          "compName": "FixedOutput#5",
+          "pinName": "out"
          },
          "pin2": {
-          "compName": "and#2",
-          "pinName": "B"
+          "compName": "Am2904#0",
+          "pinName": "_SE"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#39",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "FixedOutput#6",
+          "pinName": "out"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#40",
          "path": [
            {
-            "x": 900.0,
-            "y": 615.0
-          },
-          {
-            "x": 900.0,
-            "y": 610.0
+            "x": 560.0,
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "O3"
+          "compName": "Am2904#0",
+          "pinName": "_EZ"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O21"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#41",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O20"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O2"
+          "compName": "Am2904#0",
+          "pinName": "_EOVR"
          },
-        "name": "unnamedWire#141",
-        "path": []
+        "name": "unnamedWire#42",
+        "path": [
+          {
+            "x": 575.0,
+            "y": 400.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O19"
+          "compName": "Am2904#0",
+          "pinName": "_EC"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O18"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O0"
+          "compName": "Am2904#0",
+          "pinName": "_EN"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "I"
+          "compName": "dff16_invwe#0",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Am2910#0",
+          "compName": "Splitter#0",
            "pinName": "I"
          },
-        "name": "unnamedWire#144",
-        "path": [
-          {
-            "x": 540.0,
-            "y": 730.0
-          },
-          {
-            "x": 400.0,
-            "y": 730.0
-          },
-          {
-            "x": 400.0,
-            "y": 535.0
-          }
-        ]
+        "name": "unnamedWire#45",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
-          "pinName": "O11"
+          "compName": "Splitter#0",
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O17"
+          "compName": "Splitter#5",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O16"
+          "compName": "Splitter#5",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O10"
+          "compName": "Splitter#0",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
-          "pinName": "O9"
+          "compName": "Splitter#0",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O15"
+          "compName": "Splitter#5",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O14"
+          "compName": "Splitter#5",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O8"
+          "compName": "Splitter#0",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
-          "pinName": "O7"
+          "compName": "Splitter#0",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O13"
+          "compName": "Splitter#5",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "and#2",
-          "pinName": "A"
+          "compName": "Splitter#0",
+          "pinName": "O10"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "Y"
+          "compName": "Splitter#5",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 900.0,
-            "y": 600.0
-          },
-          {
-            "x": 900.0,
-            "y": 595.0
-          }
-        ]
+        "name": "unnamedWire#51",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O12"
+          "compName": "Splitter#5",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O6"
+          "compName": "Splitter#0",
+          "pinName": "O9"
          },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
-          "pinName": "O5"
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O11"
+          "compName": "Splitter#5",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O10"
+          "compName": "FixedOutput#0",
+          "pinName": "out"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#152",
-        "path": []
+        "name": "unnamedWire#54",
+        "path": [
+          {
+            "x": 570.0,
+            "y": 280.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#6",
            "pinName": "O3"
          },
+        "name": "unnamedWire#55",
+        "path": [
+          {
+            "x": 570.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O9"
+          "compName": "Splitter#7",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O8"
+          "compName": "Splitter#7",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#0",
            "pinName": "O2"
          },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#0",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O7"
+          "compName": "Splitter#7",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#58",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O6"
+          "compName": "Splitter#7",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#0",
            "pinName": "O0"
          },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#59",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "Y"
+          "compName": "Splitter#6",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#157",
-        "path": [
-          {
-            "x": 435.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#60",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "I1"
+          "compName": "Splitter#0",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "I"
+          "compName": "Splitter#6",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#158",
-        "path": [
-          {
-            "x": 350.0,
-            "y": 480.0
-          },
-          {
-            "x": 350.0,
-            "y": 760.0
-          },
-          {
-            "x": 460.0,
-            "y": 760.0
-          }
-        ]
+        "name": "unnamedWire#61",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch80#1",
-          "pinName": "D"
+          "compName": "Splitter#6",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch80#0",
-          "pinName": "Q"
+          "compName": "Splitter#0",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#62",
          "path": []
        },
        {
          "pin1": {
-          "compName": "and#0",
-          "pinName": "B"
+          "compName": "Splitter#1",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "F\u003d0"
+          "compName": "mux1_4#0",
+          "pinName": "I0_1"
          },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 850.0,
-            "y": 605.0
-          },
-          {
-            "x": 850.0,
-            "y": 535.0
-          },
-          {
-            "x": 970.0,
-            "y": 535.0
-          },
-          {
-            "x": 970.0,
-            "y": 445.0
-          }
-        ]
+        "name": "unnamedWire#63",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "mux1_4#0",
+          "pinName": "I0_2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "Splitter#1",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#64",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O5"
+          "compName": "Splitter#1",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#48",
-          "pinName": "O3"
+          "compName": "mux1_4#0",
+          "pinName": "I0_3"
          },
-        "name": "unnamedWire#161",
+        "name": "unnamedWire#65",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#46",
-          "pinName": "I"
+          "compName": "Splitter#1",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#48",
-          "pinName": "I"
+          "compName": "mux1_4#0",
+          "pinName": "I0_4"
          },
-        "name": "unnamedWire#162",
-        "path": [
-          {
-            "x": 325.0,
-            "y": 640.0
-          },
-          {
-            "x": 380.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#66",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2900MicroInstructionMemory#0",
-          "pinName": "A"
+          "compName": "Splitter#2",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#43",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "I0_1"
          },
-        "name": "unnamedWire#163",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 595.0
-          },
-          {
-            "x": 205.0,
-            "y": 565.0
-          }
-        ]
+        "name": "unnamedWire#67",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O29"
+          "compName": "mux1_4#1",
+          "pinName": "I0_2"
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEM"
+          "compName": "Splitter#2",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#164",
-        "path": [
-          {
-            "x": 635.0,
-            "y": 780.0
-          },
-          {
-            "x": 505.0,
-            "y": 780.0
-          },
-          {
-            "x": 505.0,
-            "y": 400.0
-          },
-          {
-            "x": 555.0,
-            "y": 400.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O30"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEmu"
-        },
-        "name": "unnamedWire#165",
-        "path": [
-          {
-            "x": 645.0,
-            "y": 775.0
-          },
-          {
-            "x": 500.0,
-            "y": 775.0
-          },
-          {
-            "x": 500.0,
-            "y": 395.0
-          },
-          {
-            "x": 595.0,
-            "y": 395.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O23"
-        },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#68",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O2"
+          "compName": "Splitter#2",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O25"
+          "compName": "mux1_4#1",
+          "pinName": "I0_3"
          },
-        "name": "unnamedWire#167",
+        "name": "unnamedWire#69",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O1"
+          "compName": "Splitter#2",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O24"
+          "compName": "mux1_4#1",
+          "pinName": "I0_4"
          },
-        "name": "unnamedWire#168",
+        "name": "unnamedWire#70",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O26"
+          "compName": "Splitter#7",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O3"
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
-        "name": "unnamedWire#169",
-        "path": []
+        "name": "unnamedWire#71",
+        "path": [
+          {
+            "x": 610.0,
+            "y": 250.0
+          },
+          {
+            "x": 610.0,
+            "y": 270.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#3",
-          "pinName": "F\u003d0"
+          "compName": "Splitter#6",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "A"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#72",
          "path": [
            {
-            "x": 1095.0,
-            "y": 445.0
-          },
-          {
-            "x": 1095.0,
-            "y": 540.0
-          },
-          {
-            "x": 855.0,
-            "y": 540.0
+            "x": 610.0,
+            "y": 210.0
            },
            {
-            "x": 855.0,
-            "y": 595.0
+            "x": 610.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O4"
+          "compName": "mux1_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O27"
+          "compName": "Splitter#8",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#170",
+        "name": "unnamedWire#73",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O28"
+          "compName": "Splitter#8",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O5"
+          "compName": "mux1_4#0",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#74",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#22",
-          "pinName": "O0"
+          "compName": "mux1_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O31"
+          "compName": "Splitter#8",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#75",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O32"
+          "compName": "Splitter#8",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#22",
-          "pinName": "O1"
+          "compName": "mux1_4#0",
+          "pinName": "Y4"
          },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#76",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#22",
-          "pinName": "O2"
+          "compName": "mux1_4#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O33"
+          "compName": "Splitter#9",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#77",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O34"
+          "compName": "Splitter#9",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#22",
-          "pinName": "O3"
+          "compName": "mux1_4#1",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#175",
+        "name": "unnamedWire#78",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O0"
+          "compName": "mux1_4#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O35"
+          "compName": "Splitter#9",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#176",
+        "name": "unnamedWire#79",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O36"
+          "compName": "Splitter#9",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O1"
+          "compName": "mux1_4#1",
+          "pinName": "Y4"
          },
-        "name": "unnamedWire#177",
+        "name": "unnamedWire#80",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#23",
-          "pinName": "I"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "I"
+          "compName": "Am2901#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#178",
+        "name": "unnamedWire#81",
          "path": [
            {
-            "x": 755.0,
-            "y": 785.0
-          },
-          {
-            "x": 600.0,
-            "y": 785.0
+            "x": 820.0,
+            "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#22",
-          "pinName": "I"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#24",
-          "pinName": "I"
+          "compName": "Am2901#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#179",
+        "name": "unnamedWire#82",
          "path": [
            {
-            "x": 670.0,
-            "y": 790.0
-          },
-          {
-            "x": 705.0,
-            "y": 790.0
+            "x": 825.0,
+            "y": 435.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IZ"
+          "compName": "Am2901#1",
+          "pinName": "A"
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#83",
          "path": [
            {
              "x": 945.0,
-            "y": 600.0
-          },
-          {
-            "x": 945.0,
-            "y": 635.0
-          },
-          {
-            "x": 515.0,
-            "y": 635.0
-          },
-          {
-            "x": 515.0,
              "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#25",
-          "pinName": "I"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "I"
+          "compName": "Am2901#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#180",
+        "name": "unnamedWire#84",
          "path": [
            {
-            "x": 665.0,
-            "y": 800.0
-          },
-          {
-            "x": 700.0,
-            "y": 800.0
+            "x": 950.0,
+            "y": 435.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#23",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#181",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#23",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#182",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#23",
-          "pinName": "O2"
+          "compName": "Am2901#2",
+          "pinName": "A"
          },
-        "name": "unnamedWire#183",
-        "path": []
+        "name": "unnamedWire#85",
+        "path": [
+          {
+            "x": 1070.0,
+            "y": 415.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#23",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O3"
+          "compName": "Am2901#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#184",
-        "path": []
+        "name": "unnamedWire#86",
+        "path": [
+          {
+            "x": 1075.0,
+            "y": 435.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#23",
-          "pinName": "O4"
+          "compName": "Am2901#3",
+          "pinName": "A"
          },
-        "name": "unnamedWire#185",
-        "path": []
+        "name": "unnamedWire#87",
+        "path": [
+          {
+            "x": 1205.0,
+            "y": 385.0
+          },
+          {
+            "x": 1205.0,
+            "y": 415.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#23",
-          "pinName": "O5"
+          "compName": "Am2901#3",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#186",
-        "path": []
+        "name": "unnamedWire#88",
+        "path": [
+          {
+            "x": 1210.0,
+            "y": 435.0
+          },
+          {
+            "x": 1210.0,
+            "y": 390.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#24",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "name": "unnamedWire#187",
+        "name": "unnamedWire#89",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O7"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#24",
-          "pinName": "O1"
+          "compName": "TriStateBuffer#1",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#188",
-        "path": []
+        "name": "unnamedWire#90",
+        "path": [
+          {
+            "x": 1245.0,
+            "y": 60.0
+          },
+          {
+            "x": 1245.0,
+            "y": 625.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#24",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O8"
+          "compName": "mux1_16#1",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#189",
-        "path": []
+        "name": "unnamedWire#91",
+        "path": [
+          {
+            "x": 895.0,
+            "y": 305.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#3",
-          "pinName": "OVR"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IOVR"
+          "compName": "TriStateBuffer#0",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#92",
          "path": [
            {
-            "x": 1100.0,
-            "y": 450.0
-          },
-          {
-            "x": 1100.0,
-            "y": 650.0
-          },
-          {
-            "x": 530.0,
-            "y": 650.0
+            "x": 1240.0,
+            "y": 45.0
            },
            {
-            "x": 530.0,
-            "y": 430.0
+            "x": 1240.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O9"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#24",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
-        "name": "unnamedWire#190",
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#25",
-          "pinName": "O0"
+          "compName": "ManualSwitch#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O11"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
-        "name": "unnamedWire#191",
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O12"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#25",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
          },
-        "name": "unnamedWire#192",
+        "name": "unnamedWire#95",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O15"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O73"
+          "compName": "NandGate#6",
+          "pinName": "B"
          },
-        "name": "unnamedWire#193",
-        "path": []
+        "name": "unnamedWire#96",
+        "path": [
+          {
+            "x": 145.0,
+            "y": 390.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O72"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O14"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
          },
-        "name": "unnamedWire#194",
+        "name": "unnamedWire#97",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O13"
+          "compName": "NandGate#6",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O71"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
          },
-        "name": "unnamedWire#195",
+        "name": "unnamedWire#98",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O70"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O12"
+          "compName": "dlatch80#0",
+          "pinName": "E"
          },
-        "name": "unnamedWire#196",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O11"
-        },
-        "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O69"
-        },
-        "name": "unnamedWire#197",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O68"
-        },
-        "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#198",
-        "path": []
+        "name": "unnamedWire#99",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 485.0
+          },
+          {
+            "x": 230.0,
+            "y": 485.0
+          },
+          {
+            "x": 230.0,
+            "y": 680.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O9"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O67"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
-        "name": "unnamedWire#199",
+        "name": "unnamedWire#100",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "RAMn+3"
+          "compName": "Am2900MicroInstructionMemory#0",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "RAMn"
+          "compName": "dlatch80#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 830.0,
-            "y": 510.0
+            "x": 205.0,
+            "y": 615.0
            },
            {
-            "x": 830.0,
-            "y": 410.0
+            "x": 205.0,
+            "y": 760.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901#3",
-          "pinName": "Cn+4"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IC"
+          "compName": "dlatch80#1",
+          "pinName": "E"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#102",
          "path": [
            {
-            "x": 1220.0,
-            "y": 520.0
+            "x": 180.0,
+            "y": 480.0
            },
            {
-            "x": 1220.0,
-            "y": 640.0
+            "x": 235.0,
+            "y": 480.0
            },
            {
-            "x": 520.0,
-            "y": 640.0
+            "x": 235.0,
+            "y": 670.0
            },
            {
-            "x": 520.0,
-            "y": 420.0
+            "x": 285.0,
+            "y": 670.0
+          },
+          {
+            "x": 285.0,
+            "y": 680.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O66"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O8"
+          "compName": "NandGate#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#200",
+        "name": "unnamedWire#103",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O7"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O65"
+          "compName": "NandGate#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#201",
-        "path": []
+        "name": "unnamedWire#104",
+        "path": [
+          {
+            "x": 390.0,
+            "y": 200.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O64"
+          "compName": "Splitter#40",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
-        "name": "unnamedWire#202",
-        "path": []
+        "name": "unnamedWire#105",
+        "path": [
+          {
+            "x": 320.0,
+            "y": 210.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O5"
+          "compName": "NandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O63"
+          "compName": "TriStateBuffer#2",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#203",
-        "path": []
+        "name": "unnamedWire#106",
+        "path": [
+          {
+            "x": 450.0,
+            "y": 205.0
+          },
+          {
+            "x": 450.0,
+            "y": 140.0
+          },
+          {
+            "x": 435.0,
+            "y": 140.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O62"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O4"
+          "compName": "NandGate#2",
+          "pinName": "A"
          },
-        "name": "unnamedWire#204",
+        "name": "unnamedWire#107",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O61"
+          "compName": "NandGate#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#205",
-        "path": []
+        "name": "unnamedWire#108",
+        "path": [
+          {
+            "x": 390.0,
+            "y": 235.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O60"
+          "compName": "Splitter#40",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#36",
+          "pinName": ""
          },
-        "name": "unnamedWire#206",
+        "name": "unnamedWire#109",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "O1"
+          "compName": "NandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O59"
+          "compName": "TriStateBuffer#3",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#207",
-        "path": []
+        "name": "unnamedWire#110",
+        "path": [
+          {
+            "x": 435.0,
+            "y": 230.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O58"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#26",
-          "pinName": "O0"
+          "compName": "NandGate#4",
+          "pinName": "A"
          },
-        "name": "unnamedWire#208",
+        "name": "unnamedWire#111",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#27",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O57"
+          "compName": "NandGate#4",
+          "pinName": "B"
          },
-        "name": "unnamedWire#209",
-        "path": []
+        "name": "unnamedWire#112",
+        "path": [
+          {
+            "x": 930.0,
+            "y": 725.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "Cn+4"
+          "compName": "Splitter#8",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 840.0,
-            "y": 520.0
+            "x": 760.0,
+            "y": 165.0
            },
            {
-            "x": 840.0,
-            "y": 505.0
+            "x": 760.0,
+            "y": 385.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O56"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#27",
-          "pinName": "O1"
+          "compName": "Splitter#9",
+          "pinName": "I"
          },
-        "name": "unnamedWire#210",
-        "path": []
+        "name": "unnamedWire#114",
+        "path": [
+          {
+            "x": 755.0,
+            "y": 390.0
+          },
+          {
+            "x": 755.0,
+            "y": 260.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#27",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O55"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
-        "name": "unnamedWire#211",
+        "name": "unnamedWire#115",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O54"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#28",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
-        "name": "unnamedWire#212",
+        "name": "unnamedWire#116",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#28",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O53"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#213",
+        "name": "unnamedWire#117",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O52"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#28",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "name": "unnamedWire#214",
+        "name": "unnamedWire#118",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#29",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O51"
+          "compName": "Splitter#10",
+          "pinName": "O37"
          },
-        "name": "unnamedWire#215",
-        "path": []
+        "name": "unnamedWire#119",
+        "path": [
+          {
+            "x": 830.0,
+            "y": 715.0
+          },
+          {
+            "x": 830.0,
+            "y": 810.0
+          },
+          {
+            "x": 715.0,
+            "y": 810.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O50"
+          "compName": "NandGate#4",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#29",
-          "pinName": "O1"
+          "compName": "TriStateBuffer#0",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#216",
-        "path": []
+        "name": "unnamedWire#120",
+        "path": [
+          {
+            "x": 1015.0,
+            "y": 720.0
+          },
+          {
+            "x": 1015.0,
+            "y": 610.0
+          },
+          {
+            "x": 1000.0,
+            "y": 610.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#29",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O49"
+          "compName": "NandGate#5",
+          "pinName": "A"
          },
-        "name": "unnamedWire#217",
-        "path": []
+        "name": "unnamedWire#121",
+        "path": [
+          {
+            "x": 340.0,
+            "y": 700.0
+          },
+          {
+            "x": 340.0,
+            "y": 260.0
+          },
+          {
+            "x": 180.0,
+            "y": 260.0
+          },
+          {
+            "x": 180.0,
+            "y": 105.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#30",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O48"
+          "compName": "NandGate#3",
+          "pinName": "B"
          },
-        "name": "unnamedWire#218",
+        "name": "unnamedWire#122",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O47"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#30",
-          "pinName": "O2"
+          "compName": "NandGate#3",
+          "pinName": "A"
          },
-        "name": "unnamedWire#219",
-        "path": []
+        "name": "unnamedWire#123",
+        "path": [
+          {
+            "x": 930.0,
+            "y": 690.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#1",
-          "pinName": "Cn+4"
+          "compName": "TriStateBuffer#1",
+          "pinName": "EN"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "Cn"
+          "compName": "NandGate#3",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#124",
          "path": [
            {
-            "x": 965.0,
-            "y": 520.0
-          },
-          {
-            "x": 965.0,
-            "y": 505.0
+            "x": 1000.0,
+            "y": 695.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#30",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O46"
+          "compName": "Am2900MainMemory#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#220",
+        "name": "unnamedWire#125",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O45"
+          "compName": "Am2900MainMemory#0",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Splitter#30",
-          "pinName": "O0"
+          "compName": "TriStateBuffer#4",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#221",
+        "name": "unnamedWire#126",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#31",
-          "pinName": "O0"
+          "compName": "Splitter#40",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O40"
+          "compName": "mux1_16#0",
+          "pinName": "S"
          },
-        "name": "unnamedWire#222",
-        "path": []
+        "name": "unnamedWire#127",
+        "path": [
+          {
+            "x": 310.0,
+            "y": 225.0
+          },
+          {
+            "x": 240.0,
+            "y": 225.0
+          },
+          {
+            "x": 240.0,
+            "y": 115.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O41"
+          "compName": "inc#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#31",
-          "pinName": "O1"
+          "compName": "dff16#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#223",
-        "path": []
+        "name": "unnamedWire#128",
+        "path": [
+          {
+            "x": 335.0,
+            "y": 130.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#31",
-          "pinName": "O2"
+          "compName": "inc#0",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O42"
+          "compName": "mux1_16#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#224",
-        "path": []
+        "name": "unnamedWire#129",
+        "path": [
+          {
+            "x": 335.0,
+            "y": 160.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O43"
+          "compName": "inc#0",
+          "pinName": "CI"
          },
          "pin2": {
-          "compName": "Splitter#31",
-          "pinName": "O3"
+          "compName": "NandGate#1",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#225",
-        "path": []
+        "name": "unnamedWire#130",
+        "path": [
+          {
+            "x": 360.0,
+            "y": 145.0
+          },
+          {
+            "x": 360.0,
+            "y": 175.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O10"
+          "compName": "NandGate#1",
+          "pinName": "A"
          },
-        "name": "unnamedWire#226",
+        "name": "unnamedWire#131",
          "path": [
            {
-            "x": 680.0,
-            "y": 795.0
+            "x": 330.0,
+            "y": 170.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#33",
-          "pinName": "I"
+          "compName": "NandGate#1",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Splitter#29",
-          "pinName": "I"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "name": "unnamedWire#227",
+        "name": "unnamedWire#132",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#34",
-          "pinName": "I"
+          "compName": "FixedOutput#7",
+          "pinName": "out"
          },
          "pin2": {
-          "compName": "Splitter#28",
-          "pinName": "I"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
-        "name": "unnamedWire#228",
-        "path": []
+        "name": "unnamedWire#133",
+        "path": [
+          {
+            "x": 285.0,
+            "y": 380.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#32",
-          "pinName": "I"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#27",
-          "pinName": "I"
+          "compName": "TriStateBuffer#3",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#229",
-        "path": []
+        "name": "unnamedWire#134",
+        "path": [
+          {
+            "x": 420.0,
+            "y": 155.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#2",
-          "pinName": "Cn+4"
+          "compName": "TriStateBuffer#4",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#135",
          "path": [
            {
-            "x": 1090.0,
-            "y": 520.0
+            "x": 230.0,
+            "y": 80.0
            },
            {
-            "x": 1090.0,
-            "y": 505.0
+            "x": 230.0,
+            "y": 45.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O0"
+          "compName": "Am2910#0",
+          "pinName": "_MAP"
          },
          "pin2": {
-          "compName": "Splitter#32",
-          "pinName": "O0"
+          "compName": "mux1_12#0",
+          "pinName": "S"
          },
-        "name": "unnamedWire#230",
-        "path": []
+        "name": "unnamedWire#136",
+        "path": [
+          {
+            "x": 420.0,
+            "y": 560.0
+          },
+          {
+            "x": 360.0,
+            "y": 560.0
+          },
+          {
+            "x": 360.0,
+            "y": 425.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#32",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#35",
-          "pinName": "O1"
+          "compName": "dff16#0",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#231",
+        "name": "unnamedWire#137",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O2"
+          "compName": "dlatch80#1",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#32",
-          "pinName": "O2"
+          "compName": "Splitter#10",
+          "pinName": "I"
          },
-        "name": "unnamedWire#232",
-        "path": []
+        "name": "unnamedWire#138",
+        "path": [
+          {
+            "x": 330.0,
+            "y": 760.0
+          },
+          {
+            "x": 330.0,
+            "y": 845.0
+          },
+          {
+            "x": 740.0,
+            "y": 845.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#34",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O22"
          },
          "pin2": {
-          "compName": "Splitter#35",
-          "pinName": "O3"
+          "compName": "Am2910#0",
+          "pinName": "_CCEN"
          },
-        "name": "unnamedWire#233",
-        "path": []
+        "name": "unnamedWire#139",
+        "path": [
+          {
+            "x": 565.0,
+            "y": 735.0
+          },
+          {
+            "x": 395.0,
+            "y": 735.0
+          },
+          {
+            "x": 395.0,
+            "y": 525.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O4"
+          "compName": "Splitter#12",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#34",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O21"
          },
-        "name": "unnamedWire#234",
+        "name": "unnamedWire#140",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O5"
+          "compName": "Splitter#10",
+          "pinName": "O20"
          },
          "pin2": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#12",
            "pinName": "O2"
          },
-        "name": "unnamedWire#235",
+        "name": "unnamedWire#141",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O6"
+          "compName": "Splitter#12",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#33",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O19"
          },
-        "name": "unnamedWire#236",
+        "name": "unnamedWire#142",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#33",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O18"
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#12",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#237",
+        "name": "unnamedWire#143",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#35",
-          "pinName": "O8"
+          "compName": "Splitter#12",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#33",
-          "pinName": "O2"
+          "compName": "Am2910#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#238",
-        "path": []
+        "name": "unnamedWire#144",
+        "path": [
+          {
+            "x": 540.0,
+            "y": 730.0
+          },
+          {
+            "x": 400.0,
+            "y": 730.0
+          },
+          {
+            "x": 400.0,
+            "y": 535.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#11",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "Splitter#35",
-          "pinName": "O7"
+          "compName": "Splitter#10",
+          "pinName": "O17"
          },
-        "name": "unnamedWire#239",
+        "name": "unnamedWire#145",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "C"
+          "compName": "Splitter#10",
+          "pinName": "O16"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#11",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#146",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "I"
+          "compName": "Splitter#11",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O15"
          },
-        "name": "unnamedWire#240",
-        "path": [
-          {
-            "x": 720.0,
-            "y": 730.0
-          },
-          {
-            "x": 545.0,
-            "y": 730.0
-          },
-          {
-            "x": 545.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#147",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "RW"
+          "compName": "Splitter#10",
+          "pinName": "O14"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O0"
+          "compName": "Splitter#11",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#241",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 100.0
-          },
-          {
-            "x": 175.0,
-            "y": 265.0
-          },
-          {
-            "x": 345.0,
-            "y": 265.0
-          }
-        ]
+        "name": "unnamedWire#148",
+        "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#11",
-          "pinName": "I"
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O13"
          },
-        "name": "unnamedWire#242",
-        "path": [
-          {
-            "x": 590.0,
-            "y": 150.0
-          },
-          {
-            "x": 590.0,
-            "y": 335.0
-          },
-          {
-            "x": 240.0,
-            "y": 335.0
-          }
-        ]
+        "name": "unnamedWire#149",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O15"
+          "compName": "Splitter#10",
+          "pinName": "O12"
          },
          "pin2": {
-          "compName": "Splitter#42",
-          "pinName": "O3"
+          "compName": "Splitter#11",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#243",
+        "name": "unnamedWire#150",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#42",
-          "pinName": "O2"
+          "compName": "Splitter#11",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O14"
+          "compName": "Splitter#10",
+          "pinName": "O11"
          },
-        "name": "unnamedWire#244",
+        "name": "unnamedWire#151",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O13"
+          "compName": "Splitter#10",
+          "pinName": "O10"
          },
          "pin2": {
-          "compName": "Splitter#42",
-          "pinName": "O1"
+          "compName": "Splitter#11",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#245",
+        "name": "unnamedWire#152",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#42",
-          "pinName": "O0"
+          "compName": "Splitter#11",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O12"
+          "compName": "Splitter#10",
+          "pinName": "O9"
          },
-        "name": "unnamedWire#246",
+        "name": "unnamedWire#153",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O11"
+          "compName": "Splitter#10",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "Splitter#43",
-          "pinName": "O3"
+          "compName": "Splitter#11",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#247",
+        "name": "unnamedWire#154",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#43",
-          "pinName": "O2"
+          "compName": "Splitter#11",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O10"
+          "compName": "Splitter#10",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#248",
+        "name": "unnamedWire#155",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O9"
+          "compName": "Splitter#10",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#43",
-          "pinName": "O1"
+          "compName": "Splitter#11",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#249",
+        "name": "unnamedWire#156",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "mux1_12#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "A"
+          "compName": "Am2910#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#25",
-        "path": []
+        "name": "unnamedWire#157",
+        "path": [
+          {
+            "x": 435.0,
+            "y": 450.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#43",
-          "pinName": "O0"
+          "compName": "mux1_12#0",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O8"
+          "compName": "Splitter#11",
+          "pinName": "I"
          },
-        "name": "unnamedWire#250",
-        "path": []
+        "name": "unnamedWire#158",
+        "path": [
+          {
+            "x": 350.0,
+            "y": 480.0
+          },
+          {
+            "x": 350.0,
+            "y": 760.0
+          },
+          {
+            "x": 460.0,
+            "y": 760.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O7"
+          "compName": "dlatch80#1",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Splitter#44",
-          "pinName": "O3"
+          "compName": "dlatch80#0",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#251",
+        "name": "unnamedWire#159",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#44",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "name": "unnamedWire#252",
+        "name": "unnamedWire#160",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#10",
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#44",
-          "pinName": "O1"
+          "compName": "Splitter#42",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#253",
+        "name": "unnamedWire#161",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#44",
-          "pinName": "O0"
+          "compName": "Splitter#40",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O4"
+          "compName": "Splitter#42",
+          "pinName": "I"
          },
-        "name": "unnamedWire#254",
-        "path": []
+        "name": "unnamedWire#162",
+        "path": [
+          {
+            "x": 325.0,
+            "y": 640.0
+          },
+          {
+            "x": 380.0,
+            "y": 640.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O3"
+          "compName": "Am2900MicroInstructionMemory#0",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "Splitter#45",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#43",
+          "pinName": ""
          },
-        "name": "unnamedWire#255",
-        "path": []
+        "name": "unnamedWire#163",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 595.0
+          },
+          {
+            "x": 205.0,
+            "y": 565.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#45",
-          "pinName": "O2"
+          "compName": "Splitter#10",
+          "pinName": "O29"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O2"
+          "compName": "Am2904#0",
+          "pinName": "_CEM"
          },
-        "name": "unnamedWire#256",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#36",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "Splitter#45",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#257",
-        "path": []
+        "name": "unnamedWire#164",
+        "path": [
+          {
+            "x": 635.0,
+            "y": 780.0
+          },
+          {
+            "x": 505.0,
+            "y": 780.0
+          },
+          {
+            "x": 505.0,
+            "y": 400.0
+          },
+          {
+            "x": 555.0,
+            "y": 400.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#45",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O30"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "O0"
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
          },
-        "name": "unnamedWire#258",
-        "path": []
+        "name": "unnamedWire#165",
+        "path": [
+          {
+            "x": 645.0,
+            "y": 775.0
+          },
+          {
+            "x": 500.0,
+            "y": 775.0
+          },
+          {
+            "x": 500.0,
+            "y": 395.0
+          },
+          {
+            "x": 595.0,
+            "y": 395.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#38",
-          "pinName": "O3"
+          "compName": "Splitter#14",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O15"
+          "compName": "Splitter#10",
+          "pinName": "O23"
          },
-        "name": "unnamedWire#259",
+        "name": "unnamedWire#166",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "C"
+          "compName": "Splitter#10",
+          "pinName": "O25"
          },
-        "name": "unnamedWire#26",
-        "path": [
-          {
-            "x": 1090.0,
-            "y": 395.0
-          },
-          {
-            "x": 1090.0,
-            "y": 495.0
-          }
-        ]
+        "name": "unnamedWire#167",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O14"
+          "compName": "Splitter#14",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#38",
-          "pinName": "O2"
+          "compName": "Splitter#10",
+          "pinName": "O24"
          },
-        "name": "unnamedWire#260",
+        "name": "unnamedWire#168",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#38",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O26"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O13"
+          "compName": "Splitter#14",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#261",
+        "name": "unnamedWire#169",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O12"
+          "compName": "Splitter#14",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#38",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O27"
          },
-        "name": "unnamedWire#262",
+        "name": "unnamedWire#170",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#39",
-          "pinName": "O3"
+          "compName": "Splitter#10",
+          "pinName": "O28"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O11"
+          "compName": "Splitter#14",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#263",
+        "name": "unnamedWire#171",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O10"
+          "compName": "Splitter#16",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#39",
-          "pinName": "O2"
+          "compName": "Splitter#10",
+          "pinName": "O31"
          },
-        "name": "unnamedWire#264",
+        "name": "unnamedWire#172",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#39",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O32"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O9"
+          "compName": "Splitter#16",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#265",
+        "name": "unnamedWire#173",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O8"
+          "compName": "Splitter#16",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#39",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O33"
          },
-        "name": "unnamedWire#266",
+        "name": "unnamedWire#174",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#40",
-          "pinName": "O3"
+          "compName": "Splitter#10",
+          "pinName": "O34"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O7"
+          "compName": "Splitter#16",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#267",
+        "name": "unnamedWire#175",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O6"
+          "compName": "Splitter#15",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#40",
-          "pinName": "O2"
+          "compName": "Splitter#10",
+          "pinName": "O35"
          },
-        "name": "unnamedWire#268",
+        "name": "unnamedWire#176",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#40",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O36"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O5"
+          "compName": "Splitter#15",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#269",
+        "name": "unnamedWire#177",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#2",
-          "pinName": "C"
+          "compName": "Splitter#17",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "I"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#178",
          "path": [
            {
-            "x": 965.0,
-            "y": 495.0
+            "x": 755.0,
+            "y": 785.0
+          },
+          {
+            "x": 600.0,
+            "y": 785.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O4"
+          "compName": "Splitter#16",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#40",
-          "pinName": "O0"
+          "compName": "Splitter#18",
+          "pinName": "I"
          },
-        "name": "unnamedWire#270",
-        "path": []
+        "name": "unnamedWire#179",
+        "path": [
+          {
+            "x": 670.0,
+            "y": 790.0
+          },
+          {
+            "x": 705.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#41",
-          "pinName": "O3"
+          "compName": "Splitter#19",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#37",
-          "pinName": "O3"
+          "compName": "Splitter#15",
+          "pinName": "I"
          },
-        "name": "unnamedWire#271",
-        "path": []
+        "name": "unnamedWire#180",
+        "path": [
+          {
+            "x": 665.0,
+            "y": 800.0
+          },
+          {
+            "x": 700.0,
+            "y": 800.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O2"
+          "compName": "Splitter#17",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#41",
-          "pinName": "O2"
+          "compName": "Splitter#13",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#272",
+        "name": "unnamedWire#181",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#17",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#13",
            "pinName": "O1"
          },
-        "name": "unnamedWire#273",
+        "name": "unnamedWire#182",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "O0"
+          "compName": "Splitter#13",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#41",
-          "pinName": "O0"
+          "compName": "Splitter#17",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#274",
+        "name": "unnamedWire#183",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_16#1",
-          "pinName": "Y"
+          "compName": "Splitter#17",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#36",
-          "pinName": "I"
+          "compName": "Splitter#13",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#275",
-        "path": [
-          {
-            "x": 970.0,
-            "y": 265.0
-          }
-        ]
+        "name": "unnamedWire#184",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_16#1",
-          "pinName": "S"
+          "compName": "Splitter#13",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O74"
+          "compName": "Splitter#17",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#276",
-        "path": [
-          {
-            "x": 905.0,
-            "y": 220.0
-          },
-          {
-            "x": 905.0,
-            "y": 210.0
-          },
-          {
-            "x": 1230.0,
-            "y": 210.0
-          },
-          {
-            "x": 1230.0,
-            "y": 760.0
-          },
-          {
-            "x": 1085.0,
-            "y": 760.0
-          }
-        ]
+        "name": "unnamedWire#185",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#26",
-          "pinName": "I"
+          "compName": "Splitter#17",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "mux1_16#1",
-          "pinName": "I0"
+          "compName": "Splitter#13",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#277",
-        "path": [
-          {
-            "x": 1000.0,
-            "y": 740.0
-          },
-          {
-            "x": 1235.0,
-            "y": 740.0
-          },
-          {
-            "x": 1235.0,
-            "y": 205.0
-          },
-          {
-            "x": 900.0,
-            "y": 205.0
-          },
-          {
-            "x": 900.0,
-            "y": 240.0
-          }
-        ]
+        "name": "unnamedWire#186",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#37",
-          "pinName": "I"
+          "compName": "Splitter#18",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "Splitter#13",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#278",
-        "path": [
-          {
-            "x": 970.0,
-            "y": 600.0
-          }
-        ]
+        "name": "unnamedWire#187",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "Splitter#13",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "IN"
+          "compName": "Splitter#18",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#279",
+        "name": "unnamedWire#188",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#13",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#189",
          "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "IN"
+          "compName": "Splitter#13",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#280",
-        "path": [
-          {
-            "x": 985.0,
-            "y": 625.0
-          }
-        ]
+        "name": "unnamedWire#190",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Splitter#19",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "IN"
+          "compName": "Splitter#13",
+          "pinName": "O11"
          },
-        "name": "unnamedWire#281",
+        "name": "unnamedWire#191",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Splitter#13",
+          "pinName": "O12"
          },
          "pin2": {
-          "compName": "mux1_16#0",
-          "pinName": "I1"
+          "compName": "Splitter#19",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#282",
-        "path": [
-          {
-            "x": 420.0,
-            "y": 95.0
-          },
-          {
-            "x": 245.0,
-            "y": 95.0
-          },
-          {
-            "x": 245.0,
-            "y": 200.0
-          }
-        ]
+        "name": "unnamedWire#192",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O73"
          },
-        "name": "unnamedWire#283",
+        "name": "unnamedWire#193",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O72"
          },
          "pin2": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#284",
+        "name": "unnamedWire#194",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O71"
          },
-        "name": "unnamedWire#285",
+        "name": "unnamedWire#195",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O70"
          },
          "pin2": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#286",
+        "name": "unnamedWire#196",
          "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "OUT"
+          "compName": "Splitter#20",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O69"
          },
-        "name": "unnamedWire#287",
-        "path": [
-          {
-            "x": 450.0,
-            "y": 130.0
-          }
-        ]
+        "name": "unnamedWire#197",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O68"
          },
          "pin2": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "OUT"
+          "compName": "Splitter#20",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#288",
-        "path": [
-          {
-            "x": 455.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#198",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "dff16_invwe#0",
-          "pinName": "D"
+          "compName": "Splitter#10",
+          "pinName": "O67"
          },
-        "name": "unnamedWire#289",
-        "path": [
-          {
-            "x": 475.0,
-            "y": 190.0
-          }
-        ]
+        "name": "unnamedWire#199",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#1",
-          "pinName": "C"
+          "compName": "Splitter#10",
+          "pinName": "O66"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#29",
-        "path": [
-          {
-            "x": 840.0,
-            "y": 495.0
-          }
-        ]
+        "name": "unnamedWire#200",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#46",
-          "pinName": "O1"
+          "compName": "Splitter#20",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O65"
          },
-        "name": "unnamedWire#290",
+        "name": "unnamedWire#201",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O1"
+          "compName": "Splitter#10",
+          "pinName": "O64"
          },
          "pin2": {
-          "compName": "dff16_invwe#0",
-          "pinName": "_WE"
+          "compName": "Splitter#20",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#291",
-        "path": [
-          {
-            "x": 355.0,
-            "y": 265.0
-          },
-          {
-            "x": 480.0,
-            "y": 265.0
-          },
-          {
-            "x": 480.0,
-            "y": 185.0
-          }
-        ]
+        "name": "unnamedWire#202",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
+          "compName": "Splitter#10",
+          "pinName": "O63"
          },
-        "name": "unnamedWire#292",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 400.0
-          }
-        ]
+        "name": "unnamedWire#203",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O62"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "Splitter#20",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#293",
+        "name": "unnamedWire#204",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#10",
+          "pinName": "O61"
+        },
+        "name": "unnamedWire#205",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#10",
+          "pinName": "O60"
+        },
+        "pin2": {
+          "compName": "Splitter#20",
            "pinName": "O2"
          },
-        "name": "unnamedWire#294",
+        "name": "unnamedWire#206",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "Splitter#10",
+          "pinName": "O59"
          },
-        "name": "unnamedWire#295",
+        "name": "unnamedWire#207",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#10",
+          "pinName": "O58"
+        },
+        "pin2": {
+          "compName": "Splitter#20",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#208",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#21",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O4"
+          "compName": "Splitter#10",
+          "pinName": "O57"
          },
-        "name": "unnamedWire#296",
+        "name": "unnamedWire#209",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O3"
+          "compName": "Splitter#10",
+          "pinName": "O56"
          },
          "pin2": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#21",
            "pinName": "O1"
          },
-        "name": "unnamedWire#297",
+        "name": "unnamedWire#210",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#21",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
+          "pinName": "O55"
+        },
+        "name": "unnamedWire#211",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#10",
+          "pinName": "O54"
+        },
+        "pin2": {
+          "compName": "Splitter#22",
            "pinName": "O2"
          },
-        "name": "unnamedWire#298",
+        "name": "unnamedWire#212",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O7"
+          "compName": "Splitter#22",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O11"
+          "compName": "Splitter#10",
+          "pinName": "O53"
          },
-        "name": "unnamedWire#299",
+        "name": "unnamedWire#213",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#1",
-          "pinName": "Qn+3"
+          "compName": "Splitter#10",
+          "pinName": "O52"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "Qn"
+          "compName": "Splitter#22",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 960.0,
-            "y": 515.0
-          },
-          {
-            "x": 960.0,
-            "y": 420.0
-          }
-        ]
+        "name": "unnamedWire#214",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#23",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O51"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#215",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O6"
+          "compName": "Splitter#10",
+          "pinName": "O50"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O10"
+          "compName": "Splitter#23",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#300",
+        "name": "unnamedWire#216",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O5"
+          "compName": "Splitter#23",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O9"
+          "compName": "Splitter#10",
+          "pinName": "O49"
          },
-        "name": "unnamedWire#301",
+        "name": "unnamedWire#217",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#24",
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_1"
+          "compName": "Splitter#10",
+          "pinName": "O48"
          },
-        "name": "unnamedWire#302",
+        "name": "unnamedWire#218",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
+          "compName": "Splitter#10",
+          "pinName": "O47"
          },
          "pin2": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#24",
            "pinName": "O2"
          },
-        "name": "unnamedWire#303",
+        "name": "unnamedWire#219",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#24",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
+          "compName": "Splitter#10",
+          "pinName": "O46"
          },
-        "name": "unnamedWire#304",
+        "name": "unnamedWire#220",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_4"
+          "compName": "Splitter#10",
+          "pinName": "O45"
          },
          "pin2": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#24",
            "pinName": "O0"
          },
-        "name": "unnamedWire#305",
+        "name": "unnamedWire#221",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#49",
-          "pinName": "O3"
+          "compName": "Splitter#25",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_1"
+          "compName": "Splitter#10",
+          "pinName": "O40"
          },
-        "name": "unnamedWire#306",
+        "name": "unnamedWire#222",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_2"
+          "compName": "Splitter#10",
+          "pinName": "O41"
          },
          "pin2": {
-          "compName": "Splitter#49",
-          "pinName": "O2"
+          "compName": "Splitter#25",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#307",
+        "name": "unnamedWire#223",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#49",
-          "pinName": "O1"
+          "compName": "Splitter#25",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_3"
+          "compName": "Splitter#10",
+          "pinName": "O42"
          },
-        "name": "unnamedWire#308",
+        "name": "unnamedWire#224",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_4"
+          "compName": "Splitter#10",
+          "pinName": "O43"
          },
          "pin2": {
-          "compName": "Splitter#49",
-          "pinName": "O0"
+          "compName": "Splitter#25",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#309",
+        "name": "unnamedWire#225",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#0",
-          "pinName": "C"
+          "compName": "Splitter#13",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#226",
          "path": [
            {
-            "x": 715.0,
-            "y": 495.0
+            "x": 680.0,
+            "y": 795.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#27",
            "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#23",
            "pinName": "I"
          },
-        "name": "unnamedWire#310",
-        "path": [
-          {
-            "x": 600.0,
-            "y": 215.0
-          },
-          {
-            "x": 600.0,
-            "y": 335.0
-          },
-          {
-            "x": 690.0,
-            "y": 335.0
-          },
-          {
-            "x": 690.0,
-            "y": 675.0
-          },
-          {
-            "x": 810.0,
-            "y": 675.0
-          }
-        ]
+        "name": "unnamedWire#227",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#28",
            "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#22",
            "pinName": "I"
          },
-        "name": "unnamedWire#311",
-        "path": [
-          {
-            "x": 760.0,
-            "y": 785.0
-          },
-          {
-            "x": 800.0,
-            "y": 785.0
-          },
-          {
-            "x": 800.0,
-            "y": 685.0
-          },
-          {
-            "x": 700.0,
-            "y": 685.0
-          },
-          {
-            "x": 700.0,
-            "y": 345.0
-          },
-          {
-            "x": 610.0,
-            "y": 345.0
-          },
-          {
-            "x": 610.0,
-            "y": 310.0
-          }
-        ]
+        "name": "unnamedWire#228",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
+          "compName": "Splitter#26",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O44"
+          "compName": "Splitter#21",
+          "pinName": "I"
          },
-        "name": "unnamedWire#312",
+        "name": "unnamedWire#229",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "Splitter#26",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#230",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#26",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "Splitter#29",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#231",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "Splitter#26",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#232",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#28",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "Splitter#29",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#233",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O4"
+        },
+        "pin2": {
+          "compName": "Splitter#28",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#234",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O5"
+        },
+        "pin2": {
+          "compName": "Splitter#28",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#235",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "Splitter#27",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#236",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#27",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "name": "unnamedWire#237",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#29",
+          "pinName": "O8"
+        },
+        "pin2": {
+          "compName": "Splitter#27",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#238",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#29",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#239",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#13",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#240",
          "path": [
            {
-            "x": 605.0,
-            "y": 150.0
-          },
-          {
-            "x": 605.0,
-            "y": 340.0
-          },
-          {
-            "x": 695.0,
-            "y": 340.0
-          },
-          {
-            "x": 695.0,
-            "y": 680.0
-          },
-          {
-            "x": 805.0,
-            "y": 680.0
+            "x": 720.0,
+            "y": 730.0
            },
            {
-            "x": 805.0,
-            "y": 800.0
+            "x": 545.0,
+            "y": 730.0
            },
            {
-            "x": 785.0,
-            "y": 800.0
+            "x": 545.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "S0"
+          "compName": "Am2900MainMemory#0",
+          "pinName": "RW"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O39"
+          "compName": "Splitter#10",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#313",
+        "name": "unnamedWire#241",
          "path": [
            {
-            "x": 615.0,
-            "y": 245.0
-          },
-          {
-            "x": 615.0,
-            "y": 350.0
-          },
-          {
-            "x": 705.0,
-            "y": 350.0
-          },
-          {
-            "x": 705.0,
-            "y": 690.0
-          },
-          {
-            "x": 795.0,
-            "y": 690.0
+            "x": 175.0,
+            "y": 100.0
            },
            {
-            "x": 795.0,
-            "y": 790.0
+            "x": 175.0,
+            "y": 265.0
            },
            {
-            "x": 735.0,
-            "y": 790.0
+            "x": 345.0,
+            "y": 265.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#3",
            "pinName": "I"
          },
-        "name": "unnamedWire#314",
+        "name": "unnamedWire#242",
          "path": [
            {
-            "x": 820.0,
-            "y": 735.0
+            "x": 590.0,
+            "y": 150.0
            },
            {
-            "x": 875.0,
-            "y": 735.0
+            "x": 590.0,
+            "y": 335.0
+          },
+          {
+            "x": 240.0,
+            "y": 335.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "Splitter#30",
+          "pinName": "O15"
+        },
+        "pin2": {
+          "compName": "Splitter#36",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#243",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#36",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "Splitter#30",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#315",
+        "name": "unnamedWire#244",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "Splitter#30",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#36",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#316",
+        "name": "unnamedWire#245",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "Splitter#36",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2901#0",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#317",
-        "path": [
-          {
-            "x": 820.0,
-            "y": 480.0
-          }
-        ]
+        "name": "unnamedWire#246",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "Splitter#30",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "I"
+          "compName": "Splitter#37",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#318",
-        "path": [
-          {
-            "x": 945.0,
-            "y": 480.0
-          }
-        ]
+        "name": "unnamedWire#247",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#37",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#319",
-        "path": [
-          {
-            "x": 1070.0,
-            "y": 480.0
-          }
-        ]
+        "name": "unnamedWire#248",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#30",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#37",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#32",
-        "path": [
-          {
-            "x": 715.0,
-            "y": 365.0
-          }
-        ]
+        "name": "unnamedWire#249",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#37",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#320",
-        "path": [
-          {
-            "x": 1205.0,
-            "y": 530.0
-          },
-          {
-            "x": 1205.0,
-            "y": 480.0
-          }
-        ]
+        "name": "unnamedWire#250",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#38",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "Y"
+          "compName": "Splitter#38",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#321",
-        "path": [
-          {
-            "x": 910.0,
-            "y": 545.0
-          },
-          {
-            "x": 1185.0,
-            "y": 545.0
-          }
-        ]
+        "name": "unnamedWire#251",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#39",
-          "pinName": "I"
+          "compName": "Splitter#38",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "Y"
+          "compName": "Splitter#30",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#322",
-        "path": [
-          {
-            "x": 950.0,
-            "y": 550.0
-          },
-          {
-            "x": 1050.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#252",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#40",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "Y"
+          "compName": "Splitter#38",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#323",
-        "path": [
-          {
-            "x": 990.0,
-            "y": 555.0
-          },
-          {
-            "x": 925.0,
-            "y": 555.0
-          }
-        ]
+        "name": "unnamedWire#253",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "Y"
+          "compName": "Splitter#38",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#41",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#324",
-        "path": [
-          {
-            "x": 800.0,
-            "y": 560.0
-          },
-          {
-            "x": 1030.0,
-            "y": 560.0
-          }
-        ]
+        "name": "unnamedWire#254",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "D"
+          "compName": "Splitter#30",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#45",
-          "pinName": "I"
+          "compName": "Splitter#39",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#325",
-        "path": [
-          {
-            "x": 785.0,
-            "y": 375.0
-          },
-          {
-            "x": 1030.0,
-            "y": 375.0
-          }
-        ]
+        "name": "unnamedWire#255",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#44",
-          "pinName": "I"
+          "compName": "Splitter#39",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "D"
+          "compName": "Splitter#30",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#326",
-        "path": [
-          {
-            "x": 990.0,
-            "y": 370.0
-          },
-          {
-            "x": 910.0,
-            "y": 370.0
-          }
-        ]
+        "name": "unnamedWire#256",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#43",
-          "pinName": "I"
+          "compName": "Splitter#30",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "D"
+          "compName": "Splitter#39",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#327",
-        "path": [
-          {
-            "x": 950.0,
-            "y": 365.0
-          },
-          {
-            "x": 1035.0,
-            "y": 365.0
-          }
-        ]
+        "name": "unnamedWire#257",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#42",
-          "pinName": "I"
+          "compName": "Splitter#39",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "D"
+          "compName": "Splitter#30",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#328",
-        "path": [
-          {
-            "x": 910.0,
-            "y": 360.0
-          },
-          {
-            "x": 1170.0,
-            "y": 360.0
-          }
-        ]
+        "name": "unnamedWire#258",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "Splitter#32",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O15"
          },
-        "name": "unnamedWire#329",
+        "name": "unnamedWire#259",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "Cn"
+          "compName": "Splitter#31",
+          "pinName": "O14"
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "C0"
+          "compName": "Splitter#32",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#33",
-        "path": [
-          {
-            "x": 675.0,
-            "y": 505.0
-          },
-          {
-            "x": 675.0,
-            "y": 490.0
-          }
-        ]
+        "name": "unnamedWire#260",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "Splitter#32",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "BitDisplay#1",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O13"
          },
-        "name": "unnamedWire#330",
+        "name": "unnamedWire#261",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O4"
+          "compName": "Splitter#31",
+          "pinName": "O12"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O8"
+          "compName": "Splitter#32",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#331",
+        "name": "unnamedWire#262",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Splitter#33",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "mux1_16#0",
-          "pinName": "I0"
+          "compName": "Splitter#31",
+          "pinName": "O11"
          },
-        "name": "unnamedWire#332",
-        "path": [
-          {
-            "x": 250.0,
-            "y": 135.0
-          }
-        ]
+        "name": "unnamedWire#263",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O10"
          },
          "pin2": {
-          "compName": "BitDisplay#2",
-          "pinName": ""
+          "compName": "Splitter#33",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#333",
+        "name": "unnamedWire#264",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "Splitter#33",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O9"
          },
-        "name": "unnamedWire#334",
-        "path": [
-          {
-            "x": 340.0,
-            "y": 225.0
-          }
-        ]
+        "name": "unnamedWire#265",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "B"
+          "compName": "Splitter#33",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#335",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 230.0
-          },
-          {
-            "x": 185.0,
-            "y": 115.0
-          }
-        ]
+        "name": "unnamedWire#266",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "Splitter#34",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#336",
+        "name": "unnamedWire#267",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "Splitter#31",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O7"
+          "compName": "Splitter#34",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#337",
+        "name": "unnamedWire#268",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "Splitter#34",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#338",
+        "name": "unnamedWire#269",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "Splitter#31",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#34",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#339",
+        "name": "unnamedWire#270",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "Splitter#35",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "C"
+          "compName": "Splitter#31",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#271",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#31",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O6"
+          "compName": "Splitter#35",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#340",
+        "name": "unnamedWire#272",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#35",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O5"
+          "compName": "Splitter#31",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#341",
+        "name": "unnamedWire#273",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#31",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O4"
+          "compName": "Splitter#35",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#342",
+        "name": "unnamedWire#274",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "mux1_16#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#30",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#275",
+        "path": [
+          {
+            "x": 970.0,
+            "y": 265.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux1_16#1",
+          "pinName": "S"
+        },
+        "pin2": {
+          "compName": "Splitter#10",
+          "pinName": "O74"
+        },
+        "name": "unnamedWire#276",
+        "path": [
+          {
+            "x": 905.0,
+            "y": 220.0
+          },
+          {
+            "x": 905.0,
+            "y": 210.0
+          },
+          {
+            "x": 1230.0,
+            "y": 210.0
+          },
+          {
+            "x": 1230.0,
+            "y": 760.0
+          },
+          {
+            "x": 1085.0,
+            "y": 760.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#20",
            "pinName": "I"
          },
          "pin2": {
-          "compName": "mux1_12#0",
+          "compName": "mux1_16#1",
            "pinName": "I0"
          },
-        "name": "unnamedWire#343",
+        "name": "unnamedWire#277",
          "path": [
            {
-            "x": 260.0,
-            "y": 440.0
+            "x": 1000.0,
+            "y": 740.0
+          },
+          {
+            "x": 1235.0,
+            "y": 740.0
+          },
+          {
+            "x": 1235.0,
+            "y": 205.0
+          },
+          {
+            "x": 900.0,
+            "y": 205.0
+          },
+          {
+            "x": 900.0,
+            "y": 240.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "EN"
+          "compName": "Splitter#31",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
-        "name": "unnamedWire#344",
+        "name": "unnamedWire#278",
          "path": [
            {
-            "x": 215.0,
-            "y": 110.0
+            "x": 970.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O38"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "TriStateBuffer#0",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#345",
-        "path": [
-          {
-            "x": 725.0,
-            "y": 805.0
-          },
-          {
-            "x": 825.0,
-            "y": 805.0
-          }
-        ]
+        "name": "unnamedWire#279",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "TriStateBuffer#1",
+          "pinName": "IN"
          },
          "pin2": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
-        "name": "unnamedWire#346",
+        "name": "unnamedWire#280",
          "path": [
            {
-            "x": 175.0,
-            "y": 290.0
+            "x": 985.0,
+            "y": 625.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff16#0",
-          "pinName": "C"
+          "compName": "TriStateBuffer#2",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#347",
-        "path": [
-          {
-            "x": 365.0,
-            "y": 110.0
-          }
-        ]
+        "name": "unnamedWire#281",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff16_invwe#0",
-          "pinName": "C"
+          "compName": "mux1_16#0",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#348",
+        "name": "unnamedWire#282",
          "path": [
            {
-            "x": 485.0,
-            "y": 290.0
+            "x": 420.0,
+            "y": 95.0
            },
            {
-            "x": 485.0,
-            "y": 170.0
+            "x": 245.0,
+            "y": 95.0
+          },
+          {
+            "x": 245.0,
+            "y": 200.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
-        "name": "unnamedWire#349",
-        "path": [
-          {
-            "x": 440.0,
-            "y": 565.0
-          }
-        ]
+        "name": "unnamedWire#283",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "FixedOutput#1",
-          "pinName": "out"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_OECT"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
-        "name": "unnamedWire#35",
-        "path": [
-          {
-            "x": 660.0,
-            "y": 390.0
-          }
-        ]
+        "name": "unnamedWire#284",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "BitDisplay#0",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
-        "name": "unnamedWire#350",
+        "name": "unnamedWire#285",
          "path": []
        },
        {
          "pin1": {
-          "compName": "FixedOutput#2",
-          "pinName": "out"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "_RLD"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#286",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2910#0",
-          "pinName": "CI"
+          "compName": "TriStateBuffer#2",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "FixedOutput#3",
-          "pinName": "out"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#287",
          "path": [
            {
-            "x": 480.0,
-            "y": 540.0
-          },
-          {
-            "x": 480.0,
-            "y": 570.0
+            "x": 450.0,
+            "y": 130.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2910#0",
-          "pinName": "_OE"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "FixedOutput#4",
-          "pinName": "out"
+          "compName": "TriStateBuffer#3",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#288",
          "path": [
            {
-            "x": 445.0,
-            "y": 580.0
+            "x": 455.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "FixedOutput#5",
-          "pinName": "out"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_SE"
-        },
-        "name": "unnamedWire#39",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2901#2",
-          "pinName": "RAMn"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "RAMn+3"
+          "compName": "dff16_invwe#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#289",
          "path": [
            {
-            "x": 955.0,
-            "y": 410.0
-          },
-          {
-            "x": 955.0,
-            "y": 510.0
+            "x": 475.0,
+            "y": 190.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "FixedOutput#6",
-          "pinName": "out"
+          "compName": "Splitter#40",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
-        "name": "unnamedWire#40",
-        "path": [
-          {
-            "x": 560.0,
-            "y": 380.0
-          }
-        ]
+        "name": "unnamedWire#290",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EZ"
+          "compName": "Splitter#10",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "dff16_invwe#0",
+          "pinName": "_WE"
          },
-        "name": "unnamedWire#41",
-        "path": []
+        "name": "unnamedWire#291",
+        "path": [
+          {
+            "x": 355.0,
+            "y": 265.0
+          },
+          {
+            "x": 480.0,
+            "y": 265.0
+          },
+          {
+            "x": 480.0,
+            "y": 185.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#35",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EOVR"
+          "compName": "Splitter#4",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#292",
          "path": [
            {
-            "x": 575.0,
+            "x": 315.0,
              "y": 400.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#35",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EC"
+          "compName": "Splitter#4",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#293",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#34",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EN"
+          "compName": "Splitter#4",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#294",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff16_invwe#0",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "Splitter#4",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#295",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O15"
+          "compName": "Splitter#42",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O7"
+          "compName": "Splitter#10",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#296",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O6"
+          "compName": "Splitter#10",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O14"
+          "compName": "Splitter#42",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#297",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O13"
+          "compName": "Splitter#42",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O5"
+          "compName": "Splitter#10",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#298",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O4"
+          "compName": "Splitter#3",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O12"
+          "compName": "Splitter#4",
+          "pinName": "O11"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#299",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#3",
-          "pinName": "RAMn"
+          "compName": "Splitter#3",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "RAMn+3"
+          "compName": "Splitter#4",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 1080.0,
-            "y": 410.0
-          },
-          {
-            "x": 1080.0,
-            "y": 510.0
-          }
-        ]
+        "name": "unnamedWire#300",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
+          "compName": "Splitter#3",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#4",
+          "pinName": "O9"
+        },
+        "name": "unnamedWire#301",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#41",
            "pinName": "O3"
          },
-        "name": "unnamedWire#50",
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_1"
+        },
+        "name": "unnamedWire#302",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
+          "compName": "mux1_4#0",
+          "pinName": "I1_2"
          },
          "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#41",
            "pinName": "O2"
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#303",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#41",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
+          "compName": "mux1_4#0",
+          "pinName": "I1_3"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#304",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
+          "compName": "mux1_4#0",
+          "pinName": "I1_4"
          },
          "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#41",
            "pinName": "O0"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#305",
          "path": []
        },
        {
          "pin1": {
-          "compName": "FixedOutput#0",
-          "pinName": "out"
+          "compName": "Splitter#43",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "I1_1"
          },
-        "name": "unnamedWire#54",
-        "path": [
-          {
-            "x": 570.0,
-            "y": 280.0
-          }
-        ]
+        "name": "unnamedWire#306",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "I1_2"
          },
          "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O3"
+          "compName": "Splitter#43",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#55",
-        "path": [
-          {
-            "x": 570.0,
-            "y": 195.0
-          }
-        ]
+        "name": "unnamedWire#307",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#43",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#13",
-          "pinName": "O3"
+          "compName": "mux1_4#1",
+          "pinName": "I1_3"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#308",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O2"
+          "compName": "mux1_4#1",
+          "pinName": "I1_4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
+          "compName": "Splitter#43",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#309",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "Splitter#41",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#13",
-          "pinName": "O1"
+          "compName": "Splitter#24",
+          "pinName": "I"
          },
-        "name": "unnamedWire#58",
-        "path": []
+        "name": "unnamedWire#310",
+        "path": [
+          {
+            "x": 600.0,
+            "y": 215.0
+          },
+          {
+            "x": 600.0,
+            "y": 335.0
+          },
+          {
+            "x": 690.0,
+            "y": 335.0
+          },
+          {
+            "x": 690.0,
+            "y": 675.0
+          },
+          {
+            "x": 810.0,
+            "y": 675.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O0"
+          "compName": "Splitter#25",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "compName": "Splitter#43",
+          "pinName": "I"
          },
-        "name": "unnamedWire#59",
-        "path": []
+        "name": "unnamedWire#311",
+        "path": [
+          {
+            "x": 760.0,
+            "y": 785.0
+          },
+          {
+            "x": 800.0,
+            "y": 785.0
+          },
+          {
+            "x": 800.0,
+            "y": 685.0
+          },
+          {
+            "x": 700.0,
+            "y": 685.0
+          },
+          {
+            "x": 700.0,
+            "y": 345.0
+          },
+          {
+            "x": 610.0,
+            "y": 345.0
+          },
+          {
+            "x": 610.0,
+            "y": 310.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#2",
-          "pinName": "Qn+3"
+          "compName": "mux1_4#0",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "Qn"
+          "compName": "Splitter#10",
+          "pinName": "O44"
          },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#312",
          "path": [
            {
-            "x": 1085.0,
-            "y": 515.0
+            "x": 605.0,
+            "y": 150.0
            },
            {
-            "x": 1085.0,
-            "y": 420.0
+            "x": 605.0,
+            "y": 340.0
+          },
+          {
+            "x": 695.0,
+            "y": 340.0
+          },
+          {
+            "x": 695.0,
+            "y": 680.0
+          },
+          {
+            "x": 805.0,
+            "y": 680.0
+          },
+          {
+            "x": 805.0,
+            "y": 800.0
+          },
+          {
+            "x": 785.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#60",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O5"
-        },
-        "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#61",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O2"
+          "compName": "mux1_4#1",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
+          "compName": "Splitter#10",
+          "pinName": "O39"
          },
-        "name": "unnamedWire#62",
-        "path": []
+        "name": "unnamedWire#313",
+        "path": [
+          {
+            "x": 615.0,
+            "y": 245.0
+          },
+          {
+            "x": 615.0,
+            "y": 350.0
+          },
+          {
+            "x": 705.0,
+            "y": 350.0
+          },
+          {
+            "x": 705.0,
+            "y": 690.0
+          },
+          {
+            "x": 795.0,
+            "y": 690.0
+          },
+          {
+            "x": 795.0,
+            "y": 790.0
+          },
+          {
+            "x": 735.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_1"
+          "compName": "Splitter#29",
+          "pinName": "I"
          },
-        "name": "unnamedWire#63",
-        "path": []
+        "name": "unnamedWire#314",
+        "path": [
+          {
+            "x": 820.0,
+            "y": 735.0
+          },
+          {
+            "x": 875.0,
+            "y": 735.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_2"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#315",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_3"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#316",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_4"
+          "compName": "Am2901#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#66",
-        "path": []
+        "name": "unnamedWire#317",
+        "path": [
+          {
+            "x": 820.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_1"
+          "compName": "Am2901#1",
+          "pinName": "I"
          },
-        "name": "unnamedWire#67",
-        "path": []
+        "name": "unnamedWire#318",
+        "path": [
+          {
+            "x": 945.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_2"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
+          "compName": "Am2901#2",
+          "pinName": "I"
          },
-        "name": "unnamedWire#68",
-        "path": []
+        "name": "unnamedWire#319",
+        "path": [
+          {
+            "x": 1070.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_3"
+          "compName": "Am2901#3",
+          "pinName": "I"
          },
-        "name": "unnamedWire#69",
-        "path": []
+        "name": "unnamedWire#320",
+        "path": [
+          {
+            "x": 1205.0,
+            "y": 530.0
+          },
+          {
+            "x": 1205.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2901#0",
-          "pinName": "Qn"
+          "compName": "Splitter#32",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "QIO0"
+          "compName": "Am2901#3",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#321",
          "path": [
            {
-            "x": 685.0,
-            "y": 420.0
+            "x": 910.0,
+            "y": 545.0
            },
            {
-            "x": 685.0,
-            "y": 530.0
+            "x": 1185.0,
+            "y": 545.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "Splitter#33",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_4"
+          "compName": "Am2901#2",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#70",
-        "path": []
+        "name": "unnamedWire#322",
+        "path": [
+          {
+            "x": 950.0,
+            "y": 550.0
+          },
+          {
+            "x": 1050.0,
+            "y": 550.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#34",
            "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "Am2901#1",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#323",
          "path": [
            {
-            "x": 610.0,
-            "y": 250.0
+            "x": 990.0,
+            "y": 555.0
            },
            {
-            "x": 610.0,
-            "y": 270.0
+            "x": 925.0,
+            "y": 555.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "I"
+          "compName": "Am2901#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#35",
            "pinName": "I"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#324",
          "path": [
            {
-            "x": 610.0,
-            "y": 210.0
+            "x": 800.0,
+            "y": 560.0
            },
            {
-            "x": 610.0,
-            "y": 175.0
+            "x": 1030.0,
+            "y": 560.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y1"
+          "compName": "Am2901#0",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O3"
+          "compName": "Splitter#39",
+          "pinName": "I"
          },
-        "name": "unnamedWire#73",
-        "path": []
+        "name": "unnamedWire#325",
+        "path": [
+          {
+            "x": 785.0,
+            "y": 375.0
+          },
+          {
+            "x": 1030.0,
+            "y": 375.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O2"
+          "compName": "Splitter#38",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y2"
+          "compName": "Am2901#1",
+          "pinName": "D"
          },
-        "name": "unnamedWire#74",
-        "path": []
+        "name": "unnamedWire#326",
+        "path": [
+          {
+            "x": 990.0,
+            "y": 370.0
+          },
+          {
+            "x": 910.0,
+            "y": 370.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y3"
+          "compName": "Splitter#37",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O1"
+          "compName": "Am2901#2",
+          "pinName": "D"
          },
-        "name": "unnamedWire#75",
-        "path": []
+        "name": "unnamedWire#327",
+        "path": [
+          {
+            "x": 950.0,
+            "y": 365.0
+          },
+          {
+            "x": 1035.0,
+            "y": 365.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O0"
+          "compName": "Splitter#36",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y4"
+          "compName": "Am2901#3",
+          "pinName": "D"
          },
-        "name": "unnamedWire#76",
-        "path": []
+        "name": "unnamedWire#328",
+        "path": [
+          {
+            "x": 910.0,
+            "y": 360.0
+          },
+          {
+            "x": 1170.0,
+            "y": 360.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#15",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#329",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "Y2"
+          "compName": "BitDisplay#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#330",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "Y3"
+          "compName": "Splitter#3",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#15",
-          "pinName": "O1"
+          "compName": "Splitter#4",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#331",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "SIO0"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#0",
-          "pinName": "RAMn"
+          "compName": "mux1_16#0",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#332",
          "path": [
            {
-            "x": 680.0,
-            "y": 525.0
-          },
-          {
-            "x": 680.0,
-            "y": 410.0
+            "x": 250.0,
+            "y": 135.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "Y4"
+          "compName": "BitDisplay#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#333",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#334",
          "path": [
            {
-            "x": 820.0,
-            "y": 415.0
+            "x": 340.0,
+            "y": 225.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#0",
+          "compName": "NandGate#5",
            "pinName": "B"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#335",
          "path": [
            {
-            "x": 825.0,
-            "y": 435.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#83",
-        "path": [
+            "x": 185.0,
+            "y": 230.0
+          },
            {
-            "x": 945.0,
-            "y": 415.0
+            "x": 185.0,
+            "y": 115.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#1",
-          "pinName": "B"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
-        "name": "unnamedWire#84",
-        "path": [
-          {
-            "x": 950.0,
-            "y": 435.0
-          }
-        ]
+        "name": "unnamedWire#336",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#3",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "A"
+          "compName": "Splitter#4",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#85",
-        "path": [
-          {
-            "x": 1070.0,
-            "y": 415.0
-          }
-        ]
+        "name": "unnamedWire#337",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
-        "name": "unnamedWire#86",
-        "path": [
-          {
-            "x": 1075.0,
-            "y": 435.0
-          }
-        ]
+        "name": "unnamedWire#338",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "A"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#87",
-        "path": [
-          {
-            "x": 1205.0,
-            "y": 385.0
-          },
-          {
-            "x": 1205.0,
-            "y": 415.0
-          }
-        ]
+        "name": "unnamedWire#339",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2901#3",
-          "pinName": "B"
+          "compName": "Splitter#3",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#88",
-        "path": [
-          {
-            "x": 1210.0,
-            "y": 435.0
-          },
-          {
-            "x": 1210.0,
-            "y": 390.0
-          }
-        ]
+        "name": "unnamedWire#340",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "Splitter#3",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#341",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "SIOn"
+          "compName": "Splitter#3",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2901#3",
-          "pinName": "RAMn+3"
+          "compName": "Splitter#4",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 535.0,
-            "y": 525.0
-          },
-          {
-            "x": 535.0,
-            "y": 655.0
-          },
-          {
-            "x": 1210.0,
-            "y": 655.0
-          },
-          {
-            "x": 1210.0,
-            "y": 510.0
-          }
-        ]
+        "name": "unnamedWire#342",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "OUT"
+          "compName": "mux1_12#0",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#343",
          "path": [
            {
-            "x": 1245.0,
-            "y": 60.0
-          },
-          {
-            "x": 1245.0,
-            "y": 625.0
+            "x": 260.0,
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "TriStateBuffer#4",
+          "pinName": "EN"
          },
          "pin2": {
-          "compName": "mux1_16#1",
-          "pinName": "I1"
+          "compName": "NandGate#5",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#344",
          "path": [
            {
-            "x": 895.0,
-            "y": 305.0
+            "x": 215.0,
+            "y": 110.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "O38"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#345",
          "path": [
            {
-            "x": 1240.0,
-            "y": 45.0
+            "x": 725.0,
+            "y": 805.0
            },
            {
-            "x": 1240.0,
-            "y": 600.0
+            "x": 825.0,
+            "y": 805.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#38",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#42",
            "pinName": ""
          },
-        "name": "unnamedWire#93",
-        "path": []
+        "name": "unnamedWire#346",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 290.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "@c",
+          "compName": "WireCrossPoint#42",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "dff16#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#94",
-        "path": []
+        "name": "unnamedWire#347",
+        "path": [
+          {
+            "x": 365.0,
+            "y": 110.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#42",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
+          "compName": "dff16_invwe#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#95",
-        "path": []
+        "name": "unnamedWire#348",
+        "path": [
+          {
+            "x": 485.0,
+            "y": 290.0
+          },
+          {
+            "x": 485.0,
+            "y": 170.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#43",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "B"
+          "compName": "Am2910#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#349",
          "path": [
            {
-            "x": 145.0,
-            "y": 390.0
+            "x": 440.0,
+            "y": 565.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#43",
            "pinName": ""
          },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#7",
-          "pinName": "Y"
-        },
          "pin2": {
-          "compName": "WireCrossPoint#38",
+          "compName": "BitDisplay#0",
            "pinName": ""
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#350",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch80#0",
-          "pinName": "E"
-        },
-        "name": "unnamedWire#99",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 485.0
-          },
-          {
-            "x": 230.0,
-            "y": 485.0
-          },
-          {
-            "x": 230.0,
-            "y": 680.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
@@ -6880,28 +6880,28 @@
    "highLevelStateHandlerSnippetID": "standard",
    "highLevelStateHandlerParams": {
      "subcomponentHighLevelStates": {
-      "am2901_11-8": {
+      "am2901_3-0": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "Am2901#1"
+          "delegateTarget": "Am2901#3"
          }
        },
-      "am2901_15-12": {
+      "am2901_7-4": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "Am2901#0"
+          "delegateTarget": "Am2901#2"
          }
        },
-      "am2901_3-0": {
+      "am2901_11-8": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "Am2901#3"
+          "delegateTarget": "Am2901#1"
          }
        },
-      "am2901_7-4": {
+      "am2901_15-12": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "Am2901#2"
+          "delegateTarget": "Am2901#0"
          }
        },
        "am2904": {
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json

index 7a0b4b2..8307be3 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json
@@ -89,7 +89,7 @@
            "compName": "_submodelinterface",
            "pinName": "_Q"
          },
-        "name": "_q",
+        "name": "unnamedWire#0",
          "path": []
        },
        {
@@ -101,7 +101,7 @@
            "compName": "_submodelinterface",
            "pinName": "Q"
          },
-        "name": "q",
+        "name": "unnamedWire#1",
          "path": [
            {
              "x": 35.0,
@@ -130,7 +130,7 @@
            "compName": "NandGate#0",
            "pinName": "A"
          },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#2",
          "path": []
        },
        {
@@ -142,7 +142,7 @@
            "compName": "NandGate#1",
            "pinName": "B"
          },
-        "name": "unnamedWire#1",
+        "name": "unnamedWire#3",
          "path": [
            {
              "x": 35.0,
@@ -163,7 +163,7 @@
            "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
@@ -175,7 +175,7 @@
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 65.0,
@@ -192,7 +192,7 @@
            "compName": "NandGate#1",
            "pinName": "A"
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#6",
          "path": []
        },
        {
@@ -204,7 +204,7 @@
            "compName": "NandGate#0",
            "pinName": "B"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 65.0,
@@ -240,10 +240,10 @@
          "id": "wireForcing",
          "params": {
            "wiresToForce": [
-            "q"
+            "unnamedWire#1"
            ],
            "wiresToForceInverted": [
-            "_q"
+            "unnamedWire#0"
            ]
          }
        }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json

index 270afa2..dc92688 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -201,7 +201,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#3",
+        "name": "Splitter#2",
          "pos": {
            "x": 670.0,
            "y": 135.0
@@ -213,7 +213,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#3",
          "pos": {
            "x": 670.0,
            "y": 335.0
@@ -225,7 +225,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#5",
+        "name": "Splitter#4",
          "pos": {
            "x": 475.0,
            "y": 615.0
@@ -301,6 +301,78 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 254.0,
+          "y": 749.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 134.0,
+          "y": 729.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 129.0,
+          "y": 739.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 124.0,
+          "y": 749.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 349.0,
+          "y": 364.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 344.0,
+          "y": 374.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 339.0,
+          "y": 384.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 334.0,
+          "y": 394.0
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#10",
@@ -391,15 +463,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 254.0,
-          "y": 749.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -490,15 +553,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 134.0,
-          "y": 729.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#30",
@@ -589,15 +643,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 129.0,
-          "y": 739.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#40",
@@ -661,51 +706,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 124.0,
-          "y": 749.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 349.0,
-          "y": 364.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 344.0,
-          "y": 374.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 339.0,
-          "y": 384.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 334.0,
-          "y": 394.0
-        },
-        "params": 1
-      },
        {
          "id": "and",
          "name": "and#0",
@@ -836,166 +836,211 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I4"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 15.0,
-            "y": 90.0
+            "x": 800.0,
+            "y": 800.0
            },
            {
-            "x": 460.0,
-            "y": 90.0
+            "x": 800.0,
+            "y": 610.0
+          },
+          {
+            "x": 575.0,
+            "y": 610.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F3"
+          "compName": "Splitter#0",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I3"
          },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 625.0,
-            "y": 645.0
-          },
-          {
-            "x": 625.0,
-            "y": 540.0
+            "x": 795.0,
+            "y": 810.0
            },
            {
-            "x": 390.0,
-            "y": 540.0
+            "x": 795.0,
+            "y": 605.0
            },
            {
-            "x": 390.0,
-            "y": 515.0
+            "x": 565.0,
+            "y": 605.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I2"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 395.0,
-            "y": 520.0
+            "x": 790.0,
+            "y": 820.0
+          },
+          {
+            "x": 790.0,
+            "y": 600.0
+          },
+          {
+            "x": 555.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#102",
-        "path": []
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 785.0,
+            "y": 830.0
+          },
+          {
+            "x": 785.0,
+            "y": 595.0
+          },
+          {
+            "x": 545.0,
+            "y": 595.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#103",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
-        },
-        "name": "unnamedWire#104",
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 780.0,
+            "y": 840.0
+          },
+          {
+            "x": 780.0,
+            "y": 590.0
+          },
+          {
+            "x": 535.0,
+            "y": 590.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#1",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "or4#0",
-          "pinName": "A1"
+          "compName": "mux1_4#0",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#106",
-        "path": []
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 755.0,
+            "y": 1225.0
+          },
+          {
+            "x": 745.0,
+            "y": 1225.0
+          },
+          {
+            "x": 745.0,
+            "y": 515.0
+          },
+          {
+            "x": 560.0,
+            "y": 515.0
+          },
+          {
+            "x": 560.0,
+            "y": 365.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "or4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#107",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "or4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#108",
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 950.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "or4#0",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#109",
-        "path": []
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 90.0
+          },
+          {
+            "x": 460.0,
+            "y": 90.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -1011,2963 +1056,2918 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_1"
+          "compName": "NandGate#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 355.0,
-            "y": 405.0
+            "x": 460.0,
+            "y": 205.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 360.0,
-            "y": 415.0
+            "x": 230.0,
+            "y": 715.0
+          },
+          {
+            "x": 230.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
+          "compName": "dlatch4#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 365.0,
-            "y": 425.0
+            "x": 715.0,
+            "y": 750.0
+          },
+          {
+            "x": 715.0,
+            "y": 215.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_4"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "I8"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 370.0,
-            "y": 435.0
+            "x": 835.0,
+            "y": 760.0
+          },
+          {
+            "x": 835.0,
+            "y": 315.0
+          },
+          {
+            "x": 365.0,
+            "y": 315.0
+          },
+          {
+            "x": 365.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "dlatch4#1",
+          "pinName": "C"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 105.0,
-            "y": 505.0
+            "x": 255.0,
+            "y": 735.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "dff4#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 110.0,
-            "y": 510.0
+            "x": 255.0,
+            "y": 900.0
+          },
+          {
+            "x": 195.0,
+            "y": 900.0
+          },
+          {
+            "x": 195.0,
+            "y": 970.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Am2901DestDecode#0",
+          "pinName": "LSH"
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 115.0,
-            "y": 515.0
+            "x": 420.0,
+            "y": 205.0
+          },
+          {
+            "x": 420.0,
+            "y": 240.0
+          },
+          {
+            "x": 135.0,
+            "y": 240.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "A1"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "NSH"
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 100.0,
-            "y": 960.0
+            "x": 425.0,
+            "y": 165.0
+          },
+          {
+            "x": 425.0,
+            "y": 235.0
+          },
+          {
+            "x": 130.0,
+            "y": 235.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Am2901DestDecode#0",
+          "pinName": "RSH"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#118",
-        "path": []
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 430.0,
+            "y": 175.0
+          },
+          {
+            "x": 430.0,
+            "y": 230.0
+          },
+          {
+            "x": 125.0,
+            "y": 230.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
            "compName": "sel3_4#0",
-          "pinName": "A3"
+          "pinName": "SA"
          },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "sel3_4#0",
+          "pinName": "SB"
          },
-        "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 460.0,
-            "y": 205.0
-          }
-        ]
+        "name": "unnamedWire#22",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
            "compName": "sel3_4#0",
-          "pinName": "A4"
+          "pinName": "SC"
          },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#44",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "SA"
          },
-        "name": "unnamedWire#121",
-        "path": []
+        "name": "unnamedWire#24",
+        "path": [
+          {
+            "x": 135.0,
+            "y": 930.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "SB"
          },
-        "name": "unnamedWire#122",
-        "path": []
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 940.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "SC"
          },
          "pin2": {
-          "compName": "WireCrossPoint#34",
+          "compName": "WireCrossPoint#42",
            "pinName": ""
          },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#26",
          "path": [
            {
-            "x": 120.0,
-            "y": 520.0
+            "x": 125.0,
+            "y": 950.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A"
          },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "B1"
+          "compName": "Splitter#3",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#125",
-        "path": []
+        "name": "unnamedWire#28",
+        "path": [
+          {
+            "x": 650.0,
+            "y": 245.0
+          },
+          {
+            "x": 650.0,
+            "y": 335.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "B2"
+          "compName": "Splitter#3",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#126",
-        "path": []
+        "name": "unnamedWire#29",
+        "path": [
+          {
+            "x": 645.0,
+            "y": 235.0
+          },
+          {
+            "x": 645.0,
+            "y": 345.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "Splitter#3",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "B3"
+          "compName": "ram4#0",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#127",
-        "path": []
+        "name": "unnamedWire#30",
+        "path": [
+          {
+            "x": 640.0,
+            "y": 355.0
+          },
+          {
+            "x": 640.0,
+            "y": 225.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "B4"
+          "compName": "_submodelinterface",
+          "pinName": "D"
          },
-        "name": "unnamedWire#128",
-        "path": []
+        "name": "unnamedWire#31",
+        "path": [
+          {
+            "x": 490.0,
+            "y": 480.0
+          },
+          {
+            "x": 600.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#129",
-        "path": []
+        "name": "unnamedWire#32",
+        "path": [
+          {
+            "x": 475.0,
+            "y": 645.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#33",
          "path": [
            {
-            "x": 230.0,
-            "y": 715.0
-          },
-          {
-            "x": 230.0,
-            "y": 750.0
+            "x": 485.0,
+            "y": 640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#130",
-        "path": []
+        "name": "unnamedWire#34",
+        "path": [
+          {
+            "x": 495.0,
+            "y": 635.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "dlatch4#0",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#35",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "C1"
+          "compName": "dlatch4#0",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#132",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "C2"
-        },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "C3"
+          "compName": "dlatch4#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#37",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "IN"
+          "compName": "dlatch4#0",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#38",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "B1"
+          "compName": "dlatch4#1",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#39",
          "path": [
            {
-            "x": 105.0,
-            "y": 1000.0
+            "x": 695.0,
+            "y": 215.0
+          },
+          {
+            "x": 695.0,
+            "y": 575.0
+          },
+          {
+            "x": 250.0,
+            "y": 575.0
+          },
+          {
+            "x": 250.0,
+            "y": 695.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QB2"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "B2"
+          "compName": "dlatch4#1",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#40",
          "path": [
            {
-            "x": 110.0,
-            "y": 1010.0
+            "x": 700.0,
+            "y": 225.0
+          },
+          {
+            "x": 700.0,
+            "y": 570.0
+          },
+          {
+            "x": 245.0,
+            "y": 570.0
+          },
+          {
+            "x": 245.0,
+            "y": 705.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "B3"
+          "compName": "dlatch4#1",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 115.0,
-            "y": 1020.0
+            "x": 705.0,
+            "y": 235.0
+          },
+          {
+            "x": 705.0,
+            "y": 565.0
+          },
+          {
+            "x": 240.0,
+            "y": 565.0
+          },
+          {
+            "x": 240.0,
+            "y": 715.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "B4"
+          "compName": "dlatch4#1",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 120.0,
-            "y": 1030.0
+            "x": 710.0,
+            "y": 245.0
+          },
+          {
+            "x": 710.0,
+            "y": 560.0
+          },
+          {
+            "x": 235.0,
+            "y": 560.0
+          },
+          {
+            "x": 235.0,
+            "y": 725.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Cn"
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "C"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Cn"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#43",
          "path": [
            {
-            "x": 715.0,
-            "y": 750.0
+            "x": 55.0,
+            "y": 1050.0
            },
            {
-            "x": 715.0,
-            "y": 215.0
+            "x": 55.0,
+            "y": 600.0
+          },
+          {
+            "x": 520.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y1"
+          "compName": "ram4#0",
+          "pinName": "A0"
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D1"
+          "compName": "Splitter#2",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#44",
          "path": [
            {
-            "x": 195.0,
-            "y": 730.0
+            "x": 650.0,
+            "y": 175.0
            },
            {
-            "x": 195.0,
-            "y": 265.0
+            "x": 650.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y2"
+          "compName": "Splitter#2",
+          "pinName": "O1"
          },
          "pin2": {
            "compName": "ram4#0",
-          "pinName": "D2"
+          "pinName": "A1"
          },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#45",
          "path": [
            {
-            "x": 200.0,
-            "y": 740.0
+            "x": 645.0,
+            "y": 155.0
            },
            {
-            "x": 200.0,
-            "y": 275.0
+            "x": 645.0,
+            "y": 185.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y3"
+          "compName": "Splitter#2",
+          "pinName": "O2"
          },
          "pin2": {
            "compName": "ram4#0",
-          "pinName": "D3"
+          "pinName": "A2"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#46",
          "path": [
            {
-            "x": 205.0,
-            "y": 750.0
+            "x": 640.0,
+            "y": 145.0
            },
            {
-            "x": 205.0,
-            "y": 285.0
+            "x": 640.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y4"
+          "compName": "Splitter#2",
+          "pinName": "O3"
          },
          "pin2": {
            "compName": "ram4#0",
-          "pinName": "D4"
+          "pinName": "A3"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 210.0,
-            "y": 760.0
+            "x": 635.0,
+            "y": 135.0
            },
            {
-            "x": 210.0,
-            "y": 295.0
+            "x": 635.0,
+            "y": 205.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "RAMWE"
+          "compName": "dlatch4#0",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#144",
-        "path": []
+        "name": "unnamedWire#48",
+        "path": [
+          {
+            "x": 765.0,
+            "y": 175.0
+          },
+          {
+            "x": 765.0,
+            "y": 80.0
+          },
+          {
+            "x": 350.0,
+            "y": 80.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
+          "compName": "dlatch4#0",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#145"
-      },
-      {
-        "pin1": {
-          "compName": "and#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "WE"
-        },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#49",
          "path": [
            {
-            "x": 630.0,
+            "x": 770.0,
              "y": 185.0
            },
            {
-            "x": 630.0,
-            "y": 255.0
+            "x": 770.0,
+            "y": 75.0
+          },
+          {
+            "x": 345.0,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "QWE"
+          "compName": "dlatch4#0",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#50",
          "path": [
            {
-            "x": 450.0,
-            "y": 215.0
-          },
-          {
-            "x": 450.0,
-            "y": 245.0
+            "x": 775.0,
+            "y": 195.0
            },
            {
-            "x": 190.0,
-            "y": 245.0
+            "x": 775.0,
+            "y": 70.0
            },
            {
-            "x": 190.0,
-            "y": 980.0
+            "x": 340.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "YF"
+          "compName": "dlatch4#0",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#51",
          "path": [
            {
-            "x": 435.0,
-            "y": 195.0
+            "x": 780.0,
+            "y": 205.0
            },
            {
-            "x": 435.0,
-            "y": 355.0
+            "x": 780.0,
+            "y": 65.0
+          },
+          {
+            "x": 335.0,
+            "y": 65.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D1"
+          "compName": "mux1_4#0",
+          "pinName": "I0_1"
          },
-        "name": "unnamedWire#149",
-        "path": [
-          {
-            "x": 505.0,
-            "y": 630.0
-          }
-        ]
+        "name": "unnamedWire#52",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "I8"
+          "compName": "mux1_4#0",
+          "pinName": "I0_2"
          },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 835.0,
-            "y": 760.0
-          },
-          {
-            "x": 835.0,
-            "y": 315.0
-          },
-          {
-            "x": 365.0,
-            "y": 315.0
-          },
-          {
-            "x": 365.0,
-            "y": 165.0
-          }
-        ]
+        "name": "unnamedWire#53",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "mux1_4#0",
+          "pinName": "I0_3"
          },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "pin2": {
            "compName": "mux1_4#0",
-          "pinName": "Y3"
+          "pinName": "I0_4"
+        },
+        "name": "unnamedWire#55",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#56",
          "path": [
            {
-            "x": 555.0,
-            "y": 375.0
-          },
-          {
-            "x": 555.0,
-            "y": 520.0
-          },
-          {
-            "x": 740.0,
-            "y": 520.0
-          },
-          {
-            "x": 740.0,
-            "y": 1230.0
-          },
-          {
-            "x": 745.0,
-            "y": 1230.0
+            "x": 350.0,
+            "y": 655.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "or4#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#153",
-        "path": []
+        "name": "unnamedWire#57",
+        "path": [
+          {
+            "x": 345.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#58",
          "path": [
            {
-            "x": 415.0,
-            "y": 445.0
+            "x": 340.0,
+            "y": 665.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "B"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#59",
          "path": [
            {
-            "x": 415.0,
-            "y": 455.0
+            "x": 335.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
+          "compName": "dlatch4#1",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F\u003d0"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#60",
          "path": [
            {
-            "x": 445.0,
-            "y": 450.0
-          },
-          {
-            "x": 445.0,
-            "y": 490.0
-          },
-          {
-            "x": 310.0,
-            "y": 490.0
+            "x": 300.0,
+            "y": 695.0
            },
            {
-            "x": 310.0,
-            "y": 450.0
+            "x": 300.0,
+            "y": 680.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "dlatch4#1",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y1"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B2"
          },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#61",
          "path": [
            {
-            "x": 765.0,
-            "y": 1220.0
-          },
-          {
-            "x": 750.0,
-            "y": 1220.0
-          },
-          {
-            "x": 750.0,
-            "y": 510.0
+            "x": 305.0,
+            "y": 705.0
            },
            {
-            "x": 565.0,
-            "y": 510.0
-          },
-          {
-            "x": 565.0,
-            "y": 355.0
+            "x": 305.0,
+            "y": 685.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "dlatch4#1",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "OUT"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B3"
          },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#62",
          "path": [
            {
-            "x": 100.0,
-            "y": 1115.0
+            "x": 310.0,
+            "y": 715.0
            },
            {
-            "x": 380.0,
-            "y": 1115.0
+            "x": 310.0,
+            "y": 690.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dlatch4#1",
+          "pinName": "Q4"
+        },
+        "pin2": {
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B4"
+        },
+        "name": "unnamedWire#63",
+        "path": [
+          {
+            "x": 315.0,
+            "y": 725.0
            },
            {
-            "x": 380.0,
-            "y": 930.0
+            "x": 315.0,
+            "y": 695.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "dff4#0",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "IN"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#64",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "dff4#0",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "C"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 255.0,
-            "y": 735.0
-          }
-        ]
+        "name": "unnamedWire#65",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "dff4#0",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "name": "unnamedWire#160",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 760.0
-          }
-        ]
+        "name": "unnamedWire#66",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "dff4#0",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "name": "unnamedWire#161",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 885.0
-          },
-          {
-            "x": 380.0,
-            "y": 885.0
-          }
-        ]
+        "name": "unnamedWire#67",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F3"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
-        "name": "unnamedWire#162",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 545.0
-          },
-          {
-            "x": 5.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#68",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
+          "compName": "TriStateBuffer#0",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#163",
-        "path": [
-          {
-            "x": 550.0,
-            "y": 385.0
-          },
-          {
-            "x": 550.0,
-            "y": 525.0
-          },
-          {
-            "x": 735.0,
-            "y": 525.0
-          }
-        ]
+        "name": "unnamedWire#69",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
-        "name": "unnamedWire#164",
+        "name": "unnamedWire#70",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#43",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Qn"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#71",
          "path": [
            {
-            "x": 395.0,
-            "y": 890.0
+            "x": 80.0,
+            "y": 200.0
            },
            {
-            "x": 395.0,
-            "y": 860.0
+            "x": 80.0,
+            "y": 965.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
-        "name": "unnamedWire#166",
-        "path": []
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 245.0,
+            "y": 1095.0
+          },
+          {
+            "x": 130.0,
+            "y": 1095.0
+          },
+          {
+            "x": 130.0,
+            "y": 1050.0
+          },
+          {
+            "x": 135.0,
+            "y": 1050.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
-        "name": "unnamedWire#167",
-        "path": []
+        "name": "unnamedWire#73",
+        "path": [
+          {
+            "x": 250.0,
+            "y": 1100.0
+          },
+          {
+            "x": 135.0,
+            "y": 1100.0
+          },
+          {
+            "x": 135.0,
+            "y": 1055.0
+          },
+          {
+            "x": 140.0,
+            "y": 1055.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#168",
+        "name": "unnamedWire#74",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#169",
+        "name": "unnamedWire#75",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "C"
+          "compName": "sel3_4#1",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#76",
          "path": [
            {
              "x": 255.0,
-            "y": 900.0
+            "y": 1105.0
            },
            {
-            "x": 195.0,
-            "y": 900.0
+            "x": 140.0,
+            "y": 1105.0
            },
            {
-            "x": 195.0,
-            "y": 970.0
+            "x": 140.0,
+            "y": 1060.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "EN"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "name": "unnamedWire#170",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "IN"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "I7"
          },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#77",
          "path": [
            {
-            "x": 395.0,
-            "y": 735.0
+            "x": 840.0,
+            "y": 770.0
+          },
+          {
+            "x": 840.0,
+            "y": 310.0
+          },
+          {
+            "x": 370.0,
+            "y": 310.0
+          },
+          {
+            "x": 370.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "C4"
+          "compName": "_submodelinterface",
+          "pinName": "RAMn"
          },
          "pin2": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#41",
            "pinName": ""
          },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 145.0,
-            "y": 1070.0
+            "x": 75.0,
+            "y": 100.0
            },
            {
-            "x": 145.0,
-            "y": 1080.0
+            "x": 75.0,
+            "y": 765.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "OUT"
+          "compName": "sel3_4#1",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#79",
          "path": [
            {
-            "x": 425.0,
-            "y": 960.0
+            "x": 240.0,
+            "y": 1090.0
+          },
+          {
+            "x": 125.0,
+            "y": 1090.0
+          },
+          {
+            "x": 125.0,
+            "y": 1045.0
+          },
+          {
+            "x": 130.0,
+            "y": 1045.0
+          },
+          {
+            "x": 130.0,
+            "y": 970.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Qn+3"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Q1"
          },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#80",
          "path": [
            {
-            "x": 425.0,
-            "y": 1150.0
+            "x": 320.0,
+            "y": 705.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B0"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Q2"
          },
-        "name": "unnamedWire#178",
+        "name": "unnamedWire#81",
          "path": [
            {
-            "x": 635.0,
-            "y": 365.0
+            "x": 325.0,
+            "y": 940.0
            },
            {
-            "x": 635.0,
-            "y": 215.0
+            "x": 325.0,
+            "y": 710.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#179",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "LSH"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Q3"
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#82",
          "path": [
            {
-            "x": 420.0,
-            "y": 205.0
-          },
-          {
-            "x": 420.0,
-            "y": 240.0
+            "x": 330.0,
+            "y": 950.0
            },
            {
-            "x": 135.0,
-            "y": 240.0
+            "x": 330.0,
+            "y": 715.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "NSH"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Q4"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#83",
          "path": [
            {
-            "x": 425.0,
-            "y": 165.0
-          },
-          {
-            "x": 425.0,
-            "y": 235.0
-          },
-          {
-            "x": 130.0,
-            "y": 235.0
+            "x": 335.0,
+            "y": 720.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I4"
+          "compName": "sel3_4#1",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#84",
          "path": [
            {
-            "x": 800.0,
-            "y": 800.0
-          },
-          {
-            "x": 800.0,
-            "y": 610.0
-          },
-          {
-            "x": 575.0,
-            "y": 610.0
+            "x": 135.0,
+            "y": 980.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "RSH"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#85",
          "path": [
            {
-            "x": 430.0,
-            "y": 175.0
-          },
-          {
-            "x": 430.0,
-            "y": 230.0
-          },
-          {
-            "x": 125.0,
-            "y": 230.0
+            "x": 140.0,
+            "y": 990.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "SA"
+          "compName": "dff4#0",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "SB"
+          "compName": "dff4#0",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#87",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "SC"
+          "compName": "dff4#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "SA"
+          "compName": "dff4#0",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#24",
-        "path": [
-          {
-            "x": 135.0,
-            "y": 930.0
-          }
-        ]
+        "name": "unnamedWire#89",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "SB"
+          "compName": "_submodelinterface",
+          "pinName": "Cn+4"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#90",
          "path": [
            {
-            "x": 130.0,
-            "y": 940.0
+            "x": 615.0,
+            "y": 665.0
+          },
+          {
+            "x": 615.0,
+            "y": 1200.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "SC"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "OVR"
          },
          "pin2": {
-          "compName": "WireCrossPoint#42",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "OVR"
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#91",
          "path": [
            {
-            "x": 125.0,
-            "y": 950.0
+            "x": 610.0,
+            "y": 675.0
+          },
+          {
+            "x": 610.0,
+            "y": 1125.0
+          },
+          {
+            "x": 95.0,
+            "y": 1125.0
+          },
+          {
+            "x": 95.0,
+            "y": 500.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#27",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "B3"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F1"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#92",
          "path": [
            {
-            "x": 650.0,
-            "y": 245.0
+            "x": 635.0,
+            "y": 625.0
            },
            {
-            "x": 650.0,
-            "y": 335.0
+            "x": 635.0,
+            "y": 530.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "B2"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F4"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#93",
          "path": [
            {
-            "x": 645.0,
-            "y": 235.0
+            "x": 620.0,
+            "y": 655.0
            },
            {
-            "x": 645.0,
-            "y": 345.0
+            "x": 620.0,
+            "y": 545.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
+          "compName": "TriStateBuffer#3",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I3"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#94",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "TriStateBuffer#3",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#95",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "sel3_4#0",
+          "pinName": "C4"
+        },
+        "name": "unnamedWire#96",
          "path": [
            {
-            "x": 795.0,
-            "y": 810.0
+            "x": 435.0,
+            "y": 795.0
            },
            {
-            "x": 795.0,
-            "y": 605.0
+            "x": 195.0,
+            "y": 795.0
            },
            {
-            "x": 565.0,
-            "y": 605.0
+            "x": 195.0,
+            "y": 880.0
+          },
+          {
+            "x": 140.0,
+            "y": 880.0
+          },
+          {
+            "x": 140.0,
+            "y": 870.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B1"
+          "compName": "_submodelinterface",
+          "pinName": "RAMn+3"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#97",
          "path": [
            {
-            "x": 640.0,
-            "y": 355.0
+            "x": 455.0,
+            "y": 735.0
            },
            {
-            "x": 640.0,
-            "y": 225.0
+            "x": 455.0,
+            "y": 1100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "I"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#98",
          "path": [
            {
-            "x": 490.0,
-            "y": 480.0
-          },
-          {
-            "x": 600.0,
-            "y": 480.0
+            "x": 380.0,
+            "y": 505.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D4"
+          "pinName": "F2"
          },
          "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#99",
          "path": [
            {
-            "x": 475.0,
-            "y": 645.0
+            "x": 630.0,
+            "y": 635.0
+          },
+          {
+            "x": 630.0,
+            "y": 535.0
+          },
+          {
+            "x": 385.0,
+            "y": 535.0
+          },
+          {
+            "x": 385.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O2"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F3"
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#100",
          "path": [
            {
-            "x": 485.0,
-            "y": 640.0
+            "x": 625.0,
+            "y": 645.0
+          },
+          {
+            "x": 625.0,
+            "y": 540.0
+          },
+          {
+            "x": 390.0,
+            "y": 540.0
+          },
+          {
+            "x": 390.0,
+            "y": 515.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 495.0,
-            "y": 635.0
+            "x": 395.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA1"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#102",
          "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA2"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#103",
          "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA3"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#104",
          "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA4"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#105",
          "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB1"
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#39",
-        "path": [
-          {
-            "x": 695.0,
-            "y": 215.0
-          },
-          {
-            "x": 695.0,
-            "y": 575.0
-          },
-          {
-            "x": 250.0,
-            "y": 575.0
-          },
-          {
-            "x": 250.0,
-            "y": 695.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I2"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 790.0,
-            "y": 820.0
-          },
-          {
-            "x": 790.0,
-            "y": 600.0
-          },
-          {
-            "x": 555.0,
-            "y": 600.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB2"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D2"
+          "compName": "or4#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#40",
-        "path": [
-          {
-            "x": 700.0,
-            "y": 225.0
-          },
-          {
-            "x": 700.0,
-            "y": 570.0
-          },
-          {
-            "x": 245.0,
-            "y": 570.0
-          },
-          {
-            "x": 245.0,
-            "y": 705.0
-          }
-        ]
+        "name": "unnamedWire#106",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB3"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D3"
+          "compName": "or4#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#41",
-        "path": [
-          {
-            "x": 705.0,
-            "y": 235.0
-          },
-          {
-            "x": 705.0,
-            "y": 565.0
-          },
-          {
-            "x": 240.0,
-            "y": 565.0
-          },
-          {
-            "x": 240.0,
-            "y": 715.0
-          }
-        ]
+        "name": "unnamedWire#107",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB4"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D4"
+          "compName": "or4#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#42",
-        "path": [
-          {
-            "x": 710.0,
-            "y": 245.0
-          },
-          {
-            "x": 710.0,
-            "y": 560.0
-          },
-          {
-            "x": 235.0,
-            "y": 560.0
-          },
-          {
-            "x": 235.0,
-            "y": 725.0
-          }
-        ]
+        "name": "unnamedWire#108",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Cn"
+          "compName": "or4#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#43",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 1050.0
-          },
-          {
-            "x": 55.0,
-            "y": 600.0
-          },
-          {
-            "x": 520.0,
-            "y": 600.0
-          }
-        ]
+        "name": "unnamedWire#109",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram4#0",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
+          "compName": "mux1_4#0",
+          "pinName": "I1_1"
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#110",
          "path": [
            {
-            "x": 650.0,
-            "y": 175.0
-          },
-          {
-            "x": 650.0,
-            "y": 165.0
+            "x": 355.0,
+            "y": 405.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A1"
+          "compName": "mux1_4#0",
+          "pinName": "I1_2"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 645.0,
-            "y": 155.0
-          },
-          {
-            "x": 645.0,
-            "y": 185.0
+            "x": 360.0,
+            "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A2"
+          "compName": "mux1_4#0",
+          "pinName": "I1_3"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 640.0,
-            "y": 145.0
-          },
-          {
-            "x": 640.0,
-            "y": 195.0
+            "x": 365.0,
+            "y": 425.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A3"
+          "compName": "mux1_4#0",
+          "pinName": "I1_4"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 635.0,
-            "y": 135.0
-          },
-          {
-            "x": 635.0,
-            "y": 205.0
+            "x": 370.0,
+            "y": 435.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
-        "name": "unnamedWire#48",
-        "path": [
-          {
-            "x": 765.0,
-            "y": 175.0
-          },
-          {
-            "x": 765.0,
-            "y": 80.0
-          },
-          {
-            "x": 350.0,
-            "y": 80.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q2"
-        },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 770.0,
-            "y": 185.0
-          },
-          {
-            "x": 770.0,
-            "y": 75.0
-          },
-          {
-            "x": 345.0,
-            "y": 75.0
+            "x": 105.0,
+            "y": 505.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 785.0,
-            "y": 830.0
-          },
-          {
-            "x": 785.0,
-            "y": 595.0
-          },
-          {
-            "x": 545.0,
-            "y": 595.0
+            "x": 110.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#116",
          "path": [
            {
-            "x": 775.0,
-            "y": 195.0
-          },
-          {
-            "x": 775.0,
-            "y": 70.0
-          },
-          {
-            "x": 340.0,
-            "y": 70.0
+            "x": 115.0,
+            "y": 515.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q4"
+          "compName": "sel3_4#1",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#40",
            "pinName": ""
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#117",
          "path": [
            {
-            "x": 780.0,
-            "y": 205.0
-          },
-          {
-            "x": 780.0,
-            "y": 65.0
-          },
-          {
-            "x": 335.0,
-            "y": 65.0
+            "x": 100.0,
+            "y": 960.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_1"
+          "compName": "sel3_4#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#118",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_2"
+          "compName": "sel3_4#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#119",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_3"
+          "compName": "sel3_4#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#120",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_4"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#121",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#56",
-        "path": [
-          {
-            "x": 350.0,
-            "y": 655.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#33",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#57",
-        "path": [
-          {
-            "x": 345.0,
-            "y": 660.0
-          }
-        ]
+        "name": "unnamedWire#122",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#58",
-        "path": [
-          {
-            "x": 340.0,
-            "y": 665.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#34",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#123",
          "path": [
            {
-            "x": 335.0,
-            "y": 670.0
+            "x": 120.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 780.0,
-            "y": 840.0
-          },
-          {
-            "x": 780.0,
-            "y": 590.0
-          },
-          {
-            "x": 535.0,
-            "y": 590.0
-          }
-        ]
+        "name": "unnamedWire#124",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "compName": "sel3_4#0",
            "pinName": "B1"
          },
-        "name": "unnamedWire#60",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 695.0
-          },
-          {
-            "x": 300.0,
-            "y": 680.0
-          }
-        ]
+        "name": "unnamedWire#125",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "compName": "sel3_4#0",
            "pinName": "B2"
          },
-        "name": "unnamedWire#61",
-        "path": [
-          {
-            "x": 305.0,
-            "y": 705.0
-          },
-          {
-            "x": 305.0,
-            "y": 685.0
-          }
-        ]
+        "name": "unnamedWire#126",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "compName": "sel3_4#0",
            "pinName": "B3"
          },
-        "name": "unnamedWire#62",
-        "path": [
-          {
-            "x": 310.0,
-            "y": 715.0
-          },
-          {
-            "x": 310.0,
-            "y": 690.0
-          }
-        ]
+        "name": "unnamedWire#127",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "compName": "sel3_4#0",
            "pinName": "B4"
          },
-        "name": "unnamedWire#63",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 725.0
-          },
-          {
-            "x": 315.0,
-            "y": 695.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#128",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#129",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#130",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#38",
            "pinName": ""
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#131",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "sel3_4#0",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#132",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "IN"
+          "compName": "sel3_4#0",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#133",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "sel3_4#0",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#134",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "TriStateBuffer#2",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#135",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Qn"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#136",
          "path": [
            {
-            "x": 80.0,
-            "y": 200.0
-          },
-          {
-            "x": 80.0,
-            "y": 965.0
+            "x": 105.0,
+            "y": 1000.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "B2"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#137",
          "path": [
            {
-            "x": 245.0,
-            "y": 1095.0
-          },
-          {
-            "x": 130.0,
-            "y": 1095.0
-          },
-          {
-            "x": 130.0,
-            "y": 1050.0
-          },
-          {
-            "x": 135.0,
-            "y": 1050.0
+            "x": 110.0,
+            "y": 1010.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "sel3_4#1",
+          "pinName": "B3"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#138",
          "path": [
            {
-            "x": 250.0,
-            "y": 1100.0
-          },
-          {
-            "x": 135.0,
-            "y": 1100.0
-          },
-          {
-            "x": 135.0,
-            "y": 1055.0
-          },
-          {
-            "x": 140.0,
-            "y": 1055.0
+            "x": 115.0,
+            "y": 1020.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#38",
            "pinName": ""
          },
          "pin2": {
            "compName": "sel3_4#1",
-          "pinName": "C1"
+          "pinName": "B4"
          },
-        "name": "unnamedWire#74",
-        "path": []
+        "name": "unnamedWire#139",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 1030.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "sel3_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "C2"
+          "compName": "ram4#0",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#75",
-        "path": []
+        "name": "unnamedWire#140",
+        "path": [
+          {
+            "x": 195.0,
+            "y": 730.0
+          },
+          {
+            "x": 195.0,
+            "y": 265.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "sel3_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "C3"
+          "compName": "ram4#0",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#141",
          "path": [
            {
-            "x": 255.0,
-            "y": 1105.0
-          },
-          {
-            "x": 140.0,
-            "y": 1105.0
+            "x": 200.0,
+            "y": 740.0
            },
            {
-            "x": 140.0,
-            "y": 1060.0
+            "x": 200.0,
+            "y": 275.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
+          "compName": "sel3_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "I7"
+          "compName": "ram4#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#142",
          "path": [
            {
-            "x": 840.0,
-            "y": 770.0
-          },
-          {
-            "x": 840.0,
-            "y": 310.0
-          },
-          {
-            "x": 370.0,
-            "y": 310.0
+            "x": 205.0,
+            "y": 750.0
            },
            {
-            "x": 370.0,
-            "y": 175.0
+            "x": 205.0,
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "RAMn"
+          "compName": "sel3_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#143",
          "path": [
            {
-            "x": 75.0,
-            "y": 100.0
+            "x": 210.0,
+            "y": 760.0
            },
            {
-            "x": 75.0,
-            "y": 765.0
+            "x": 210.0,
+            "y": 295.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "Am2901DestDecode#0",
+          "pinName": "RAMWE"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "A2"
+          "compName": "and#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#144",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#145"
+      },
+      {
+        "pin1": {
+          "compName": "and#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "ram4#0",
+          "pinName": "WE"
+        },
+        "name": "unnamedWire#146",
          "path": [
-          {
-            "x": 240.0,
-            "y": 1090.0
-          },
-          {
-            "x": 125.0,
-            "y": 1090.0
-          },
-          {
-            "x": 125.0,
-            "y": 1045.0
-          },
-          {
-            "x": 130.0,
-            "y": 1045.0
+          {
+            "x": 630.0,
+            "y": 185.0
            },
            {
-            "x": 130.0,
-            "y": 970.0
+            "x": 630.0,
+            "y": 255.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "QWE"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y2"
+          "compName": "dff4#0",
+          "pinName": "WE"
          },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#147",
          "path": [
            {
-            "x": 755.0,
-            "y": 1225.0
-          },
-          {
-            "x": 745.0,
-            "y": 1225.0
+            "x": 450.0,
+            "y": 215.0
            },
            {
-            "x": 745.0,
-            "y": 515.0
+            "x": 450.0,
+            "y": 245.0
            },
            {
-            "x": 560.0,
-            "y": 515.0
+            "x": 190.0,
+            "y": 245.0
            },
            {
-            "x": 560.0,
-            "y": 365.0
+            "x": 190.0,
+            "y": 980.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Am2901DestDecode#0",
+          "pinName": "YF"
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q1"
+          "compName": "mux1_4#0",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#148",
          "path": [
            {
-            "x": 320.0,
-            "y": 705.0
+            "x": 435.0,
+            "y": 195.0
+          },
+          {
+            "x": 435.0,
+            "y": 355.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O0"
          },
          "pin2": {
            "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q2"
+          "pinName": "D1"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#149",
          "path": [
            {
-            "x": 325.0,
-            "y": 940.0
-          },
-          {
-            "x": 325.0,
-            "y": 710.0
+            "x": 505.0,
+            "y": 630.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q3"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#150",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1_4#0",
+          "pinName": "Y3"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#151",
          "path": [
            {
-            "x": 330.0,
-            "y": 950.0
+            "x": 555.0,
+            "y": 375.0
            },
            {
-            "x": 330.0,
-            "y": 715.0
+            "x": 555.0,
+            "y": 520.0
+          },
+          {
+            "x": 740.0,
+            "y": 520.0
+          },
+          {
+            "x": 740.0,
+            "y": 1230.0
+          },
+          {
+            "x": 745.0,
+            "y": 1230.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "or4#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
+        },
+        "name": "unnamedWire#152",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#39",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q4"
+          "compName": "NandGate#1",
+          "pinName": "A"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#153",
          "path": [
            {
-            "x": 335.0,
-            "y": 720.0
+            "x": 415.0,
+            "y": 445.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#39",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "A3"
+          "compName": "NandGate#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#154",
          "path": [
            {
-            "x": 135.0,
-            "y": 980.0
+            "x": 415.0,
+            "y": 455.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "NandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel3_4#1",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "F\u003d0"
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#155",
          "path": [
            {
-            "x": 140.0,
-            "y": 990.0
+            "x": 445.0,
+            "y": 450.0
+          },
+          {
+            "x": 445.0,
+            "y": 490.0
+          },
+          {
+            "x": 310.0,
+            "y": 490.0
+          },
+          {
+            "x": 310.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y1"
+          "compName": "Splitter#1",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D1"
+          "compName": "mux1_4#0",
+          "pinName": "Y1"
          },
-        "name": "unnamedWire#86",
-        "path": []
+        "name": "unnamedWire#156",
+        "path": [
+          {
+            "x": 765.0,
+            "y": 1220.0
+          },
+          {
+            "x": 750.0,
+            "y": 1220.0
+          },
+          {
+            "x": 750.0,
+            "y": 510.0
+          },
+          {
+            "x": 565.0,
+            "y": 510.0
+          },
+          {
+            "x": 565.0,
+            "y": 355.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D2"
+          "compName": "TriStateBuffer#0",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#87",
-        "path": []
+        "name": "unnamedWire#157",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 1115.0
+          },
+          {
+            "x": 380.0,
+            "y": 1115.0
+          },
+          {
+            "x": 380.0,
+            "y": 930.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D3"
+          "compName": "TriStateBuffer#1",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#158",
          "path": []
        },
        {
          "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D4"
+          "compName": "sel3_4#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#89",
-        "path": []
+        "name": "unnamedWire#159",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 760.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "TriStateBuffer#1",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#160",
          "path": [
            {
-            "x": 15.0,
-            "y": 950.0
+            "x": 100.0,
+            "y": 885.0
+          },
+          {
+            "x": 380.0,
+            "y": 885.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Cn+4"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Cn+4"
+          "pinName": "F3"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#161",
          "path": [
            {
-            "x": 615.0,
-            "y": 665.0
+            "x": 5.0,
+            "y": 545.0
            },
            {
-            "x": 615.0,
-            "y": 1200.0
+            "x": 5.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "OVR"
+          "compName": "mux1_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "OVR"
+          "compName": "Splitter#1",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#162",
          "path": [
            {
-            "x": 610.0,
-            "y": 675.0
-          },
-          {
-            "x": 610.0,
-            "y": 1125.0
+            "x": 550.0,
+            "y": 385.0
            },
            {
-            "x": 95.0,
-            "y": 1125.0
+            "x": 550.0,
+            "y": 525.0
            },
            {
-            "x": 95.0,
-            "y": 500.0
+            "x": 735.0,
+            "y": 525.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F1"
+          "compName": "WireCrossPoint#42",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#163",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#43",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "TriStateBuffer#1",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#164",
          "path": [
            {
-            "x": 635.0,
-            "y": 625.0
+            "x": 395.0,
+            "y": 890.0
            },
            {
-            "x": 635.0,
-            "y": 530.0
+            "x": 395.0,
+            "y": 860.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F4"
+          "compName": "WireCrossPoint#43",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#19",
+          "compName": "TriStateBuffer#0",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#165",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#43",
            "pinName": ""
          },
-        "name": "unnamedWire#93",
-        "path": [
-          {
-            "x": 620.0,
-            "y": 655.0
-          },
-          {
-            "x": 620.0,
-            "y": 545.0
-          }
-        ]
+        "pin2": {
+          "compName": "WireCrossPoint#42",
+          "pinName": ""
+        },
+        "name": "unnamedWire#166",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#44",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#167",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#45",
+          "compName": "WireCrossPoint#44",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#3",
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "name": "unnamedWire#168",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "TriStateBuffer#2",
            "pinName": "EN"
          },
-        "name": "unnamedWire#95",
+        "pin2": {
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "name": "unnamedWire#169",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel3_4#0",
-          "pinName": "C4"
+          "compName": "TriStateBuffer#3",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#170",
          "path": [
            {
-            "x": 435.0,
-            "y": 795.0
-          },
-          {
-            "x": 195.0,
-            "y": 795.0
-          },
-          {
-            "x": 195.0,
-            "y": 880.0
-          },
+            "x": 395.0,
+            "y": 735.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel3_4#1",
+          "pinName": "C4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#46",
+          "pinName": ""
+        },
+        "name": "unnamedWire#171",
+        "path": [
            {
-            "x": 140.0,
-            "y": 880.0
+            "x": 145.0,
+            "y": 1070.0
            },
            {
-            "x": 140.0,
-            "y": 870.0
+            "x": 145.0,
+            "y": 1080.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#46",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "RAMn+3"
+          "compName": "TriStateBuffer#2",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#172",
          "path": [
            {
-            "x": 455.0,
-            "y": 735.0
-          },
-          {
-            "x": 455.0,
-            "y": 1100.0
+            "x": 425.0,
+            "y": 960.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#46",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Qn+3"
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#173",
          "path": [
            {
-            "x": 380.0,
-            "y": 505.0
+            "x": 425.0,
+            "y": 1150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F2"
+          "compName": "Splitter#3",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "ram4#0",
+          "pinName": "B0"
          },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#174",
          "path": [
            {
-            "x": 630.0,
-            "y": 635.0
-          },
-          {
-            "x": 630.0,
-            "y": 535.0
-          },
-          {
-            "x": 385.0,
-            "y": 535.0
+            "x": 635.0,
+            "y": 365.0
            },
            {
-            "x": 385.0,
-            "y": 510.0
+            "x": 635.0,
+            "y": 215.0
            }
          ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#175",
+        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json

index 90f0ad9..45cd9cb 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
@@ -150,15 +150,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 39.0,
-          "y": 34.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#2",
@@ -231,6 +222,15 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 39.0,
+          "y": 34.0
+        },
+        "params": 1
+      },
        {
          "id": "and",
          "name": "and#0",
@@ -278,6 +278,129 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 45.0
+          },
+          {
+            "x": 45.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "FN"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 180.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "nand3#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 40.0
+          },
+          {
+            "x": 45.0,
+            "y": 40.0
+          },
+          {
+            "x": 45.0,
+            "y": 15.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#4",
@@ -426,18 +549,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#8",
@@ -573,18 +684,6 @@
          },
          "name": "unnamedWire#29"
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "NandGate#4",
@@ -608,105 +707,6 @@
          },
          "name": "unnamedWire#31",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 45.0
-          },
-          {
-            "x": 45.0,
-            "y": 50.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "FN"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 180.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "nand3#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 15.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json

index 9652a6d..130825a 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json
@@ -228,163 +228,163 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 31.5,
-          "y": 244.0
+          "x": 24.0,
+          "y": 294.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 31.5,
-          "y": 344.0
+          "x": 26.5,
+          "y": 104.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 34.0,
-          "y": 154.0
+          "x": 26.5,
+          "y": 204.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 34.0,
-          "y": 254.0
+          "x": 26.5,
+          "y": 304.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 34.0,
-          "y": 354.0
+          "x": 29.0,
+          "y": 124.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 36.5,
-          "y": 164.0
+          "x": 29.0,
+          "y": 224.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 36.5,
-          "y": 264.0
+          "x": 29.0,
+          "y": 324.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 36.5,
-          "y": 364.0
+          "x": 31.5,
+          "y": 144.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 84.0,
-          "y": 374.0
+          "x": 31.5,
+          "y": 244.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 84.0,
-          "y": 384.0
+          "x": 31.5,
+          "y": 344.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 24.0,
-          "y": 294.0
+          "x": 34.0,
+          "y": 154.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 26.5,
-          "y": 104.0
+          "x": 34.0,
+          "y": 254.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 26.5,
-          "y": 204.0
+          "x": 34.0,
+          "y": 354.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 26.5,
-          "y": 304.0
+          "x": 36.5,
+          "y": 164.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#16",
          "pos": {
-          "x": 29.0,
-          "y": 124.0
+          "x": 36.5,
+          "y": 264.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#17",
          "pos": {
-          "x": 29.0,
-          "y": 224.0
+          "x": 36.5,
+          "y": 364.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#18",
          "pos": {
-          "x": 29.0,
-          "y": 324.0
+          "x": 84.0,
+          "y": 374.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#19",
          "pos": {
-          "x": 31.5,
-          "y": 144.0
+          "x": 84.0,
+          "y": 384.0
          },
          "params": 1
        },
@@ -440,6 +440,129 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I3"
+        },
+        "pin2": {
+          "compName": "Am2901ALUFuncDecode#0",
+          "pinName": "I3"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 100.0
+          },
+          {
+            "x": 15.0,
+            "y": 27.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2901ALUFuncDecode#0",
+          "pinName": "SBE"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 62.5,
+            "y": 37.5
+          },
+          {
+            "x": 62.5,
+            "y": 70.0
+          },
+          {
+            "x": 25.0,
+            "y": 70.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2901ALUOneBit#0",
+          "pinName": "CoutE"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2901ALUOneBit#1",
+          "pinName": "CoutE"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2901ALUOneBit#2",
+          "pinName": "CoutE"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2901ALUOneBit#3",
+          "pinName": "CoutE"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 395.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "Am2901ALUFuncDecode#0",
@@ -591,27 +714,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
-        },
-        "pin2": {
-          "compName": "Am2901ALUFuncDecode#0",
-          "pinName": "I3"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 100.0
-          },
-          {
-            "x": 15.0,
-            "y": 27.5
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -750,31 +852,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2901ALUFuncDecode#0",
-          "pinName": "SBE"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 62.5,
-            "y": 37.5
-          },
-          {
-            "x": 62.5,
-            "y": 70.0
-          },
-          {
-            "x": 25.0,
-            "y": 70.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#11",
@@ -931,18 +1008,6 @@
          "name": "unnamedWire#39",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#16",
@@ -1113,18 +1178,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -1338,18 +1391,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2901ALUOneBit#0",
-          "pinName": "CoutE"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Am2901ALUOneBit#1",
@@ -1482,47 +1523,6 @@
            "pinName": "OVR"
          },
          "name": "unnamedWire#66"
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2901ALUOneBit#1",
-          "pinName": "CoutE"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2901ALUOneBit#2",
-          "pinName": "CoutE"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2901ALUOneBit#3",
-          "pinName": "CoutE"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 395.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json

index 38b9bd5..31d604b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
@@ -371,6 +371,190 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "Am2901ALUInclDecode#0",
+          "pinName": "I3"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "I3"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 220.0,
+            "y": 40.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I2"
+        },
+        "pin2": {
+          "compName": "Am2901SourceDecode#0",
+          "pinName": "I2"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 5.0
+          },
+          {
+            "x": 150.0,
+            "y": 5.0
+          },
+          {
+            "x": 150.0,
+            "y": 165.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I1"
+        },
+        "pin2": {
+          "compName": "Am2901SourceDecode#0",
+          "pinName": "I1"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 175.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I0"
+        },
+        "pin2": {
+          "compName": "Am2901SourceDecode#0",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2901SourceDecode#0",
+          "pinName": "RA"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "SB"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 175.0
+          },
+          {
+            "x": 205.0,
+            "y": 100.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D1"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 40.0
+          },
+          {
+            "x": 10.0,
+            "y": 55.0
+          },
+          {
+            "x": 185.0,
+            "y": 55.0
+          },
+          {
+            "x": 185.0,
+            "y": 110.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D2"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 60.0
+          },
+          {
+            "x": 10.0,
+            "y": 65.0
+          },
+          {
+            "x": 180.0,
+            "y": 65.0
+          },
+          {
+            "x": 180.0,
+            "y": 120.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D3"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 80.0
+          },
+          {
+            "x": 10.0,
+            "y": 75.0
+          },
+          {
+            "x": 175.0,
+            "y": 75.0
+          },
+          {
+            "x": 175.0,
+            "y": 130.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -564,23 +748,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2901ALUInclDecode#0",
-          "pinName": "I3"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 40.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -764,31 +931,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I2"
-        },
-        "pin2": {
-          "compName": "Am2901SourceDecode#0",
-          "pinName": "I2"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 5.0
-          },
-          {
-            "x": 150.0,
-            "y": 5.0
-          },
-          {
-            "x": 150.0,
-            "y": 165.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -894,7 +1036,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "R1"
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#35",
          "path": [
            {
              "x": 275.0,
@@ -915,7 +1057,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "R2"
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#36",
          "path": [
            {
              "x": 280.0,
@@ -936,7 +1078,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "R3"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#37",
          "path": [
            {
              "x": 285.0,
@@ -957,7 +1099,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "R4"
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#38",
          "path": [
            {
              "x": 290.0,
@@ -969,23 +1111,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
-        },
-        "pin2": {
-          "compName": "Am2901SourceDecode#0",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 175.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "sel3_4#0",
@@ -995,7 +1120,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "S1"
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#39",
          "path": [
            {
              "x": 295.0,
@@ -1016,7 +1141,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "S2"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#40",
          "path": [
            {
              "x": 300.0,
@@ -1037,7 +1162,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "S3"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#41",
          "path": [
            {
              "x": 305.0,
@@ -1058,7 +1183,7 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "S4"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#42",
          "path": [
            {
              "x": 310.0,
@@ -1079,7 +1204,7 @@
            "compName": "_submodelinterface",
            "pinName": "F1"
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
@@ -1091,7 +1216,7 @@
            "compName": "_submodelinterface",
            "pinName": "F2"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#44",
          "path": [
            {
              "x": 375.0,
@@ -1112,7 +1237,7 @@
            "compName": "_submodelinterface",
            "pinName": "F3"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#45",
          "path": [
            {
              "x": 370.0,
@@ -1133,7 +1258,7 @@
            "compName": "_submodelinterface",
            "pinName": "F4"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#46",
          "path": [
            {
              "x": 365.0,
@@ -1154,7 +1279,7 @@
            "compName": "_submodelinterface",
            "pinName": "Cn+4"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#47",
          "path": [
            {
              "x": 360.0,
@@ -1175,7 +1300,7 @@
            "compName": "_submodelinterface",
            "pinName": "OVR"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#48",
          "path": [
            {
              "x": 355.0,
@@ -1187,23 +1312,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0"
-        },
-        "pin2": {
-          "compName": "Am2901SourceDecode#0",
-          "pinName": "I0"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 185.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -1213,121 +1321,13 @@
            "compName": "Am2901ALUInclDecode#0",
            "pinName": "I4"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#49",
          "path": [
            {
              "x": 260.0,
              "y": 30.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "Am2901SourceDecode#0",
-          "pinName": "RA"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "SB"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 175.0
-          },
-          {
-            "x": 205.0,
-            "y": 100.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 40.0
-          },
-          {
-            "x": 10.0,
-            "y": 55.0
-          },
-          {
-            "x": 185.0,
-            "y": 55.0
-          },
-          {
-            "x": 185.0,
-            "y": 110.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 60.0
-          },
-          {
-            "x": 10.0,
-            "y": 65.0
-          },
-          {
-            "x": 180.0,
-            "y": 65.0
-          },
-          {
-            "x": 180.0,
-            "y": 120.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 80.0
-          },
-          {
-            "x": 10.0,
-            "y": 75.0
-          },
-          {
-            "x": 175.0,
-            "y": 75.0
-          },
-          {
-            "x": 175.0,
-            "y": 130.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json

index 31cf8af..067b9b4 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json
@@ -231,6 +231,125 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "CinE"
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 125.0
+          },
+          {
+            "x": 7.5,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "R"
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "RN"
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "S"
+        },
+        "pin2": {
+          "compName": "xor#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SN"
+        },
+        "pin2": {
+          "compName": "xor#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "FN"
+        },
+        "pin2": {
+          "compName": "xor#2",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 375.0
+          },
+          {
+            "x": 130.0,
+            "y": 85.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "L"
+        },
+        "pin2": {
+          "compName": "mux1#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 87.5,
+            "y": 425.0
+          },
+          {
+            "x": 87.5,
+            "y": 75.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "and#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "fulladder#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "xor#0",
@@ -397,27 +516,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "CinE"
-        },
-        "pin2": {
-          "compName": "and#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 125.0
-          },
-          {
-            "x": 7.5,
-            "y": 35.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "and#1",
@@ -441,104 +539,6 @@
          },
          "name": "unnamedWire#21",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R"
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "RN"
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S"
-        },
-        "pin2": {
-          "compName": "xor#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#5"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SN"
-        },
-        "pin2": {
-          "compName": "xor#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#6"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "FN"
-        },
-        "pin2": {
-          "compName": "xor#2",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 130.0,
-            "y": 375.0
-          },
-          {
-            "x": 130.0,
-            "y": 85.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "L"
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 87.5,
-            "y": 425.0
-          },
-          {
-            "x": 87.5,
-            "y": 75.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "and#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "fulladder#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#9",
-        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json

index 27cd4f0..e783d36 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json
@@ -105,33 +105,6 @@
          },
          "params": 1
        },
-      {
-        "id": "NandGate",
-        "name": "NandGate#10",
-        "pos": {
-          "x": 80.0,
-          "y": 145.0
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#11",
-        "pos": {
-          "x": 110.0,
-          "y": 105.0
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#12",
-        "pos": {
-          "x": 115.0,
-          "y": 210.0
-        },
-        "params": 1
-      },
        {
          "id": "NandGate",
          "name": "NandGate#2",
@@ -204,6 +177,33 @@
          },
          "params": 1
        },
+      {
+        "id": "NandGate",
+        "name": "NandGate#10",
+        "pos": {
+          "x": 80.0,
+          "y": 145.0
+        },
+        "params": 1
+      },
+      {
+        "id": "NandGate",
+        "name": "NandGate#11",
+        "pos": {
+          "x": 110.0,
+          "y": 105.0
+        },
+        "params": 1
+      },
+      {
+        "id": "NandGate",
+        "name": "NandGate#12",
+        "pos": {
+          "x": 115.0,
+          "y": 210.0
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#0",
@@ -224,127 +224,127 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 39.0,
-          "y": 134.0
+          "x": 4.0,
+          "y": 24.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 74.0,
-          "y": 19.0
+          "x": 9.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 74.0,
-          "y": 99.0
+          "x": 9.0,
+          "y": 64.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 74.0,
+          "x": 9.0,
            "y": 104.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 74.0,
-          "y": 159.0
+          "x": 4.0,
+          "y": 154.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 109.0,
-          "y": 214.0
+          "x": 39.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 4.0,
-          "y": 24.0
+          "x": 44.0,
+          "y": 19.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 9.0,
-          "y": 59.0
+          "x": 44.0,
+          "y": 54.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 9.0,
-          "y": 64.0
+          "x": 39.0,
+          "y": 134.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 9.0,
-          "y": 104.0
+          "x": 74.0,
+          "y": 19.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 4.0,
-          "y": 154.0
+          "x": 74.0,
+          "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 39.0,
-          "y": 59.0
+          "x": 74.0,
+          "y": 104.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 44.0,
-          "y": 19.0
+          "x": 74.0,
+          "y": 159.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 44.0,
-          "y": 54.0
+          "x": 109.0,
+          "y": 214.0
          },
          "params": 1
        }
@@ -374,6 +374,107 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I7"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 55.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#5",
@@ -532,18 +633,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#8",
@@ -710,18 +799,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#11",
@@ -875,18 +952,6 @@
          "name": "unnamedWire#39",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "NandGate#8",
@@ -1012,71 +1077,6 @@
          },
          "name": "unnamedWire#47",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I7"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 55.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json

index 25a6483..3d347c5 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json
@@ -98,118 +98,118 @@
        },
        {
          "id": "NandGate",
-        "name": "NandGate#10",
+        "name": "NandGate#2",
          "pos": {
-          "x": 70.0,
+          "x": 10.0,
            "y": 90.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#11",
+        "name": "NandGate#3",
          "pos": {
-          "x": 70.0,
-          "y": 130.0
+          "x": 40.0,
+          "y": 10.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#12",
+        "name": "NandGate#4",
          "pos": {
-          "x": 70.0,
-          "y": 170.0
+          "x": 40.0,
+          "y": 50.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#13",
+        "name": "NandGate#5",
          "pos": {
-          "x": 100.0,
-          "y": 10.0
+          "x": 40.0,
+          "y": 90.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#14",
+        "name": "NandGate#6",
          "pos": {
-          "x": 100.0,
-          "y": 170.0
+          "x": 40.0,
+          "y": 130.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#2",
+        "name": "NandGate#7",
          "pos": {
-          "x": 10.0,
-          "y": 90.0
+          "x": 40.0,
+          "y": 170.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#3",
+        "name": "NandGate#8",
          "pos": {
-          "x": 40.0,
+          "x": 70.0,
            "y": 10.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#4",
+        "name": "NandGate#9",
          "pos": {
-          "x": 40.0,
+          "x": 70.0,
            "y": 50.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#5",
+        "name": "NandGate#10",
          "pos": {
-          "x": 40.0,
+          "x": 70.0,
            "y": 90.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#6",
+        "name": "NandGate#11",
          "pos": {
-          "x": 40.0,
+          "x": 70.0,
            "y": 130.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#7",
+        "name": "NandGate#12",
          "pos": {
-          "x": 40.0,
+          "x": 70.0,
            "y": 170.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#8",
+        "name": "NandGate#13",
          "pos": {
-          "x": 70.0,
+          "x": 100.0,
            "y": 10.0
          },
          "params": 1
        },
        {
          "id": "NandGate",
-        "name": "NandGate#9",
+        "name": "NandGate#14",
          "pos": {
-          "x": 70.0,
-          "y": 50.0
+          "x": 100.0,
+          "y": 170.0
          },
          "params": 1
        },
@@ -233,127 +233,127 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 36.5,
-          "y": 99.0
+          "x": 4.0,
+          "y": 144.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 64.0,
+          "x": 6.5,
            "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 64.0,
+          "x": 6.5,
            "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 64.0,
-          "y": 139.0
+          "x": 6.5,
+          "y": 104.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 94.0,
-          "y": 19.0
+          "x": 31.5,
+          "y": 54.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 94.0,
-          "y": 179.0
+          "x": 34.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 4.0,
-          "y": 144.0
+          "x": 34.0,
+          "y": 64.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 6.5,
-          "y": 59.0
+          "x": 34.0,
+          "y": 134.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 6.5,
+          "x": 36.5,
            "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 6.5,
-          "y": 104.0
+          "x": 64.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 31.5,
-          "y": 54.0
+          "x": 64.0,
+          "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 34.0,
-          "y": 59.0
+          "x": 64.0,
+          "y": 139.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 34.0,
-          "y": 64.0
+          "x": 94.0,
+          "y": 19.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 34.0,
-          "y": 134.0
+          "x": 94.0,
+          "y": 179.0
          },
          "params": 1
        }
@@ -396,6 +396,130 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 15.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 25.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#6",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#12",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 195.0
+          },
+          {
+            "x": 65.0,
+            "y": 195.0
+          },
+          {
+            "x": 65.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 55.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#3",
@@ -549,18 +673,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#7",
@@ -708,23 +820,6 @@
          },
          "name": "unnamedWire#29"
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 15.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "NandGate#4",
@@ -874,23 +969,6 @@
          },
          "name": "unnamedWire#39"
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 25.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "NandGate#8",
@@ -1031,18 +1109,6 @@
          "name": "unnamedWire#49",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "NandGate#14",
@@ -1054,72 +1120,6 @@
          },
          "name": "unnamedWire#50",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#6",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#12",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 195.0
-          },
-          {
-            "x": 65.0,
-            "y": 195.0
-          },
-          {
-            "x": 65.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 55.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json

index 424c547..8807f86 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
@@ -256,14 +256,6 @@
            "y": 190.0
          }
        },
-      {
-        "id": "Am2904ShiftInstrDecode",
-        "name": "Am2904ShiftInstrDecode#0",
-        "pos": {
-          "x": 100.0,
-          "y": 495.0
-        }
-      },
        {
          "id": "Am2904TestLogic",
          "name": "Am2904TestLogic#0",
@@ -272,6 +264,14 @@
            "y": 330.0
          }
        },
+      {
+        "id": "Am2904ShiftInstrDecode",
+        "name": "Am2904ShiftInstrDecode#0",
+        "pos": {
+          "x": 100.0,
+          "y": 495.0
+        }
+      },
        {
          "id": "Am2904muSR",
          "name": "Am2904muSR#0",
@@ -298,24 +298,6 @@
          },
          "params": 1
        },
-      {
-        "id": "NandGate",
-        "name": "NandGate#10",
-        "pos": {
-          "x": 455.0,
-          "y": 55.0
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#11",
-        "pos": {
-          "x": 555.0,
-          "y": 235.0
-        },
-        "params": 1
-      },
        {
          "id": "NandGate",
          "name": "NandGate#2",
@@ -388,6 +370,24 @@
          },
          "params": 1
        },
+      {
+        "id": "NandGate",
+        "name": "NandGate#10",
+        "pos": {
+          "x": 455.0,
+          "y": 55.0
+        },
+        "params": 1
+      },
+      {
+        "id": "NandGate",
+        "name": "NandGate#11",
+        "pos": {
+          "x": 555.0,
+          "y": 235.0
+        },
+        "params": 1
+      },
        {
          "id": "Splitter",
          "name": "Splitter#0",
@@ -414,58 +414,58 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#2",
          "pos": {
-          "x": 445.0,
-          "y": 300.0
+          "x": 440.0,
+          "y": 90.0
          },
          "params": {
-          "logicWidth": 4,
+          "logicWidth": 2,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#3",
          "pos": {
-          "x": 455.0,
-          "y": 635.0
+          "x": 465.0,
+          "y": 100.0
          },
          "params": {
-          "logicWidth": 3,
+          "logicWidth": 4,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#4",
          "pos": {
-          "x": 455.0,
-          "y": 710.0
+          "x": 425.0,
+          "y": 150.0
          },
          "params": {
-          "logicWidth": 3,
+          "logicWidth": 4,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#5",
          "pos": {
-          "x": 135.0,
-          "y": 645.0
+          "x": 425.0,
+          "y": 190.0
          },
          "params": {
-          "logicWidth": 3,
+          "logicWidth": 4,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#6",
          "pos": {
-          "x": 310.0,
-          "y": 645.0
+          "x": 320.0,
+          "y": 310.0
          },
          "params": {
            "logicWidth": 3,
@@ -474,170 +474,170 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#7",
          "pos": {
-          "x": 430.0,
-          "y": 535.0
+          "x": 445.0,
+          "y": 340.0
          },
          "params": {
-          "logicWidth": 2,
+          "logicWidth": 4,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#8",
          "pos": {
-          "x": 20.0,
-          "y": 235.0
+          "x": 445.0,
+          "y": 380.0
          },
          "params": {
-          "logicWidth": 6,
-          "orientation": "LEFT"
+          "logicWidth": 4,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#9",
          "pos": {
-          "x": 20.0,
-          "y": 185.0
+          "x": 255.0,
+          "y": 430.0
          },
          "params": {
-          "logicWidth": 5,
-          "orientation": "LEFT"
+          "logicWidth": 4,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#10",
          "pos": {
-          "x": 15.0,
-          "y": 65.0
+          "x": 445.0,
+          "y": 300.0
          },
          "params": {
            "logicWidth": 4,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#11",
          "pos": {
-          "x": 520.0,
-          "y": 90.0
+          "x": 455.0,
+          "y": 635.0
          },
          "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
+          "logicWidth": 3,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#12",
          "pos": {
-          "x": 440.0,
-          "y": 90.0
+          "x": 455.0,
+          "y": 710.0
          },
          "params": {
-          "logicWidth": 2,
+          "logicWidth": 3,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#13",
          "pos": {
-          "x": 20.0,
-          "y": 165.0
+          "x": 135.0,
+          "y": 645.0
          },
          "params": {
-          "logicWidth": 2,
-          "orientation": "LEFT"
+          "logicWidth": 3,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#3",
+        "name": "Splitter#14",
          "pos": {
-          "x": 465.0,
-          "y": 100.0
+          "x": 310.0,
+          "y": 645.0
          },
          "params": {
-          "logicWidth": 4,
+          "logicWidth": 3,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#15",
          "pos": {
-          "x": 425.0,
-          "y": 150.0
+          "x": 430.0,
+          "y": 535.0
          },
          "params": {
-          "logicWidth": 4,
+          "logicWidth": 2,
            "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#5",
+        "name": "Splitter#16",
          "pos": {
-          "x": 425.0,
-          "y": 190.0
+          "x": 20.0,
+          "y": 235.0
          },
          "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
+          "logicWidth": 6,
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#6",
+        "name": "Splitter#17",
          "pos": {
-          "x": 320.0,
-          "y": 310.0
+          "x": 20.0,
+          "y": 185.0
          },
          "params": {
-          "logicWidth": 3,
-          "orientation": "RIGHT"
+          "logicWidth": 5,
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#18",
          "pos": {
-          "x": 445.0,
-          "y": 340.0
+          "x": 15.0,
+          "y": 65.0
          },
          "params": {
            "logicWidth": 4,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#19",
          "pos": {
-          "x": 445.0,
-          "y": 380.0
+          "x": 520.0,
+          "y": 90.0
          },
          "params": {
            "logicWidth": 4,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#20",
          "pos": {
-          "x": 255.0,
-          "y": 430.0
+          "x": 20.0,
+          "y": 165.0
          },
          "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
+          "logicWidth": 2,
+          "orientation": "LEFT"
          }
        },
        {
@@ -732,52 +732,124 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 179.0,
-          "y": 54.0
+          "x": 329.0,
+          "y": 124.0
          },
-        "params": 1
+        "params": 4
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 179.0,
-          "y": 14.0
+          "x": 404.0,
+          "y": 114.0
          },
-        "params": 1
+        "params": 4
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 179.0,
-          "y": 34.0
+          "x": 224.0,
+          "y": 14.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 449.0,
-          "y": 59.0
+          "x": 569.0,
+          "y": 54.0
          },
-        "params": 1
+        "params": 4
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 534.0,
-          "y": 104.0
+          "x": 134.0,
+          "y": 19.0
          },
-        "params": 4
+        "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 319.0,
+          "y": 39.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 319.0,
+          "y": 19.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 319.0,
+          "y": 59.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 179.0,
+          "y": 54.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
+        "pos": {
+          "x": 179.0,
+          "y": 14.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
+        "pos": {
+          "x": 179.0,
+          "y": 34.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
+        "pos": {
+          "x": 449.0,
+          "y": 59.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
+        "pos": {
+          "x": 534.0,
+          "y": 104.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 334.0,
            "y": 174.0
@@ -820,15 +892,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 329.0,
-          "y": 124.0
-        },
-        "params": 4
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -919,15 +982,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 404.0,
-          "y": 114.0
-        },
-        "params": 4
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#30",
@@ -1018,15 +1072,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 224.0,
-          "y": 14.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#40",
@@ -1045,51 +1090,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 569.0,
-          "y": 54.0
-        },
-        "params": 4
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 134.0,
-          "y": 19.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 319.0,
-          "y": 39.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 319.0,
-          "y": 19.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 319.0,
-          "y": 59.0
-        },
-        "params": 1
-      },
        {
          "id": "and",
          "name": "and#0",
@@ -1138,14 +1138,6 @@
            "y": 530.0
          }
        },
-      {
-        "id": "mux1",
-        "name": "mux1#5",
-        "pos": {
-          "x": 445.0,
-          "y": 540.0
-        }
-      },
        {
          "id": "mux1_4",
          "name": "mux1_4#0",
@@ -1162,6 +1154,14 @@
            "y": 135.0
          }
        },
+      {
+        "id": "mux1",
+        "name": "mux1#5",
+        "pos": {
+          "x": 445.0,
+          "y": 540.0
+        }
+      },
        {
          "id": "mux2",
          "name": "mux2#0",
@@ -1279,3914 +1279,3914 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_OVRRET"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O0"
+          "compName": "Am2904muSR#0",
+          "pinName": "OVRRET"
          },
-        "name": "unnamedWire#10",
-        "path": []
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 345.0,
+            "y": 210.0
+          },
+          {
+            "x": 345.0,
+            "y": 155.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
+          "compName": "_submodelinterface",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_4"
+          "compName": "Splitter#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#3",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "Splitter#16",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_1"
+          "compName": "Splitter#0",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_2"
+          "compName": "Splitter#0",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#16",
            "pinName": "O2"
          },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "Splitter#16",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_3"
+          "compName": "Splitter#0",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I0_4"
+          "compName": "Splitter#0",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
+          "compName": "Splitter#16",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#106",
-        "path": [
-          {
-            "x": 330.0,
-            "y": 165.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O0"
+          "compName": "Splitter#0",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_4"
+          "compName": "Splitter#17",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_3"
+          "compName": "Splitter#17",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O1"
+          "compName": "Splitter#0",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#11",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O2"
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_2"
+          "compName": "Splitter#17",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#17",
-          "pinName": "O1"
+          "pinName": "O3"
          },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O7"
+          "pinName": "O9"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "I1_1"
+          "compName": "Splitter#0",
+          "pinName": "O10"
          },
          "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O3"
+          "compName": "Splitter#17",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#16",
            "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "I5-0"
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 435.0,
-            "y": 355.0
-          },
-          {
-            "x": 435.0,
-            "y": 245.0
+            "x": 105.0,
+            "y": 260.0
            },
            {
-            "x": 390.0,
-            "y": 245.0
+            "x": 105.0,
+            "y": 240.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "IN"
+          "compName": "Splitter#17",
+          "pinName": "I"
          },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 535.0,
-            "y": 80.0
+            "x": 75.0,
+            "y": 520.0
+          },
+          {
+            "x": 75.0,
+            "y": 205.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "IOVR"
          },
          "pin2": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "I"
+          "compName": "Splitter#18",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 535.0,
-            "y": 260.0
-          },
-          {
-            "x": 385.0,
-            "y": 260.0
-          },
-          {
-            "x": 385.0,
-            "y": 290.0
-          },
-          {
-            "x": 255.0,
-            "y": 290.0
+            "x": 10.0,
+            "y": 125.0
            },
            {
-            "x": 255.0,
-            "y": 380.0
+            "x": 10.0,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y111"
+          "compName": "_submodelinterface",
+          "pinName": "IN"
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "I111"
+          "compName": "Splitter#18",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#114",
-        "path": []
+        "name": "unnamedWire#18",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 100.0
+          },
+          {
+            "x": 5.0,
+            "y": 85.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux3#0",
-          "pinName": "I110"
+          "compName": "Splitter#18",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y110"
+          "compName": "_submodelinterface",
+          "pinName": "IC"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y101"
+          "compName": "_submodelinterface",
+          "pinName": "IZ"
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "I101"
+          "compName": "Splitter#18",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#116",
-        "path": []
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 50.0
+          },
+          {
+            "x": 5.0,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux3#0",
-          "pinName": "I100"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_CINV"
          },
          "pin2": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y100"
+          "compName": "Am2904muSR#0",
+          "pinName": "CINV"
          },
-        "name": "unnamedWire#117",
-        "path": []
+        "name": "unnamedWire#21",
+        "path": [
+          {
+            "x": 340.0,
+            "y": 220.0
+          },
+          {
+            "x": 340.0,
+            "y": 145.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y011"
+          "compName": "Splitter#18",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "I011"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#118",
-        "path": []
+        "name": "unnamedWire#22",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 80.0
+          },
+          {
+            "x": 105.0,
+            "y": 140.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y010"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "I010"
+          "compName": "Am2904MSR#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#12",
-        "path": []
+        "name": "unnamedWire#24",
+        "path": [
+          {
+            "x": 190.0,
+            "y": 175.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux3#0",
-          "pinName": "I001"
+          "compName": "Am2904MSR#0",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y001"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#120",
-        "path": []
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 300.0,
+            "y": 110.0
+          },
+          {
+            "x": 300.0,
+            "y": 125.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2904TestLogic#0",
-          "pinName": "Y000"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "I000"
+          "compName": "Splitter#4",
+          "pinName": "I"
          },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#11",
-          "pinName": "Y"
+          "compName": "Am2904muSR#0",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 585.0,
-            "y": 245.0
+            "x": 405.0,
+            "y": 105.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "xor#0",
-          "pinName": "B"
+          "compName": "Splitter#5",
+          "pinName": "I"
          },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#28",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "I"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "CT_MUX"
+          "compName": "Am2904MSR#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#29",
          "path": [
            {
-            "x": 210.0,
-            "y": 320.0
+            "x": 255.0,
+            "y": 60.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux3#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#125",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux3#0",
-          "pinName": "S1"
-        },
-        "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#126",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux3#0",
-          "pinName": "S2"
+          "compName": "Am2904muSR#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#127",
-        "path": []
+        "name": "unnamedWire#30",
+        "path": [
+          {
+            "x": 300.0,
+            "y": 60.0
+          },
+          {
+            "x": 300.0,
+            "y": 105.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "CT_EXP"
+          "pinName": "MSR_MUX"
          },
          "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
+          "compName": "Am2904MSR#0",
+          "pinName": "MUX"
          },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#31",
          "path": [
            {
-            "x": 230.0,
-            "y": 285.0
+            "x": 200.0,
+            "y": 160.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux3#0",
-          "pinName": "Y"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "MC_EN"
          },
          "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I0"
+          "compName": "Am2904MSR#0",
+          "pinName": "COVD_EN"
          },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 420.0,
-            "y": 310.0
+            "x": 225.0,
+            "y": 570.0
            },
            {
-            "x": 420.0,
-            "y": 295.0
+            "x": 225.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 80.0
+          },
+          {
+            "x": 265.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
-          "pinName": "O3"
+          "compName": "NandGate#0",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#33",
          "path": []
        },
        {
          "pin1": {
-          "compName": "xor#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "CT_INV"
+          "compName": "NandGate#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#34",
          "path": [
            {
-            "x": 415.0,
-            "y": 275.0
-          },
-          {
-            "x": 415.0,
-            "y": 280.0
-          },
-          {
-            "x": 220.0,
-            "y": 280.0
+            "x": 225.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "xor#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I1"
+          "compName": "_submodelinterface",
+          "pinName": "_CEmu"
          },
-        "name": "unnamedWire#131",
-        "path": [
-          {
-            "x": 515.0,
-            "y": 325.0
-          },
-          {
-            "x": 515.0,
-            "y": 315.0
-          },
-          {
-            "x": 490.0,
-            "y": 315.0
-          },
-          {
-            "x": 490.0,
-            "y": 305.0
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "NandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "I"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "name": "unnamedWire#132",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 135.0
-          }
-        ]
+        "name": "unnamedWire#36",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "NandGate#4",
+          "pinName": "A"
          },
-        "name": "unnamedWire#133",
-        "path": [
-          {
-            "x": 390.0,
-            "y": 175.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#38",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "NandGate#5",
+          "pinName": "A"
          },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#39",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#8",
-          "pinName": "I"
+          "compName": "NandGate#2",
+          "pinName": "A"
          },
-        "name": "unnamedWire#137",
-        "path": [
-          {
-            "x": 385.0,
-            "y": 250.0
-          },
-          {
-            "x": 430.0,
-            "y": 250.0
-          },
-          {
-            "x": 430.0,
-            "y": 395.0
-          }
-        ]
+        "name": "unnamedWire#41",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "OEN"
+          "compName": "NandGate#3",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 240.0,
-            "y": 185.0
-          },
-          {
-            "x": 410.0,
-            "y": 185.0
-          },
-          {
-            "x": 410.0,
-            "y": 80.0
-          },
-          {
-            "x": 485.0,
+            "x": 320.0,
              "y": 80.0
-          },
-          {
-            "x": 485.0,
-            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
+          "compName": "NandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O0"
+          "compName": "Am2904muSR#0",
+          "pinName": "_EOVR"
          },
-        "name": "unnamedWire#139",
-        "path": []
+        "name": "unnamedWire#43",
+        "path": [
+          {
+            "x": 390.0,
+            "y": 85.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
+          "compName": "NandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "O4"
+          "compName": "Am2904muSR#0",
+          "pinName": "_EN"
          },
-        "name": "unnamedWire#14",
-        "path": []
+        "name": "unnamedWire#44",
+        "path": [
+          {
+            "x": 380.0,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O1"
+          "compName": "Am2904muSR#0",
+          "pinName": "_EC"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O12"
+          "compName": "NandGate#5",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#140",
-        "path": []
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 370.0,
+            "y": 45.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "I"
+          "compName": "NandGate#4",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "I12-11"
+          "compName": "Am2904muSR#0",
+          "pinName": "_EZ"
          },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#46",
          "path": [
            {
-            "x": 105.0,
-            "y": 170.0
-          },
-          {
-            "x": 105.0,
-            "y": 220.0
+            "x": 360.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "C0_MUX"
+          "compName": "NandGate#4",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "I"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_WEZ"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 250.0,
-            "y": 445.0
+            "x": 305.0,
+            "y": 30.0
+          },
+          {
+            "x": 305.0,
+            "y": 230.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#1",
-          "pinName": "I1"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_WEC"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "NandGate#5",
+          "pinName": "B"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#48",
          "path": [
            {
-            "x": 270.0,
-            "y": 500.0
+            "x": 310.0,
+            "y": 240.0
            },
            {
-            "x": 270.0,
-            "y": 515.0
+            "x": 310.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Splitter#1",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "mu"
+          "compName": "_submodelinterface",
+          "pinName": "YZ"
          },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#49",
          "path": [
            {
-            "x": 185.0,
-            "y": 170.0
+            "x": 595.0,
+            "y": 40.0
            },
            {
-            "x": 185.0,
-            "y": 100.0
+            "x": 595.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#1",
-          "pinName": "I0"
+          "compName": "_submodelinterface",
+          "pinName": "YC"
          },
          "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#1",
            "pinName": "O2"
          },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#50",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "YN"
+        },
+        "name": "unnamedWire#51",
          "path": [
            {
-            "x": 265.0,
-            "y": 490.0
-          },
-          {
-            "x": 265.0,
-            "y": 510.0
-          },
-          {
-            "x": 480.0,
-            "y": 510.0
-          },
-          {
-            "x": 480.0,
-            "y": 350.0
-          },
-          {
-            "x": 470.0,
-            "y": 350.0
+            "x": 595.0,
+            "y": 60.0
            },
            {
-            "x": 470.0,
-            "y": 310.0
+            "x": 595.0,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O1"
+          "compName": "_submodelinterface",
+          "pinName": "YOVR"
          },
          "pin2": {
-          "compName": "mux1#1",
-          "pinName": "S0"
+          "compName": "Splitter#1",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#52",
          "path": [
            {
-            "x": 270.0,
-            "y": 450.0
+            "x": 590.0,
+            "y": 100.0
            },
            {
-            "x": 270.0,
-            "y": 480.0
+            "x": 590.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#1",
-          "pinName": "Y"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "xor#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "xor#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O0"
+          "compName": "Am2904MSR#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#54",
          "path": [
            {
-            "x": 290.0,
-            "y": 470.0
+            "x": 570.0,
+            "y": 50.0
            },
            {
-            "x": 290.0,
-            "y": 460.0
+            "x": 415.0,
+            "y": 50.0
+          },
+          {
+            "x": 415.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "NandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#55",
+        "path": [
+          {
+            "x": 135.0,
+            "y": 10.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#1",
+          "pinName": "B"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "_CEM"
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "I5-0"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#57",
          "path": [
            {
-            "x": 105.0,
-            "y": 260.0
-          },
-          {
-            "x": 105.0,
-            "y": 240.0
+            "x": 25.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "NandGate#2",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "mux1#2",
-          "pinName": "S0"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_WEN"
          },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#58",
          "path": [
            {
-            "x": 350.0,
-            "y": 450.0
+            "x": 315.0,
+            "y": 70.0
+          },
+          {
+            "x": 315.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "xor#2",
-          "pinName": "Y"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "muSR_WEOVR"
          },
          "pin2": {
-          "compName": "mux1#2",
-          "pinName": "I1"
+          "compName": "NandGate#3",
+          "pinName": "B"
          },
-        "name": "unnamedWire#151",
-        "path": []
+        "name": "unnamedWire#59",
+        "path": [
+          {
+            "x": 320.0,
+            "y": 260.0
+          },
+          {
+            "x": 320.0,
+            "y": 90.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1#2",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Cx"
+          "compName": "NandGate#6",
+          "pinName": "A"
          },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#60",
          "path": [
            {
-            "x": 300.0,
-            "y": 460.0
-          },
-          {
-            "x": 300.0,
-            "y": 465.0
-          },
-          {
-            "x": 240.0,
-            "y": 465.0
-          },
-          {
-            "x": 240.0,
-            "y": 425.0
+            "x": 180.0,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#2",
-          "pinName": "Y"
+          "compName": "NandGate#7",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "mux1#3",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#61",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#3",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "NandGate#8",
+          "pinName": "A"
          },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#62",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#3",
-          "pinName": "S0"
+          "compName": "NandGate#9",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#63",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#3",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "C0"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "name": "unnamedWire#156",
-        "path": [
-          {
-            "x": 560.0,
-            "y": 430.0
-          },
-          {
-            "x": 560.0,
-            "y": 425.0
-          }
-        ]
+        "name": "unnamedWire#64",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#4",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#157",
-        "path": [
-          {
-            "x": 485.0,
-            "y": 555.0
-          },
-          {
-            "x": 485.0,
-            "y": 620.0
-          }
-        ]
+        "name": "unnamedWire#65",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "NandGate#6",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SIOn"
+          "compName": "Am2904MSR#0",
+          "pinName": "_EOVR"
          },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#66",
          "path": [
            {
-            "x": 55.0,
-            "y": 620.0
-          },
-          {
-            "x": 55.0,
-            "y": 600.0
+            "x": 245.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "Am2904MSR#0",
+          "pinName": "_EN"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SIO0"
+          "compName": "NandGate#7",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#67",
          "path": [
            {
-            "x": 580.0,
-            "y": 600.0
+            "x": 235.0,
+            "y": 60.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "I"
+          "compName": "NandGate#8",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "I"
+          "compName": "Am2904MSR#0",
+          "pinName": "_EC"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#68",
          "path": [
            {
-            "x": 75.0,
-            "y": 520.0
-          },
-          {
-            "x": 75.0,
-            "y": 205.0
+            "x": 225.0,
+            "y": 40.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#5",
-          "pinName": "I1"
+          "compName": "NandGate#9",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "Am2904MSR#0",
+          "pinName": "_EZ"
          },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#69",
          "path": [
            {
-            "x": 435.0,
-            "y": 565.0
+            "x": 215.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "NandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QIOn"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
-        "name": "unnamedWire#161",
-        "path": [
-          {
-            "x": 435.0,
-            "y": 625.0
-          }
-        ]
+        "name": "unnamedWire#70",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "OUT"
+          "compName": "not4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "NandGate#9",
+          "pinName": "B"
          },
-        "name": "unnamedWire#162",
+        "name": "unnamedWire#71",
          "path": [
            {
-            "x": 580.0,
-            "y": 635.0
+            "x": 170.0,
+            "y": 45.0
+          },
+          {
+            "x": 170.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
-        },
-        "name": "unnamedWire#163",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "NandGate#8",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "not4#0",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#164",
-        "path": []
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 45.0
+          },
+          {
+            "x": 175.0,
+            "y": 55.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "IN"
+          "compName": "not4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "mux2#0",
-          "pinName": "Y"
+          "compName": "NandGate#7",
+          "pinName": "B"
          },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#73",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "SIO0_MUX"
+          "compName": "not4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "I"
+          "compName": "NandGate#6",
+          "pinName": "B"
          },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#74",
          "path": [
            {
-            "x": 165.0,
-            "y": 500.0
-          },
-          {
-            "x": 165.0,
-            "y": 575.0
-          },
-          {
-            "x": 450.0,
-            "y": 575.0
+            "x": 175.0,
+            "y": 75.0
            },
            {
-            "x": 450.0,
-            "y": 645.0
+            "x": 175.0,
+            "y": 85.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
+          "compName": "not4#0",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "mux2#0",
-          "pinName": "I00"
+          "compName": "_submodelinterface",
+          "pinName": "_EZ"
          },
-        "name": "unnamedWire#167",
-        "path": []
+        "name": "unnamedWire#75",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 45.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O2"
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
          },
          "pin2": {
-          "compName": "mux2#0",
-          "pinName": "S1"
+          "compName": "not4#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#168",
-        "path": []
+        "name": "unnamedWire#76",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 55.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux2#0",
-          "pinName": "S0"
+          "compName": "not4#0",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
          },
-        "name": "unnamedWire#169",
-        "path": []
+        "name": "unnamedWire#77",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "IOVR"
+          "pinName": "_EOVR"
          },
          "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O0"
+          "compName": "not4#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 10.0,
-            "y": 125.0
-          },
-          {
-            "x": 10.0,
-            "y": 95.0
+            "x": 125.0,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "TriStateBuffer#0",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#170",
-        "path": []
+        "name": "unnamedWire#79",
+        "path": [
+          {
+            "x": 570.0,
+            "y": 80.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux2#0",
-          "pinName": "I10"
+          "compName": "NandGate#10",
+          "pinName": "A"
          },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#80",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "O2"
+          "compName": "NandGate#10",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#81",
          "path": [
            {
-            "x": 485.0,
-            "y": 390.0
-          },
-          {
-            "x": 485.0,
-            "y": 515.0
+            "x": 450.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "_OEY"
          },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#82",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O1"
+          "compName": "NandGate#10",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "mux2#1",
-          "pinName": "S0"
+          "compName": "and#0",
+          "pinName": "A"
          },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#83",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux2#1",
-          "pinName": "S1"
+          "compName": "and#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O2"
+          "compName": "TriStateBuffer#0",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#175",
-        "path": []
+        "name": "unnamedWire#84",
+        "path": [
+          {
+            "x": 550.0,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O0"
+          "compName": "mux1_4#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I00"
+          "compName": "mux1_4#0",
+          "pinName": "I1_1"
          },
-        "name": "unnamedWire#176",
+        "name": "unnamedWire#85",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux2#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#177",
-        "path": [
-          {
-            "x": 545.0,
-            "y": 710.0
-          },
-          {
-            "x": 545.0,
-            "y": 660.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "QIO0_MUX"
-        },
-        "name": "unnamedWire#178",
-        "path": [
-          {
-            "x": 445.0,
-            "y": 720.0
-          },
-          {
-            "x": 445.0,
-            "y": 580.0
-          },
-          {
-            "x": 175.0,
-            "y": 580.0
-          },
-          {
-            "x": 175.0,
-            "y": 520.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "mux1_4#0",
+          "pinName": "I1_2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#179",
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#18",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 100.0
-          },
-          {
-            "x": 5.0,
-            "y": 85.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I10"
+          "compName": "mux1_4#0",
+          "pinName": "I1_3"
          },
-        "name": "unnamedWire#180",
-        "path": [
-          {
-            "x": 435.0,
-            "y": 750.0
-          }
-        ]
+        "name": "unnamedWire#87",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "mux1_4#0",
+          "pinName": "I1_4"
          },
          "pin2": {
-          "compName": "mux2#0",
-          "pinName": "I01"
+          "compName": "mux1_4#1",
+          "pinName": "Y4"
          },
-        "name": "unnamedWire#181",
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#19",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I11"
+          "compName": "mux1_4#0",
+          "pinName": "Y4"
          },
-        "name": "unnamedWire#182",
-        "path": [
-          {
-            "x": 440.0,
-            "y": 760.0
-          }
-        ]
+        "name": "unnamedWire#89",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O0"
+          "compName": "mux1_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#19",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#183",
+        "name": "unnamedWire#90",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#19",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "S0"
+          "compName": "mux1_4#0",
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#184",
+        "name": "unnamedWire#91",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "mux1_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#19",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#185",
+        "name": "unnamedWire#92",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "I000"
+          "compName": "Splitter#19",
+          "pinName": "I"
          },
-        "name": "unnamedWire#186",
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux3#1",
-          "pinName": "I001"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "Y_MUX"
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
-        "name": "unnamedWire#187",
+        "name": "unnamedWire#94",
          "path": [
            {
-            "x": 150.0,
-            "y": 685.0
+            "x": 190.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "I"
+          "compName": "Splitter#2",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "SIOn_MUX"
+          "compName": "mux1_4#1",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#188",
+        "name": "unnamedWire#95",
          "path": [
            {
-            "x": 130.0,
-            "y": 655.0
+            "x": 455.0,
+            "y": 100.0
            },
            {
-            "x": 130.0,
-            "y": 580.0
+            "x": 455.0,
+            "y": 130.0
            },
            {
-            "x": 170.0,
-            "y": 580.0
+            "x": 435.0,
+            "y": 130.0
            },
            {
-            "x": 170.0,
-            "y": 510.0
+            "x": 435.0,
+            "y": 140.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O2"
+          "compName": "Splitter#2",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "S2"
+          "compName": "mux1_4#0",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#189",
+        "name": "unnamedWire#96",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "O2"
+          "compName": "Splitter#3",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IC"
+          "compName": "mux1_4#0",
+          "pinName": "I0_1"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#97",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O1"
+          "compName": "Splitter#3",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "S1"
+          "compName": "mux1_4#0",
+          "pinName": "I0_2"
          },
-        "name": "unnamedWire#190",
+        "name": "unnamedWire#98",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux3#1",
-          "pinName": "I010"
+          "compName": "mux1_4#0",
+          "pinName": "I0_3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "Splitter#3",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#191",
-        "path": [
-          {
-            "x": 105.0,
-            "y": 695.0
-          },
-          {
-            "x": 105.0,
-            "y": 610.0
-          }
-        ]
+        "name": "unnamedWire#99",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Splitter#3",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "I011"
+          "compName": "mux1_4#0",
+          "pinName": "I0_4"
          },
-        "name": "unnamedWire#192",
-        "path": [
-          {
-            "x": 110.0,
-            "y": 615.0
-          },
-          {
-            "x": 110.0,
-            "y": 705.0
-          }
-        ]
+        "name": "unnamedWire#100",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux3#1",
-          "pinName": "I100"
+          "compName": "Splitter#3",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#193",
-        "path": [
-          {
-            "x": 115.0,
-            "y": 715.0
-          },
-          {
-            "x": 115.0,
-            "y": 595.0
-          }
-        ]
+        "name": "unnamedWire#101",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "xor#3",
-          "pinName": "Y"
+          "compName": "Splitter#4",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "I111"
+          "compName": "mux1_4#1",
+          "pinName": "I0_1"
          },
-        "name": "unnamedWire#194",
+        "name": "unnamedWire#102",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "mux1_4#1",
+          "pinName": "I0_2"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#103",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "mux1_4#1",
+          "pinName": "I0_3"
+        },
+        "name": "unnamedWire#104",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1_4#1",
+          "pinName": "I0_4"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#105",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#195",
+        "name": "unnamedWire#106",
          "path": [
            {
-            "x": 465.0,
-            "y": 495.0
-          },
-          {
-            "x": 345.0,
-            "y": 495.0
-          },
-          {
-            "x": 345.0,
-            "y": 585.0
+            "x": 330.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux3#1",
-          "pinName": "I110"
+          "compName": "Splitter#5",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "mux1_4#1",
+          "pinName": "I1_4"
+        },
+        "name": "unnamedWire#107",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1_4#1",
+          "pinName": "I1_3"
+        },
+        "pin2": {
+          "compName": "Splitter#5",
            "pinName": "O1"
          },
-        "name": "unnamedWire#196",
-        "path": [
-          {
-            "x": 125.0,
-            "y": 735.0
-          },
-          {
-            "x": 125.0,
-            "y": 605.0
-          },
-          {
-            "x": 350.0,
-            "y": 605.0
-          },
-          {
-            "x": 350.0,
-            "y": 500.0
-          },
-          {
-            "x": 470.0,
-            "y": 500.0
-          },
-          {
-            "x": 470.0,
-            "y": 360.0
-          }
-        ]
+        "name": "unnamedWire#108",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux2#2",
-          "pinName": "I01"
+          "compName": "Splitter#5",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "mux1_4#1",
+          "pinName": "I1_2"
          },
-        "name": "unnamedWire#197",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 675.0
-          }
-        ]
+        "name": "unnamedWire#109",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux2#2",
-          "pinName": "I10"
+          "compName": "mux1_4#1",
+          "pinName": "I1_1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#198",
-        "path": [
-          {
-            "x": 295.0,
-            "y": 685.0
-          }
-        ]
+        "name": "unnamedWire#110",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "Splitter#7",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux3#1",
-          "pinName": "I101"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
-        "name": "unnamedWire#199",
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 120.0,
-            "y": 585.0
+            "x": 435.0,
+            "y": 355.0
            },
            {
-            "x": 120.0,
-            "y": 725.0
+            "x": 435.0,
+            "y": 245.0
+          },
+          {
+            "x": 390.0,
+            "y": 245.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_OVRRET"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "OVRRET"
+          "compName": "TriStateBuffer#0",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 345.0,
-            "y": 210.0
-          },
-          {
-            "x": 345.0,
-            "y": 155.0
+            "x": 535.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IZ"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O3"
+          "compName": "Am2904TestLogic#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 5.0,
-            "y": 50.0
+            "x": 535.0,
+            "y": 260.0
            },
            {
-            "x": 5.0,
-            "y": 65.0
+            "x": 385.0,
+            "y": 260.0
+          },
+          {
+            "x": 385.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y111"
          },
          "pin2": {
-          "compName": "xor#1",
-          "pinName": "B"
+          "compName": "mux3#0",
+          "pinName": "I111"
          },
-        "name": "unnamedWire#200",
-        "path": [
-          {
-            "x": 465.0,
-            "y": 335.0
-          }
-        ]
+        "name": "unnamedWire#114",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "mux3#0",
+          "pinName": "I110"
          },
          "pin2": {
-          "compName": "mux2#2",
-          "pinName": "I11"
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y110"
          },
-        "name": "unnamedWire#201",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 695.0
-          }
-        ]
+        "name": "unnamedWire#115",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y101"
          },
          "pin2": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "OEn"
+          "compName": "mux3#0",
+          "pinName": "I101"
          },
-        "name": "unnamedWire#202",
-        "path": [
-          {
-            "x": 250.0,
-            "y": 540.0
-          }
-        ]
+        "name": "unnamedWire#116",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "OE0"
+          "compName": "mux3#0",
+          "pinName": "I100"
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y100"
          },
-        "name": "unnamedWire#203",
-        "path": [
-          {
-            "x": 390.0,
-            "y": 550.0
-          },
-          {
-            "x": 390.0,
-            "y": 585.0
-          },
-          {
-            "x": 560.0,
-            "y": 585.0
-          }
-        ]
+        "name": "unnamedWire#117",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y011"
          },
          "pin2": {
-          "compName": "xor#1",
-          "pinName": "A"
+          "compName": "mux3#0",
+          "pinName": "I011"
          },
-        "name": "unnamedWire#204",
-        "path": [
-          {
-            "x": 460.0,
-            "y": 325.0
-          }
-        ]
+        "name": "unnamedWire#118",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y010"
          },
          "pin2": {
-          "compName": "xor#3",
-          "pinName": "A"
+          "compName": "mux3#0",
+          "pinName": "I010"
          },
-        "name": "unnamedWire#205",
-        "path": [
-          {
-            "x": 460.0,
-            "y": 490.0
-          },
-          {
-            "x": 340.0,
-            "y": 490.0
-          },
-          {
-            "x": 340.0,
-            "y": 600.0
-          },
-          {
-            "x": 100.0,
-            "y": 600.0
-          },
-          {
-            "x": 100.0,
-            "y": 745.0
-          }
-        ]
+        "name": "unnamedWire#119",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "xor#3",
-          "pinName": "B"
+          "compName": "mux3#0",
+          "pinName": "I001"
          },
          "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "O0"
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y001"
          },
-        "name": "unnamedWire#206",
+        "name": "unnamedWire#120",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904TestLogic#0",
+          "pinName": "Y000"
+        },
+        "pin2": {
+          "compName": "mux3#0",
+          "pinName": "I000"
+        },
+        "name": "unnamedWire#121",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#11",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "TriStateBuffer#5",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#122",
          "path": [
            {
-            "x": 95.0,
-            "y": 755.0
-          },
-          {
-            "x": 95.0,
-            "y": 590.0
-          },
-          {
-            "x": 355.0,
-            "y": 590.0
-          },
-          {
-            "x": 355.0,
-            "y": 505.0
-          },
-          {
-            "x": 475.0,
-            "y": 505.0
-          },
-          {
-            "x": 475.0,
-            "y": 370.0
+            "x": 585.0,
+            "y": 245.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux2#2",
+          "compName": "mux1#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "IN"
+          "compName": "xor#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#207",
+        "name": "unnamedWire#123",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O2"
+          "compName": "Splitter#6",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "mux2#2",
-          "pinName": "S1"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "CT_MUX"
          },
-        "name": "unnamedWire#208",
+        "name": "unnamedWire#124",
+        "path": [
+          {
+            "x": 210.0,
+            "y": 320.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#6",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "mux3#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#125",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
+          "compName": "mux3#0",
+          "pinName": "S1"
+        },
+        "pin2": {
+          "compName": "Splitter#6",
            "pinName": "O1"
          },
+        "name": "unnamedWire#126",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#6",
+          "pinName": "O2"
+        },
          "pin2": {
-          "compName": "mux2#2",
-          "pinName": "S0"
+          "compName": "mux3#0",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#209",
+        "name": "unnamedWire#127",
          "path": []
        },
        {
          "pin1": {
            "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_CINV"
+          "pinName": "CT_EXP"
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "CINV"
+          "compName": "mux1#0",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#128",
          "path": [
            {
-            "x": 340.0,
-            "y": 220.0
-          },
-          {
-            "x": 340.0,
-            "y": 145.0
+            "x": 230.0,
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "I"
+          "compName": "mux3#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "QIOn_MUX"
+          "compName": "mux1#0",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#210",
+        "name": "unnamedWire#129",
          "path": [
            {
-            "x": 305.0,
-            "y": 655.0
+            "x": 420.0,
+            "y": 310.0
            },
            {
-            "x": 305.0,
-            "y": 530.0
+            "x": 420.0,
+            "y": 295.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O0"
+          "compName": "xor#0",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "mux2#2",
-          "pinName": "I00"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "CT_INV"
          },
-        "name": "unnamedWire#211",
-        "path": []
+        "name": "unnamedWire#130",
+        "path": [
+          {
+            "x": 415.0,
+            "y": 275.0
+          },
+          {
+            "x": 415.0,
+            "y": 280.0
+          },
+          {
+            "x": 220.0,
+            "y": 280.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "mux3#1",
+          "compName": "xor#1",
            "pinName": "Y"
          },
-        "name": "unnamedWire#212",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_SE"
-        },
          "pin2": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "_SE"
+          "compName": "mux1#0",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#213",
-        "path": []
+        "name": "unnamedWire#131",
+        "path": [
+          {
+            "x": 515.0,
+            "y": 325.0
+          },
+          {
+            "x": 515.0,
+            "y": 315.0
+          },
+          {
+            "x": 490.0,
+            "y": 315.0
+          },
+          {
+            "x": 490.0,
+            "y": 305.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "Am2904muSR#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#214",
-        "path": []
+        "name": "unnamedWire#132",
+        "path": [
+          {
+            "x": 335.0,
+            "y": 135.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#33",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "name": "unnamedWire#215",
+        "name": "unnamedWire#133",
          "path": [
            {
-            "x": 575.0,
-            "y": 620.0
-          },
-          {
-            "x": 575.0,
-            "y": 645.0
-          },
-          {
-            "x": 560.0,
-            "y": 645.0
+            "x": 390.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#7",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "M"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
-        "name": "unnamedWire#216",
+        "name": "unnamedWire#134",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "Splitter#8",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#217",
-        "path": [
-          {
-            "x": 405.0,
-            "y": 240.0
-          },
-          {
-            "x": 440.0,
-            "y": 240.0
-          },
-          {
-            "x": 440.0,
-            "y": 315.0
-          }
-        ]
+        "name": "unnamedWire#135",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#32",
            "pinName": ""
          },
-        "name": "unnamedWire#218",
+        "name": "unnamedWire#136",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "EN"
+          "compName": "Splitter#8",
+          "pinName": "I"
          },
-        "name": "unnamedWire#219",
+        "name": "unnamedWire#137",
          "path": [
            {
-            "x": 410.0,
-            "y": 630.0
+            "x": 385.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 395.0
            }
          ]
        },
        {
-        "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "I"
+        "pin1": {
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "OEN"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "and#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#138",
          "path": [
            {
-            "x": 105.0,
+            "x": 240.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
              "y": 80.0
            },
            {
-            "x": 105.0,
-            "y": 140.0
+            "x": 485.0,
+            "y": 80.0
+          },
+          {
+            "x": 485.0,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+          "compName": "Splitter#20",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#220",
-        "path": [
-          {
-            "x": 440.0,
-            "y": 595.0
-          }
-        ]
+        "name": "unnamedWire#139",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#5",
-          "pinName": "Y"
+          "compName": "Splitter#20",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux1#4",
-          "pinName": "I0"
+          "compName": "Splitter#0",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#221",
+        "name": "unnamedWire#140",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1#4",
-          "pinName": "Y"
+          "compName": "Splitter#20",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "COVD_V"
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "I12-11"
          },
-        "name": "unnamedWire#222",
+        "name": "unnamedWire#141",
          "path": [
            {
-            "x": 530.0,
-            "y": 535.0
-          },
-          {
-            "x": 530.0,
-            "y": 525.0
-          },
-          {
-            "x": 230.0,
-            "y": 525.0
-          },
-          {
-            "x": 230.0,
-            "y": 310.0
-          },
-          {
-            "x": 295.0,
-            "y": 310.0
-          },
-          {
-            "x": 295.0,
-            "y": 85.0
+            "x": 105.0,
+            "y": 170.0
            },
            {
-            "x": 275.0,
-            "y": 85.0
+            "x": 105.0,
+            "y": 220.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Am2904RegCTInstrDecode#0",
+          "pinName": "C0_MUX"
          },
          "pin2": {
-          "compName": "TriStateBuffer#2",
-          "pinName": "OUT"
+          "compName": "Splitter#9",
+          "pinName": "I"
          },
-        "name": "unnamedWire#223",
+        "name": "unnamedWire#142",
          "path": [
            {
-            "x": 265.0,
-            "y": 645.0
+            "x": 250.0,
+            "y": 445.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "OUT"
+          "compName": "mux1#1",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "name": "unnamedWire#224",
+        "name": "unnamedWire#143",
          "path": [
            {
-            "x": 585.0,
-            "y": 660.0
+            "x": 270.0,
+            "y": 500.0
+          },
+          {
+            "x": 270.0,
+            "y": 515.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "MC_MUX"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#15",
-          "pinName": "I"
+          "compName": "Am2904MSR#0",
+          "pinName": "mu"
          },
-        "name": "unnamedWire#226",
+        "name": "unnamedWire#144",
          "path": [
            {
-            "x": 410.0,
-            "y": 560.0
+            "x": 185.0,
+            "y": 170.0
            },
            {
-            "x": 410.0,
-            "y": 540.0
+            "x": 185.0,
+            "y": 100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O0"
+          "compName": "mux1#1",
+          "pinName": "I0"
          },
          "pin2": {
-          "compName": "mux1#5",
-          "pinName": "S0"
+          "compName": "Splitter#10",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#227",
-        "path": []
+        "name": "unnamedWire#145",
+        "path": [
+          {
+            "x": 265.0,
+            "y": 490.0
+          },
+          {
+            "x": 265.0,
+            "y": 510.0
+          },
+          {
+            "x": 480.0,
+            "y": 510.0
+          },
+          {
+            "x": 480.0,
+            "y": 350.0
+          },
+          {
+            "x": 470.0,
+            "y": 350.0
+          },
+          {
+            "x": 470.0,
+            "y": 310.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux1#4",
+          "compName": "mux1#1",
            "pinName": "S0"
          },
-        "name": "unnamedWire#228",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux2#0",
-          "pinName": "I11"
-        },
-        "name": "unnamedWire#229",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#23",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I01"
-        },
-        "name": "unnamedWire#230",
+        "name": "unnamedWire#146",
          "path": [
            {
-            "x": 430.0,
-            "y": 740.0
+            "x": 270.0,
+            "y": 450.0
+          },
+          {
+            "x": 270.0,
+            "y": 480.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "mux1#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "xor#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#231",
+        "name": "unnamedWire#147",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "xor#2",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "OUT"
+          "compName": "Splitter#9",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#232",
-        "path": []
+        "name": "unnamedWire#148",
+        "path": [
+          {
+            "x": 290.0,
+            "y": 470.0
+          },
+          {
+            "x": 290.0,
+            "y": 460.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "NandGate#11",
-          "pinName": "A"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
-        "name": "unnamedWire#233",
+        "name": "unnamedWire#149",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#11",
-          "pinName": "B"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "mux1#2",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#234",
+        "name": "unnamedWire#150",
          "path": [
            {
-            "x": 550.0,
-            "y": 250.0
+            "x": 350.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "xor#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "mux1#2",
+          "pinName": "I1"
+        },
+        "name": "unnamedWire#151",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1#2",
+          "pinName": "I0"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "_OECT"
+          "pinName": "Cx"
          },
-        "name": "unnamedWire#235",
+        "name": "unnamedWire#152",
          "path": [
            {
-            "x": 550.0,
-            "y": 215.0
+            "x": 300.0,
+            "y": 460.0
            },
            {
-            "x": 565.0,
-            "y": 215.0
+            "x": 300.0,
+            "y": 465.0
            },
            {
-            "x": 565.0,
-            "y": 25.0
+            "x": 240.0,
+            "y": 465.0
            },
            {
-            "x": 550.0,
-            "y": 25.0
+            "x": 240.0,
+            "y": 425.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "OUT"
+          "compName": "mux1#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "CT"
+          "compName": "mux1#3",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#236",
+        "name": "unnamedWire#153",
          "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "IN"
+          "compName": "mux1#3",
+          "pinName": "I0"
          },
          "pin2": {
-          "compName": "xor#0",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#237",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "mux1#5",
-          "pinName": "I0"
-        },
-        "name": "unnamedWire#238",
-        "path": [
-          {
-            "x": 430.0,
-            "y": 555.0
-          }
-        ]
+        "name": "unnamedWire#154",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
+          "compName": "mux1#3",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#239",
+        "name": "unnamedWire#155",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "mux1#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "C0"
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#156",
          "path": [
            {
-            "x": 190.0,
-            "y": 175.0
+            "x": 560.0,
+            "y": 430.0
+          },
+          {
+            "x": 560.0,
+            "y": 425.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QIO0"
-        },
-        "name": "unnamedWire#240",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#41",
-          "pinName": ""
+          "compName": "mux1#4",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
-        "name": "unnamedWire#242",
+        "name": "unnamedWire#157",
          "path": [
            {
-            "x": 585.0,
-            "y": 615.0
+            "x": 485.0,
+            "y": 555.0
+          },
+          {
+            "x": 485.0,
+            "y": 620.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904MSR#0",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "SIOn"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#158",
          "path": [
            {
-            "x": 300.0,
-            "y": 110.0
+            "x": 55.0,
+            "y": 620.0
            },
            {
-            "x": 300.0,
-            "y": 125.0
+            "x": 55.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#38",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "SIO0"
          },
-        "name": "unnamedWire#26",
-        "path": []
+        "name": "unnamedWire#159",
+        "path": [
+          {
+            "x": 580.0,
+            "y": 600.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Am2904muSR#0",
-          "pinName": "Q"
+          "compName": "mux1#5",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#41",
            "pinName": ""
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#160",
          "path": [
            {
-            "x": 405.0,
-            "y": 105.0
+            "x": 435.0,
+            "y": 565.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "QIOn"
          },
-        "name": "unnamedWire#28",
-        "path": []
+        "name": "unnamedWire#161",
+        "path": [
+          {
+            "x": 435.0,
+            "y": 625.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "TriStateBuffer#3",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "C"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
          },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#162",
          "path": [
            {
-            "x": 255.0,
-            "y": 60.0
+            "x": 580.0,
+            "y": 635.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#163",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#41",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "C"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
-        "name": "unnamedWire#30",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 60.0
-          },
-          {
-            "x": 300.0,
-            "y": 105.0
-          }
-        ]
+        "name": "unnamedWire#164",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "MSR_MUX"
+          "compName": "TriStateBuffer#3",
+          "pinName": "IN"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "MUX"
+          "compName": "mux2#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#31",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 160.0
-          }
-        ]
+        "name": "unnamedWire#165",
+        "path": []
        },
        {
          "pin1": {
            "compName": "Am2904ShiftInstrDecode#0",
-          "pinName": "MC_EN"
+          "pinName": "SIO0_MUX"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "COVD_EN"
+          "compName": "Splitter#11",
+          "pinName": "I"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#166",
          "path": [
            {
-            "x": 225.0,
-            "y": 570.0
-          },
-          {
-            "x": 225.0,
-            "y": 305.0
+            "x": 165.0,
+            "y": 500.0
            },
            {
-            "x": 290.0,
-            "y": 305.0
+            "x": 165.0,
+            "y": 575.0
            },
            {
-            "x": 290.0,
-            "y": 80.0
+            "x": 450.0,
+            "y": 575.0
            },
            {
-            "x": 265.0,
-            "y": 80.0
+            "x": 450.0,
+            "y": 645.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "A"
+          "compName": "Splitter#11",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "mux2#0",
+          "pinName": "I00"
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#167",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#11",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "mux2#0",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#34",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#168",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "mux2#0",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEmu"
+          "compName": "Splitter#11",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#169",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#170",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#4",
-          "pinName": "A"
+          "compName": "mux2#0",
+          "pinName": "I10"
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#171",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#8",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "name": "unnamedWire#38",
-        "path": []
+        "name": "unnamedWire#172",
+        "path": [
+          {
+            "x": 485.0,
+            "y": 390.0
+          },
+          {
+            "x": 485.0,
+            "y": 515.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "A"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#173",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "compName": "Splitter#12",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O0"
+          "compName": "mux2#1",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#174",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "mux2#1",
+          "pinName": "S1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "Splitter#12",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#175",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "Splitter#12",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
+          "compName": "mux2#1",
+          "pinName": "I00"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#176",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "A"
+          "compName": "mux2#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "TriStateBuffer#4",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#177",
          "path": [
            {
-            "x": 320.0,
-            "y": 80.0
+            "x": 545.0,
+            "y": 710.0
+          },
+          {
+            "x": 545.0,
+            "y": 660.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
+          "compName": "Splitter#12",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "_EOVR"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "QIO0_MUX"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#178",
          "path": [
            {
-            "x": 390.0,
-            "y": 85.0
+            "x": 445.0,
+            "y": 720.0
+          },
+          {
+            "x": 445.0,
+            "y": 580.0
+          },
+          {
+            "x": 175.0,
+            "y": 580.0
+          },
+          {
+            "x": 175.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#36",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "_EN"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
-        "name": "unnamedWire#44",
-        "path": [
-          {
-            "x": 380.0,
-            "y": 65.0
-          }
-        ]
+        "name": "unnamedWire#179",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904muSR#0",
-          "pinName": "_EC"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "Y"
+          "compName": "mux2#1",
+          "pinName": "I10"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#180",
          "path": [
            {
-            "x": 370.0,
-            "y": 45.0
+            "x": 435.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#4",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904muSR#0",
-          "pinName": "_EZ"
+          "compName": "mux2#0",
+          "pinName": "I01"
          },
-        "name": "unnamedWire#46",
-        "path": [
-          {
-            "x": 360.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#181",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#4",
-          "pinName": "B"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_WEZ"
+          "compName": "mux2#1",
+          "pinName": "I11"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#182",
          "path": [
            {
-            "x": 305.0,
-            "y": 30.0
-          },
-          {
-            "x": 305.0,
-            "y": 230.0
+            "x": 440.0,
+            "y": 760.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_WEC"
+          "compName": "Splitter#13",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "B"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#48",
-        "path": [
-          {
-            "x": 310.0,
-            "y": 240.0
-          },
-          {
-            "x": 310.0,
-            "y": 50.0
-          }
-        ]
+        "name": "unnamedWire#183",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "YZ"
+          "compName": "mux3#1",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#49",
-        "path": [
-          {
-            "x": 595.0,
-            "y": 40.0
-          },
-          {
-            "x": 595.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#184",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#185",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "YC"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
+          "compName": "mux3#1",
+          "pinName": "I000"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#186",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "mux3#1",
+          "pinName": "I001"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "YN"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#187",
          "path": [
            {
-            "x": 595.0,
-            "y": 60.0
-          },
-          {
-            "x": 595.0,
-            "y": 75.0
+            "x": 150.0,
+            "y": 685.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "YOVR"
+          "compName": "Splitter#13",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "SIOn_MUX"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#188",
          "path": [
            {
-            "x": 590.0,
-            "y": 100.0
+            "x": 130.0,
+            "y": 655.0
            },
            {
-            "x": 590.0,
-            "y": 70.0
+            "x": 130.0,
+            "y": 580.0
+          },
+          {
+            "x": 170.0,
+            "y": 580.0
+          },
+          {
+            "x": 170.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "Splitter#13",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "mux3#1",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#189",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#13",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "Y"
+          "compName": "mux3#1",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#190",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux3#1",
+          "pinName": "I010"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "name": "unnamedWire#191",
          "path": [
            {
-            "x": 570.0,
-            "y": 50.0
-          },
-          {
-            "x": 415.0,
-            "y": 50.0
+            "x": 105.0,
+            "y": 695.0
            },
            {
-            "x": 415.0,
-            "y": 180.0
-          },
+            "x": 105.0,
+            "y": 610.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux3#1",
+          "pinName": "I011"
+        },
+        "name": "unnamedWire#192",
+        "path": [
            {
-            "x": 195.0,
-            "y": 180.0
+            "x": 110.0,
+            "y": 615.0
            },
            {
-            "x": 195.0,
-            "y": 120.0
+            "x": 110.0,
+            "y": 705.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "mux3#1",
+          "pinName": "I100"
          },
          "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#193",
          "path": [
            {
-            "x": 135.0,
-            "y": 10.0
+            "x": 115.0,
+            "y": 715.0
+          },
+          {
+            "x": 115.0,
+            "y": 595.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "B"
+          "compName": "xor#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "mux3#1",
+          "pinName": "I111"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#194",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEM"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#26",
            "pinName": ""
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#195",
          "path": [
            {
-            "x": 25.0,
-            "y": 20.0
+            "x": 465.0,
+            "y": 495.0
+          },
+          {
+            "x": 345.0,
+            "y": 495.0
+          },
+          {
+            "x": 345.0,
+            "y": 585.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "B"
+          "compName": "mux3#1",
+          "pinName": "I110"
          },
          "pin2": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_WEN"
+          "compName": "Splitter#7",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#196",
          "path": [
            {
-            "x": 315.0,
-            "y": 70.0
+            "x": 125.0,
+            "y": 735.0
+          },
+          {
+            "x": 125.0,
+            "y": 605.0
+          },
+          {
+            "x": 350.0,
+            "y": 605.0
+          },
+          {
+            "x": 350.0,
+            "y": 500.0
+          },
+          {
+            "x": 470.0,
+            "y": 500.0
            },
            {
-            "x": 315.0,
-            "y": 250.0
+            "x": 470.0,
+            "y": 360.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "muSR_WEOVR"
+          "compName": "mux2#2",
+          "pinName": "I01"
          },
          "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#197",
          "path": [
            {
-            "x": 320.0,
-            "y": 260.0
-          },
-          {
-            "x": 320.0,
-            "y": 90.0
+            "x": 290.0,
+            "y": 675.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
+          "compName": "mux2#2",
+          "pinName": "I10"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "NandGate#6",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#198",
          "path": [
            {
-            "x": 180.0,
-            "y": 75.0
+            "x": 295.0,
+            "y": 685.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#7",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#61",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#26",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#8",
-          "pinName": "A"
+          "compName": "mux3#1",
+          "pinName": "I101"
          },
-        "name": "unnamedWire#62",
-        "path": []
+        "name": "unnamedWire#199",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 585.0
+          },
+          {
+            "x": 120.0,
+            "y": 725.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "NandGate#9",
-          "pinName": "A"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "xor#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#63",
-        "path": []
+        "name": "unnamedWire#200",
+        "path": [
+          {
+            "x": 465.0,
+            "y": 335.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#26",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "mux2#2",
+          "pinName": "I11"
          },
-        "name": "unnamedWire#64",
-        "path": []
+        "name": "unnamedWire#201",
+        "path": [
+          {
+            "x": 300.0,
+            "y": 695.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "OEn"
          },
-        "name": "unnamedWire#65",
-        "path": []
+        "name": "unnamedWire#202",
+        "path": [
+          {
+            "x": 250.0,
+            "y": 540.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "NandGate#6",
-          "pinName": "Y"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "OE0"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "_EOVR"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#203",
          "path": [
            {
-            "x": 245.0,
-            "y": 80.0
+            "x": 390.0,
+            "y": 550.0
+          },
+          {
+            "x": 390.0,
+            "y": 585.0
+          },
+          {
+            "x": 560.0,
+            "y": 585.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Am2904MSR#0",
-          "pinName": "_EN"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "Y"
+          "compName": "xor#1",
+          "pinName": "A"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#204",
          "path": [
            {
-            "x": 235.0,
-            "y": 60.0
+            "x": 460.0,
+            "y": 325.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#8",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "_EC"
+          "compName": "xor#3",
+          "pinName": "A"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#205",
          "path": [
            {
-            "x": 225.0,
-            "y": 40.0
+            "x": 460.0,
+            "y": 490.0
+          },
+          {
+            "x": 340.0,
+            "y": 490.0
+          },
+          {
+            "x": 340.0,
+            "y": 600.0
+          },
+          {
+            "x": 100.0,
+            "y": 600.0
+          },
+          {
+            "x": 100.0,
+            "y": 745.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#9",
-          "pinName": "Y"
+          "compName": "xor#3",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Am2904MSR#0",
-          "pinName": "_EZ"
+          "compName": "Splitter#7",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#206",
          "path": [
            {
-            "x": 215.0,
-            "y": 20.0
+            "x": 95.0,
+            "y": 755.0
+          },
+          {
+            "x": 95.0,
+            "y": 590.0
+          },
+          {
+            "x": 355.0,
+            "y": 590.0
+          },
+          {
+            "x": 355.0,
+            "y": 505.0
+          },
+          {
+            "x": 475.0,
+            "y": 505.0
+          },
+          {
+            "x": 475.0,
+            "y": 370.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O3"
+          "compName": "mux2#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
+          "compName": "TriStateBuffer#1",
+          "pinName": "IN"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#207",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
+          "compName": "Splitter#14",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "mux2#2",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#208",
          "path": []
        },
        {
          "pin1": {
-          "compName": "not4#0",
-          "pinName": "Y1"
+          "compName": "Splitter#14",
+          "pinName": "O1"
          },
-        "pin2": {
-          "compName": "NandGate#9",
-          "pinName": "B"
+        "pin2": {
+          "compName": "mux2#2",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#71",
-        "path": [
-          {
-            "x": 170.0,
-            "y": 45.0
-          },
-          {
-            "x": 170.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#209",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#8",
-          "pinName": "B"
+          "compName": "Splitter#14",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "not4#0",
-          "pinName": "Y2"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "QIOn_MUX"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#210",
          "path": [
            {
-            "x": 175.0,
-            "y": 45.0
+            "x": 305.0,
+            "y": 655.0
            },
            {
-            "x": 175.0,
-            "y": 55.0
+            "x": 305.0,
+            "y": 530.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "not4#0",
-          "pinName": "Y3"
+          "compName": "Splitter#14",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "B"
+          "compName": "mux2#2",
+          "pinName": "I00"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#211",
          "path": []
        },
        {
          "pin1": {
-          "compName": "not4#0",
-          "pinName": "Y4"
+          "compName": "TriStateBuffer#2",
+          "pinName": "IN"
          },
          "pin2": {
-          "compName": "NandGate#6",
-          "pinName": "B"
+          "compName": "mux3#1",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#74",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 75.0
-          },
-          {
-            "x": 175.0,
-            "y": 85.0
-          }
-        ]
+        "name": "unnamedWire#212",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "not4#0",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "_SE"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_EZ"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "_SE"
          },
-        "name": "unnamedWire#75",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 45.0
-          }
-        ]
+        "name": "unnamedWire#213",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
+          "compName": "TriStateBuffer#3",
+          "pinName": "EN"
          },
          "pin2": {
-          "compName": "not4#0",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
-        "name": "unnamedWire#76",
-        "path": [
-          {
-            "x": 75.0,
-            "y": 55.0
-          }
-        ]
+        "name": "unnamedWire#214",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "not4#0",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
+          "compName": "TriStateBuffer#4",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#215",
          "path": [
            {
-            "x": 100.0,
-            "y": 65.0
+            "x": 575.0,
+            "y": 620.0
+          },
+          {
+            "x": 575.0,
+            "y": 645.0
+          },
+          {
+            "x": 560.0,
+            "y": 645.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EOVR"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "not4#0",
-          "pinName": "A4"
+          "compName": "Am2904muSR#0",
+          "pinName": "M"
          },
-        "name": "unnamedWire#78",
-        "path": [
-          {
-            "x": 125.0,
-            "y": 75.0
-          }
-        ]
+        "name": "unnamedWire#216",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#10",
+          "pinName": "I"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#217",
          "path": [
            {
-            "x": 570.0,
-            "y": 80.0
+            "x": 405.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 315.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O4"
+          "compName": "TriStateBuffer#2",
+          "pinName": "EN"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "NandGate#10",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#218",
          "path": []
        },
        {
          "pin1": {
-          "compName": "NandGate#10",
-          "pinName": "B"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "TriStateBuffer#1",
+          "pinName": "EN"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#219",
          "path": [
            {
-            "x": 450.0,
-            "y": 70.0
+            "x": 410.0,
+            "y": 630.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_OEY"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
-        "name": "unnamedWire#82",
-        "path": []
+        "name": "unnamedWire#220",
+        "path": [
+          {
+            "x": 440.0,
+            "y": 595.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "NandGate#10",
+          "compName": "mux1#5",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "and#0",
-          "pinName": "A"
+          "compName": "mux1#4",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#221",
          "path": []
        },
        {
          "pin1": {
-          "compName": "and#0",
+          "compName": "mux1#4",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "EN"
+          "compName": "Am2904MSR#0",
+          "pinName": "COVD_V"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#222",
          "path": [
            {
-            "x": 550.0,
-            "y": 65.0
+            "x": 530.0,
+            "y": 535.0
+          },
+          {
+            "x": 530.0,
+            "y": 525.0
+          },
+          {
+            "x": 230.0,
+            "y": 525.0
+          },
+          {
+            "x": 230.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 85.0
+          },
+          {
+            "x": 275.0,
+            "y": 85.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_1"
+          "compName": "TriStateBuffer#2",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#85",
-        "path": []
+        "name": "unnamedWire#223",
+        "path": [
+          {
+            "x": 265.0,
+            "y": 645.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
+          "compName": "TriStateBuffer#4",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
-        "name": "unnamedWire#86",
-        "path": []
+        "name": "unnamedWire#224",
+        "path": [
+          {
+            "x": 585.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#1",
-          "pinName": "Y3"
+          "compName": "Am2904ShiftInstrDecode#0",
+          "pinName": "MC_MUX"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
+          "compName": "Splitter#15",
+          "pinName": "I"
          },
-        "name": "unnamedWire#87",
-        "path": []
+        "name": "unnamedWire#225",
+        "path": [
+          {
+            "x": 410.0,
+            "y": 560.0
+          },
+          {
+            "x": 410.0,
+            "y": 540.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_4"
+          "compName": "Splitter#15",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "Y4"
+          "compName": "mux1#5",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#226",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O0"
+          "compName": "Splitter#15",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y4"
+          "compName": "mux1#4",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#227",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O5"
+          "compName": "mux2#0",
+          "pinName": "I11"
          },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#228",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O1"
+          "compName": "mux2#1",
+          "pinName": "I01"
          },
-        "name": "unnamedWire#90",
-        "path": []
+        "name": "unnamedWire#229",
+        "path": [
+          {
+            "x": 430.0,
+            "y": 740.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#230",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O3"
+          "compName": "TriStateBuffer#1",
+          "pinName": "OUT"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#231",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "I"
+          "compName": "NandGate#11",
+          "pinName": "A"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#232",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Am2904RegCTInstrDecode#0",
-          "pinName": "Y_MUX"
+          "compName": "NandGate#11",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#233",
          "path": [
            {
-            "x": 190.0,
-            "y": 275.0
-          },
-          {
-            "x": 360.0,
-            "y": 275.0
-          },
-          {
-            "x": 360.0,
-            "y": 225.0
-          },
-          {
-            "x": 420.0,
-            "y": 225.0
-          },
-          {
-            "x": 420.0,
-            "y": 95.0
+            "x": 550.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#1",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "_OECT"
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#234",
          "path": [
            {
-            "x": 455.0,
-            "y": 100.0
+            "x": 550.0,
+            "y": 215.0
            },
            {
-            "x": 455.0,
-            "y": 130.0
+            "x": 565.0,
+            "y": 215.0
            },
            {
-            "x": 435.0,
-            "y": 130.0
+            "x": 565.0,
+            "y": 25.0
            },
            {
-            "x": 435.0,
-            "y": 140.0
+            "x": 550.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "TriStateBuffer#5",
+          "pinName": "OUT"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "CT"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#235",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "TriStateBuffer#5",
+          "pinName": "IN"
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_1"
+          "compName": "xor#0",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#236",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_2"
+          "compName": "mux1#5",
+          "pinName": "I0"
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#237",
+        "path": [
+          {
+            "x": 430.0,
+            "y": 555.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "name": "unnamedWire#238",
          "path": []
        },
        {
          "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_3"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "compName": "_submodelinterface",
+          "pinName": "QIO0"
          },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#239",
          "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
+        },
+        "name": "unnamedWire#240",
+        "path": [
+          {
+            "x": 585.0,
+            "y": 615.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json

index 927d41f..c3b5fcf 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
@@ -203,136 +203,136 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 74.0,
-          "y": 54.0
+          "x": 369.0,
+          "y": 94.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 74.0,
-          "y": 64.0
+          "x": 374.0,
+          "y": 104.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 34.0,
-          "y": 234.0
+          "x": 379.0,
+          "y": 114.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 124.0,
-          "y": 174.0
+          "x": 29.0,
+          "y": 284.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 74.0,
-          "y": 74.0
+          "x": 39.0,
+          "y": 304.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 164.0,
-          "y": 59.0
+          "x": 19.0,
+          "y": 194.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 269.0,
-          "y": 39.0
+          "x": 79.0,
+          "y": 254.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 369.0,
-          "y": 94.0
+          "x": 39.0,
+          "y": 84.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 374.0,
-          "y": 104.0
+          "x": 74.0,
+          "y": 54.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 379.0,
-          "y": 114.0
+          "x": 74.0,
+          "y": 64.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 29.0,
-          "y": 284.0
+          "x": 34.0,
+          "y": 234.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 39.0,
-          "y": 304.0
+          "x": 124.0,
+          "y": 174.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 19.0,
-          "y": 194.0
+          "x": 74.0,
+          "y": 74.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 79.0,
-          "y": 254.0
+          "x": 164.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#16",
          "pos": {
-          "x": 39.0,
-          "y": 84.0
+          "x": 269.0,
+          "y": 39.0
          },
          "params": 1
        },
@@ -460,6 +460,141 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE3"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 150.0,
+            "y": 25.0
+          },
+          {
+            "x": 310.0,
+            "y": 25.0
+          },
+          {
+            "x": 310.0,
+            "y": 115.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 20.0
+          },
+          {
+            "x": 190.0,
+            "y": 20.0
+          },
+          {
+            "x": 190.0,
+            "y": 55.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EZ"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE1"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 15.0
+          },
+          {
+            "x": 320.0,
+            "y": 15.0
+          },
+          {
+            "x": 320.0,
+            "y": 95.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -616,31 +751,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 25.0
-          },
-          {
-            "x": 310.0,
-            "y": 25.0
-          },
-          {
-            "x": 310.0,
-            "y": 115.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -783,31 +893,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "and#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 20.0
-          },
-          {
-            "x": 190.0,
-            "y": 20.0
-          },
-          {
-            "x": 190.0,
-            "y": 55.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "not4#0",
@@ -977,31 +1062,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EZ"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 15.0
-          },
-          {
-            "x": 320.0,
-            "y": 15.0
-          },
-          {
-            "x": 320.0,
-            "y": 95.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -1141,18 +1201,6 @@
          "name": "unnamedWire#49",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#10",
@@ -1283,18 +1331,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "mux1_4#3",
@@ -1443,18 +1479,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "mux1_4#4",
@@ -1637,18 +1661,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "mux1_4#4",
@@ -1849,18 +1861,6 @@
          "name": "unnamedWire#89",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#15",
@@ -1904,7 +1904,7 @@
            "compName": "mux1_4#0",
            "pinName": "S0"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#92",
          "path": []
        }
      ],
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json

index 2c007e5..c6cbfe4 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
@@ -171,15 +171,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 39.0,
-          "y": 109.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#2",
@@ -252,6 +243,15 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 39.0,
+          "y": 109.0
+        },
+        "params": 1
+      },
        {
          "id": "xor",
          "name": "xor#0",
@@ -286,6 +286,112 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 25.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "xor#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "NandGate#2",
@@ -432,18 +538,6 @@
          "name": "unnamedWire#18",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -453,7 +547,7 @@
            "compName": "_submodelinterface",
            "pinName": "Y011"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
@@ -465,7 +559,7 @@
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#20",
          "path": [
            {
              "x": 35.0,
@@ -482,7 +576,7 @@
            "compName": "_submodelinterface",
            "pinName": "Y010"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
@@ -494,7 +588,7 @@
            "compName": "_submodelinterface",
            "pinName": "Y100"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
@@ -506,7 +600,7 @@
            "compName": "NandGate#4",
            "pinName": "B"
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#23",
          "path": [
            {
              "x": 70.0,
@@ -527,7 +621,7 @@
            "compName": "WireCrossPoint#8",
            "pinName": ""
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#24",
          "path": []
        },
        {
@@ -539,7 +633,7 @@
            "compName": "NandGate#4",
            "pinName": "A"
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
@@ -551,7 +645,7 @@
            "compName": "NandGate#3",
            "pinName": "A"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
@@ -563,7 +657,7 @@
            "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
@@ -575,26 +669,9 @@
            "compName": "NandGate#5",
            "pinName": "Y"
          },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#28",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 30.0,
-            "y": 25.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "NandGate#5",
@@ -604,7 +681,7 @@
            "compName": "WireCrossPoint#8",
            "pinName": ""
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#29",
          "path": [
            {
              "x": 75.0,
@@ -621,7 +698,7 @@
            "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#30",
          "path": [
            {
              "x": 40.0,
@@ -638,7 +715,7 @@
            "compName": "NandGate#5",
            "pinName": "B"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 25.0,
@@ -655,7 +732,7 @@
            "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#32",
          "path": [
            {
              "x": 30.0,
@@ -672,90 +749,13 @@
            "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#33",
          "path": [
            {
              "x": 20.0,
              "y": 110.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 35.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "xor#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json

index 2949d8d..0ef5caa 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@ -292,6 +292,138 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q3"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 245.0,
+            "y": 45.0
+          },
+          {
+            "x": 245.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "M"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_1"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 185.0
+          },
+          {
+            "x": 20.0,
+            "y": 180.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_2"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 190.0
+          },
+          {
+            "x": 20.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_3"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 205.0
+          },
+          {
+            "x": 20.0,
+            "y": 200.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "mux1_4#0",
@@ -453,18 +585,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "mux1_4#0",
@@ -604,18 +724,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "NandGate#2",
@@ -833,27 +941,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 245.0,
-            "y": 45.0
-          },
-          {
-            "x": 245.0,
-            "y": 50.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -1011,93 +1098,6 @@
              "y": 140.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "M"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_1"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 185.0
-          },
-          {
-            "x": 20.0,
-            "y": 180.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 190.0
-          },
-          {
-            "x": 20.0,
-            "y": 195.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 205.0
-          },
-          {
-            "x": 20.0,
-            "y": 200.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json

index 9a6e0ba..222d667 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@ -124,11 +124,11 @@
    "submodel": {
      "components": [
        {
-        "id": "Am2910InstrPLA",
-        "name": "Am2910InstrPLA#0",
+        "id": "Am2910SP",
+        "name": "Am2910SP#0",
          "pos": {
-          "x": 70.0,
-          "y": 90.0
+          "x": 240.0,
+          "y": 10.0
          }
        },
        {
@@ -140,11 +140,11 @@
          }
        },
        {
-        "id": "Am2910SP",
-        "name": "Am2910SP#0",
+        "id": "Am2910InstrPLA",
+        "name": "Am2910InstrPLA#0",
          "pos": {
-          "x": 240.0,
-          "y": 10.0
+          "x": 70.0,
+          "y": 90.0
          }
        },
        {
@@ -343,6 +343,107 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "Am2910InstrPLA#0",
+          "pinName": "YF"
+        },
+        "pin2": {
+          "compName": "sel4_12#0",
+          "pinName": "SC"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2910InstrPLA#0",
+          "pinName": "YmuPC"
+        },
+        "pin2": {
+          "compName": "sel4_12#0",
+          "pinName": "SD"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "inc#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "dff12#0",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff12#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "ram5_12#0",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2910SP#0",
+          "pinName": "A"
+        },
+        "pin2": {
+          "compName": "ram5_12#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2910SP#0",
+          "pinName": "B"
+        },
+        "pin2": {
+          "compName": "ram5_12#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2910RegCntr#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 150.0,
+            "y": 60.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "nor12#0",
@@ -523,18 +624,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "Am2910InstrPLA#0",
-          "pinName": "YF"
-        },
-        "pin2": {
-          "compName": "sel4_12#0",
-          "pinName": "SC"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -691,18 +780,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2910InstrPLA#0",
-          "pinName": "YmuPC"
-        },
-        "pin2": {
-          "compName": "sel4_12#0",
-          "pinName": "SD"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -842,18 +919,6 @@
          "name": "unnamedWire#39",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "inc#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff12#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -962,18 +1027,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "dff12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#8",
@@ -983,7 +1036,7 @@
            "compName": "ram5_12#0",
            "pinName": "C"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#46",
          "path": []
        },
        {
@@ -995,7 +1048,7 @@
            "compName": "_submodelinterface",
            "pinName": "Y"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
@@ -1007,7 +1060,7 @@
            "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
@@ -1019,7 +1072,7 @@
            "compName": "NandGate#2",
            "pinName": "B"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
@@ -1031,7 +1084,7 @@
            "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#50",
          "path": [
            {
              "x": 200.0,
@@ -1048,7 +1101,7 @@
            "compName": "NandGate#2",
            "pinName": "Y"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#51",
          "path": [
            {
              "x": 230.0,
@@ -1059,59 +1112,6 @@
              "y": 205.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram5_12#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "ram5_12#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "ram5_12#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2910RegCntr#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 60.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json

index b8c9886..f936d9e 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json
@@ -172,71 +172,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#10",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 22.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "and#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -337,6 +272,71 @@
          },
          "name": "unnamedWire#9",
          "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 22.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "and#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#14",
+        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json

index a2b4512..8bf2bfb 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
@@ -183,6 +183,164 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 187.5
+          },
+          {
+            "x": 5.0,
+            "y": 172.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B"
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 212.5
+          },
+          {
+            "x": 10.0,
+            "y": 182.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C1"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 12.5
+          },
+          {
+            "x": 10.0,
+            "y": 42.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C2"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 37.5
+          },
+          {
+            "x": 5.0,
+            "y": 52.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C3"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C4"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 87.5
+          },
+          {
+            "x": 5.0,
+            "y": 72.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "and41#0",
+          "pinName": "Y1"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "B1"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 70.0,
+            "y": 142.5
+          },
+          {
+            "x": 70.0,
+            "y": 120.0
+          },
+          {
+            "x": 30.0,
+            "y": 120.0
+          },
+          {
+            "x": 30.0,
+            "y": 82.5
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "and41#0",
@@ -344,164 +502,6 @@
              "y": 87.5
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 187.5
-          },
-          {
-            "x": 5.0,
-            "y": 172.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 212.5
-          },
-          {
-            "x": 10.0,
-            "y": 182.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C1"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 12.5
-          },
-          {
-            "x": 10.0,
-            "y": 42.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C2"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 37.5
-          },
-          {
-            "x": 5.0,
-            "y": 52.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C3"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C4"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 87.5
-          },
-          {
-            "x": 5.0,
-            "y": 72.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B1"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 70.0,
-            "y": 142.5
-          },
-          {
-            "x": 70.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 82.5
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json

index d8d7c36..2f07c5b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json
@@ -208,6 +208,126 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 7.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 62.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 67.5
+          },
+          {
+            "x": 32.5,
+            "y": 67.5
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "NandGate#0",
@@ -363,23 +483,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 7.5
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "and#0",
@@ -423,109 +526,6 @@
            "pinName": "Y11"
          },
          "name": "unnamedWire#23"
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 62.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 67.5
-          },
-          {
-            "x": 32.5,
-            "y": 67.5
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json

index 2c771c0..4a0117d 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json
@@ -142,69 +142,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "nand3#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_rsLatch#1",
-          "pinName": "_R"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 105.0,
-            "y": 60.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_rsLatch#1",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#13"
-      },
-      {
-        "pin1": {
-          "compName": "_rsLatch#1",
-          "pinName": "_Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Q"
-        },
-        "name": "unnamedWire#14"
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -342,6 +279,69 @@
              "y": 50.0
            }
          ]
+      },
+      {
+        "pin1": {
+          "compName": "nand3#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_rsLatch#1",
+          "pinName": "_R"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 60.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_rsLatch#1",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#13"
+      },
+      {
+        "pin1": {
+          "compName": "_rsLatch#1",
+          "pinName": "_Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_Q"
+        },
+        "name": "unnamedWire#14"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json

index 188770f..0ec1975 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
@@ -84,15 +84,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 179.0,
-          "y": 134.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#2",
@@ -165,6 +156,15 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 179.0,
+          "y": 134.0
+        },
+        "params": 1
+      },
        {
          "id": "dff",
          "name": "dff#0",
@@ -181,22 +181,6 @@
            "y": 60.0
          }
        },
-      {
-        "id": "dff",
-        "name": "dff#10",
-        "pos": {
-          "x": 185.0,
-          "y": 120.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#11",
-        "pos": {
-          "x": 130.0,
-          "y": 100.0
-        }
-      },
        {
          "id": "dff",
          "name": "dff#2",
@@ -261,6 +245,22 @@
            "y": 90.0
          }
        },
+      {
+        "id": "dff",
+        "name": "dff#10",
+        "pos": {
+          "x": 185.0,
+          "y": 120.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#11",
+        "pos": {
+          "x": 130.0,
+          "y": 100.0
+        }
+      },
        {
          "id": "mux1_12",
          "name": "mux1_12#0",
@@ -304,6 +304,160 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "mux1_12#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1_12#0",
+          "pinName": "I0"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 90.0
+          },
+          {
+            "x": 10.0,
+            "y": 205.0
+          },
+          {
+            "x": 270.0,
+            "y": 205.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O11"
+        },
+        "pin2": {
+          "compName": "dff#2",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 85.0,
+            "y": 45.0
+          },
+          {
+            "x": 85.0,
+            "y": 15.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#0",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O10"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 90.0,
+            "y": 35.0
+          },
+          {
+            "x": 90.0,
+            "y": 55.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#3",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O9"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 95.0,
+            "y": 45.0
+          },
+          {
+            "x": 95.0,
+            "y": 65.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O8"
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 75.0
+          },
+          {
+            "x": 100.0,
+            "y": 65.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#4",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 75.0
+          },
+          {
+            "x": 105.0,
+            "y": 85.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dff#9",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "dff#11",
@@ -463,18 +617,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -484,7 +626,7 @@
            "compName": "dff#2",
            "pinName": "C"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
@@ -496,7 +638,7 @@
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
@@ -508,7 +650,7 @@
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
@@ -520,7 +662,7 @@
            "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
@@ -532,7 +674,7 @@
            "compName": "dff#4",
            "pinName": "C"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
@@ -544,7 +686,7 @@
            "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
@@ -556,7 +698,7 @@
            "compName": "dff#11",
            "pinName": "C"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#24",
          "path": []
        },
        {
@@ -568,7 +710,7 @@
            "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
@@ -580,34 +722,9 @@
            "compName": "dff#8",
            "pinName": "C"
          },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#26",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "I0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 90.0
-          },
-          {
-            "x": 10.0,
-            "y": 205.0
-          },
-          {
-            "x": 270.0,
-            "y": 205.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#3",
@@ -617,7 +734,7 @@
            "compName": "dff#7",
            "pinName": "C"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#27",
          "path": [
            {
              "x": 125.0,
@@ -634,7 +751,7 @@
            "compName": "WireCrossPoint#7",
            "pinName": ""
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#28",
          "path": [
            {
              "x": 180.0,
@@ -651,7 +768,7 @@
            "compName": "dff#5",
            "pinName": "C"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#29",
          "path": []
        },
        {
@@ -663,7 +780,7 @@
            "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#30",
          "path": []
        },
        {
@@ -675,7 +792,7 @@
            "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#31",
          "path": []
        },
        {
@@ -687,7 +804,7 @@
            "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#32",
          "path": []
        },
        {
@@ -699,7 +816,7 @@
            "compName": "dff#9",
            "pinName": "C"
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#33",
          "path": []
        },
        {
@@ -711,7 +828,7 @@
            "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#34",
          "path": []
        },
        {
@@ -723,7 +840,7 @@
            "compName": "dff#1",
            "pinName": "C"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#35",
          "path": []
        },
        {
@@ -735,30 +852,9 @@
            "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#36",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 85.0,
-            "y": 45.0
-          },
-          {
-            "x": 85.0,
-            "y": 15.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#8",
@@ -768,30 +864,9 @@
            "compName": "dff#0",
            "pinName": "C"
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#37",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "dff#0",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 90.0,
-            "y": 35.0
-          },
-          {
-            "x": 90.0,
-            "y": 55.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "Splitter#1",
@@ -801,7 +876,7 @@
            "compName": "dff#2",
            "pinName": "Q"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#38",
          "path": [
            {
              "x": 250.0,
@@ -830,7 +905,7 @@
            "compName": "Splitter#1",
            "pinName": "O10"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#39",
          "path": [
            {
              "x": 240.0,
@@ -851,7 +926,7 @@
            "compName": "dff#3",
            "pinName": "Q"
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#40",
          "path": [
            {
              "x": 235.0,
@@ -880,7 +955,7 @@
            "compName": "Splitter#1",
            "pinName": "O8"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#41",
          "path": [
            {
              "x": 230.0,
@@ -901,7 +976,7 @@
            "compName": "dff#4",
            "pinName": "Q"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#42",
          "path": [
            {
              "x": 170.0,
@@ -922,7 +997,7 @@
            "compName": "Splitter#1",
            "pinName": "O6"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
@@ -934,7 +1009,7 @@
            "compName": "dff#11",
            "pinName": "Q"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#44",
          "path": [
            {
              "x": 225.0,
@@ -954,27 +1029,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "dff#3",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 45.0
-          },
-          {
-            "x": 95.0,
-            "y": 65.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "Splitter#1",
@@ -984,7 +1038,7 @@
            "compName": "dff#10",
            "pinName": "Q"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#45",
          "path": [
            {
              "x": 230.0,
@@ -1005,7 +1059,7 @@
            "compName": "dff#8",
            "pinName": "Q"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#46",
          "path": [
            {
              "x": 235.0,
@@ -1034,7 +1088,7 @@
            "compName": "Splitter#1",
            "pinName": "O2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#47",
          "path": [
            {
              "x": 240.0,
@@ -1055,7 +1109,7 @@
            "compName": "dff#7",
            "pinName": "Q"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#48",
          "path": [
            {
              "x": 245.0,
@@ -1084,7 +1138,7 @@
            "compName": "Splitter#1",
            "pinName": "O0"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#49",
          "path": [
            {
              "x": 250.0,
@@ -1105,7 +1159,7 @@
            "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#50",
          "path": []
        },
        {
@@ -1117,61 +1171,7 @@
            "compName": "_submodelinterface",
            "pinName": "Q"
          },
-        "name": "unnamedWire#66",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 75.0
-          },
-          {
-            "x": 100.0,
-            "y": 65.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 105.0,
-            "y": 75.0
-          },
-          {
-            "x": 105.0,
-            "y": 85.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#51",
          "path": []
        }
      ],
@@ -1230,27 +1230,6 @@
            "subStateID": "q"
          }
        },
-      "q10": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#3",
-          "subStateID": "q"
-        }
-      },
-      "q11": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#0",
-          "subStateID": "q"
-        }
-      },
-      "q12": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#2",
-          "subStateID": "q"
-        }
-      },
        "q2": {
          "id": "delegating",
          "params": {
@@ -1306,6 +1285,27 @@
            "delegateTarget": "dff#1",
            "subStateID": "q"
          }
+      },
+      "q10": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#3",
+          "subStateID": "q"
+        }
+      },
+      "q11": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#0",
+          "subStateID": "q"
+        }
+      },
+      "q12": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#2",
+          "subStateID": "q"
+        }
        }
      }
    },
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json

index 6efc903..8ba48b4 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
@@ -77,109 +77,109 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 114.0,
-          "y": 139.0
+          "x": 64.0,
+          "y": 89.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 114.0,
-          "y": 229.0
+          "x": 64.0,
+          "y": 119.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 114.0,
-          "y": 109.0
+          "x": 64.0,
+          "y": 179.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 114.0,
-          "y": 169.0
+          "x": 64.0,
+          "y": 209.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 114.0,
-          "y": 199.0
+          "x": 64.0,
+          "y": 149.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 64.0,
-          "y": 89.0
+          "x": 114.0,
+          "y": 79.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 64.0,
-          "y": 119.0
+          "x": 114.0,
+          "y": 49.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 64.0,
-          "y": 179.0
+          "x": 114.0,
+          "y": 139.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 64.0,
-          "y": 209.0
+          "x": 114.0,
+          "y": 229.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 64.0,
-          "y": 149.0
+          "x": 114.0,
+          "y": 109.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 114.0,
-          "y": 79.0
+          "y": 169.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 114.0,
-          "y": 49.0
+          "y": 199.0
          },
          "params": 1
        },
@@ -201,114 +201,114 @@
        },
        {
          "id": "dff",
-        "name": "dff#10",
+        "name": "dff#2",
          "pos": {
            "x": 120.0,
-          "y": 245.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#11",
-        "pos": {
-          "x": 70.0,
-          "y": 225.0
+          "y": 65.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#12",
+        "name": "dff#3",
          "pos": {
            "x": 70.0,
-          "y": 195.0
+          "y": 45.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#13",
+        "name": "dff#4",
          "pos": {
            "x": 120.0,
-          "y": 155.0
+          "y": 95.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#14",
+        "name": "dff#5",
          "pos": {
            "x": 120.0,
-          "y": 185.0
+          "y": 125.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#15",
+        "name": "dff#6",
          "pos": {
            "x": 70.0,
-          "y": 165.0
+          "y": 75.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#2",
+        "name": "dff#7",
          "pos": {
-          "x": 120.0,
-          "y": 65.0
+          "x": 70.0,
+          "y": 105.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#3",
+        "name": "dff#8",
          "pos": {
            "x": 70.0,
-          "y": 45.0
+          "y": 135.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#4",
+        "name": "dff#9",
          "pos": {
            "x": 120.0,
-          "y": 95.0
+          "y": 215.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#5",
+        "name": "dff#10",
          "pos": {
            "x": 120.0,
-          "y": 125.0
+          "y": 245.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#6",
+        "name": "dff#11",
          "pos": {
            "x": 70.0,
-          "y": 75.0
+          "y": 225.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#7",
+        "name": "dff#12",
          "pos": {
            "x": 70.0,
-          "y": 105.0
+          "y": 195.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#8",
+        "name": "dff#13",
          "pos": {
-          "x": 70.0,
-          "y": 135.0
+          "x": 120.0,
+          "y": 155.0
          }
        },
        {
          "id": "dff",
-        "name": "dff#9",
+        "name": "dff#14",
          "pos": {
            "x": 120.0,
-          "y": 215.0
+          "y": 185.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#15",
+        "pos": {
+          "x": 70.0,
+          "y": 165.0
          }
        }
      ],
@@ -355,6 +355,156 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O13"
+        },
+        "pin2": {
+          "compName": "dff#3",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 70.0
+          },
+          {
+            "x": 30.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#2",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O12"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 70.0
+          },
+          {
+            "x": 35.0,
+            "y": 80.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O11"
+        },
+        "pin2": {
+          "compName": "dff#6",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 90.0
+          },
+          {
+            "x": 40.0,
+            "y": 80.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#4",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O10"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff#7",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O9"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O8"
+        },
+        "pin2": {
+          "compName": "dff#5",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 120.0
+          },
+          {
+            "x": 60.0,
+            "y": 130.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#8",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 140.0
+          },
+          {
+            "x": 55.0,
+            "y": 130.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dff#13",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 140.0
+          },
+          {
+            "x": 50.0,
+            "y": 160.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "dff#15",
@@ -529,27 +679,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O13"
-        },
-        "pin2": {
-          "compName": "dff#3",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 30.0,
-            "y": 70.0
-          },
-          {
-            "x": 30.0,
-            "y": 50.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -659,37 +788,16 @@
          "path": []
        },
        {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#12",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dff#2",
-          "pinName": "D"
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O12"
+          "compName": "dff#12",
+          "pinName": "C"
          },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 70.0
-          },
-          {
-            "x": 35.0,
-            "y": 80.0
-          }
-        ]
+        "name": "unnamedWire#29",
+        "path": []
        },
        {
          "pin1": {
@@ -714,7 +822,7 @@
            "pinName": "C"
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "name": "unnamedWire#31",
@@ -727,7 +835,7 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
@@ -739,11 +847,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "name": "unnamedWire#33",
@@ -755,7 +863,7 @@
            "pinName": "C"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "name": "unnamedWire#34",
@@ -763,11 +871,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "name": "unnamedWire#35",
@@ -775,7 +883,7 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
@@ -787,11 +895,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "name": "unnamedWire#37",
@@ -799,7 +907,7 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
@@ -811,11 +919,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "name": "unnamedWire#39",
@@ -823,28 +931,7 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
-        },
-        "pin2": {
-          "compName": "dff#6",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 90.0
-          },
-          {
-            "x": 40.0,
-            "y": 80.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
@@ -856,11 +943,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "name": "unnamedWire#41",
@@ -868,7 +955,7 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
@@ -880,11 +967,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "name": "unnamedWire#43",
@@ -892,7 +979,7 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
@@ -908,7 +995,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "name": "unnamedWire#45",
@@ -944,7 +1031,7 @@
            "compName": "_submodelinterface",
            "pinName": "C"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#47",
          "path": [
            {
              "x": 10.0,
@@ -965,7 +1052,7 @@
            "compName": "dff#0",
            "pinName": "Q"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#48",
          "path": [
            {
              "x": 200.0,
@@ -985,18 +1072,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "dff#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "dff#1",
@@ -1006,7 +1081,7 @@
            "compName": "Splitter#1",
            "pinName": "O14"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#49",
          "path": [
            {
              "x": 195.0,
@@ -1027,7 +1102,7 @@
            "compName": "dff#3",
            "pinName": "Q"
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#50",
          "path": [
            {
              "x": 190.0,
@@ -1056,7 +1131,7 @@
            "compName": "dff#2",
            "pinName": "Q"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#51",
          "path": [
            {
              "x": 185.0,
@@ -1077,7 +1152,7 @@
            "compName": "dff#6",
            "pinName": "Q"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#52",
          "path": [
            {
              "x": 110.0,
@@ -1098,7 +1173,7 @@
            "compName": "Splitter#1",
            "pinName": "O10"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
@@ -1110,7 +1185,7 @@
            "compName": "dff#7",
            "pinName": "Q"
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#54",
          "path": [
            {
              "x": 160.0,
@@ -1139,7 +1214,7 @@
            "compName": "Splitter#1",
            "pinName": "O8"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#55",
          "path": [
            {
              "x": 165.0,
@@ -1160,7 +1235,7 @@
            "compName": "dff#8",
            "pinName": "Q"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#56",
          "path": [
            {
              "x": 170.0,
@@ -1189,7 +1264,7 @@
            "compName": "Splitter#1",
            "pinName": "O6"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#57",
          "path": [
            {
              "x": 175.0,
@@ -1210,7 +1285,7 @@
            "compName": "dff#15",
            "pinName": "Q"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#58",
          "path": [
            {
              "x": 180.0,
@@ -1230,18 +1305,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "dff#7",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Splitter#1",
@@ -1251,7 +1314,7 @@
            "compName": "dff#14",
            "pinName": "Q"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#59",
          "path": [
            {
              "x": 185.0,
@@ -1272,7 +1335,7 @@
            "compName": "dff#12",
            "pinName": "Q"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#60",
          "path": [
            {
              "x": 190.0,
@@ -1301,7 +1364,7 @@
            "compName": "Splitter#1",
            "pinName": "O2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#61",
          "path": [
            {
              "x": 195.0,
@@ -1322,7 +1385,7 @@
            "compName": "dff#11",
            "pinName": "Q"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#62",
          "path": [
            {
              "x": 200.0,
@@ -1351,7 +1414,7 @@
            "compName": "Splitter#1",
            "pinName": "O0"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#63",
          "path": [
            {
              "x": 205.0,
@@ -1362,69 +1425,6 @@
              "y": 200.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
-        },
-        "pin2": {
-          "compName": "dff#5",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 60.0,
-            "y": 120.0
-          },
-          {
-            "x": 60.0,
-            "y": 130.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#8",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 140.0
-          },
-          {
-            "x": 55.0,
-            "y": 130.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dff#13",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 140.0
-          },
-          {
-            "x": 50.0,
-            "y": 160.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
@@ -1490,108 +1490,108 @@
            "subStateID": "q"
          }
        },
-      "q10": {
+      "q2": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#7",
+          "delegateTarget": "dff#11",
            "subStateID": "q"
          }
        },
-      "q11": {
+      "q3": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#4",
+          "delegateTarget": "dff#9",
            "subStateID": "q"
          }
        },
-      "q12": {
+      "q4": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#6",
+          "delegateTarget": "dff#12",
            "subStateID": "q"
          }
        },
-      "q13": {
+      "q5": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#2",
+          "delegateTarget": "dff#14",
            "subStateID": "q"
          }
        },
-      "q14": {
+      "q6": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#3",
+          "delegateTarget": "dff#15",
            "subStateID": "q"
          }
        },
-      "q15": {
+      "q7": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#1",
+          "delegateTarget": "dff#13",
            "subStateID": "q"
          }
        },
-      "q16": {
+      "q8": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#0",
+          "delegateTarget": "dff#8",
            "subStateID": "q"
          }
        },
-      "q2": {
+      "q9": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#11",
+          "delegateTarget": "dff#5",
            "subStateID": "q"
          }
        },
-      "q3": {
+      "q10": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#9",
+          "delegateTarget": "dff#7",
            "subStateID": "q"
          }
        },
-      "q4": {
+      "q11": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#12",
+          "delegateTarget": "dff#4",
            "subStateID": "q"
          }
        },
-      "q5": {
+      "q12": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#14",
+          "delegateTarget": "dff#6",
            "subStateID": "q"
          }
        },
-      "q6": {
+      "q13": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#15",
+          "delegateTarget": "dff#2",
            "subStateID": "q"
          }
        },
-      "q7": {
+      "q14": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#13",
+          "delegateTarget": "dff#3",
            "subStateID": "q"
          }
        },
-      "q8": {
+      "q15": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#8",
+          "delegateTarget": "dff#1",
            "subStateID": "q"
          }
        },
-      "q9": {
+      "q16": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#5",
+          "delegateTarget": "dff#0",
            "subStateID": "q"
          }
        }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json

index 0d24ad3..5df44de 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json
@@ -44,7 +44,7 @@
      "components": [
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 164.0,
            "y": 99.0
@@ -96,7 +96,7 @@
            "pinName": "Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "name": "unnamedWire#1",
@@ -132,31 +132,31 @@
            "compName": "mux1_16#0",
            "pinName": "S"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#3",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
            "compName": "_submodelinterface",
            "pinName": "Q"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
            "compName": "mux1_16#0",
            "pinName": "I1"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 165.0,
@@ -181,7 +181,7 @@
            "compName": "mux1_16#0",
            "pinName": "I0"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#6",
          "path": []
        }
      ],
@@ -214,109 +214,109 @@
            "subStateID": "q1"
          }
        },
-      "q10": {
+      "q2": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q10"
+          "subStateID": "q2"
          }
        },
-      "q11": {
+      "q3": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q11"
+          "subStateID": "q3"
          }
        },
-      "q12": {
+      "q4": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q12"
+          "subStateID": "q4"
          }
        },
-      "q13": {
+      "q5": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q13"
+          "subStateID": "q5"
          }
        },
-      "q14": {
+      "q6": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q14"
+          "subStateID": "q6"
          }
        },
-      "q15": {
+      "q7": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q15"
+          "subStateID": "q7"
          }
        },
-      "q16": {
+      "q8": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q16"
+          "subStateID": "q8"
          }
        },
-      "q2": {
+      "q9": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q2"
+          "subStateID": "q9"
          }
        },
-      "q3": {
+      "q10": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q3"
+          "subStateID": "q10"
          }
        },
-      "q4": {
+      "q11": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q4"
+          "subStateID": "q11"
          }
        },
-      "q5": {
+      "q12": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q5"
+          "subStateID": "q12"
          }
        },
-      "q6": {
+      "q13": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q6"
+          "subStateID": "q13"
          }
        },
-      "q7": {
+      "q14": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q7"
+          "subStateID": "q14"
          }
        },
-      "q8": {
+      "q15": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q8"
+          "subStateID": "q15"
          }
        },
-      "q9": {
+      "q16": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q9"
+          "subStateID": "q16"
          }
        }
      }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json

index 09127e6..de8fc9c 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
@@ -44,7 +44,7 @@
      "components": [
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 164.0,
            "y": 99.0
@@ -96,7 +96,7 @@
            "pinName": "Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "name": "unnamedWire#1",
@@ -132,31 +132,31 @@
            "compName": "mux1_16#0",
            "pinName": "S"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#3",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
            "compName": "_submodelinterface",
            "pinName": "Q"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
            "compName": "mux1_16#0",
            "pinName": "I0"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 165.0,
@@ -181,7 +181,7 @@
            "compName": "mux1_16#0",
            "pinName": "I1"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#6",
          "path": [
            {
              "x": 10.0,
@@ -223,109 +223,109 @@
            "subStateID": "q1"
          }
        },
-      "q10": {
+      "q2": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q10"
+          "subStateID": "q2"
          }
        },
-      "q11": {
+      "q3": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q11"
+          "subStateID": "q3"
          }
        },
-      "q12": {
+      "q4": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q12"
+          "subStateID": "q4"
          }
        },
-      "q13": {
+      "q5": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q13"
+          "subStateID": "q5"
          }
        },
-      "q14": {
+      "q6": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q14"
+          "subStateID": "q6"
          }
        },
-      "q15": {
+      "q7": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q15"
+          "subStateID": "q7"
          }
        },
-      "q16": {
+      "q8": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q16"
+          "subStateID": "q8"
          }
        },
-      "q2": {
+      "q9": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q2"
+          "subStateID": "q9"
          }
        },
-      "q3": {
+      "q10": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q3"
+          "subStateID": "q10"
          }
        },
-      "q4": {
+      "q11": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q4"
+          "subStateID": "q11"
          }
        },
-      "q5": {
+      "q12": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q5"
+          "subStateID": "q12"
          }
        },
-      "q6": {
+      "q13": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q6"
+          "subStateID": "q13"
          }
        },
-      "q7": {
+      "q14": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q7"
+          "subStateID": "q14"
          }
        },
-      "q8": {
+      "q15": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q8"
+          "subStateID": "q15"
          }
        },
-      "q9": {
+      "q16": {
          "id": "delegating",
          "params": {
            "delegateTarget": "dff16#0",
-          "subStateID": "q9"
+          "subStateID": "q16"
          }
        }
      }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json

index cd20361..c245c9b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
@@ -239,6 +239,120 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "mux1_4#0",
+          "pinName": "Y2"
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#3",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#2",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 225.0
+          },
+          {
+            "x": 20.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "WE"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 275.0
+          },
+          {
+            "x": 10.0,
+            "y": 65.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -395,18 +509,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -572,108 +674,6 @@
              "y": 105.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#3",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 225.0
-          },
-          {
-            "x": 20.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "WE"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 275.0
-          },
-          {
-            "x": 10.0,
-            "y": 65.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json

index 005cabe..5899cc8 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
@@ -239,6 +239,120 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "mux1_4#0",
+          "pinName": "Y2"
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#3",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#2",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 225.0
+          },
+          {
+            "x": 20.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_WE"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 275.0
+          },
+          {
+            "x": 10.0,
+            "y": 65.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -395,18 +509,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -572,108 +674,6 @@
              "y": 145.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#3",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 225.0
-          },
-          {
-            "x": 20.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_WE"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 275.0
-          },
-          {
-            "x": 10.0,
-            "y": 65.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json

index 8c2a5b3..99b59a7 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
@@ -68,16 +68,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 89.0,
-          "y": 74.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 39.0,
            "y": 54.0
@@ -86,7 +77,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 39.0,
            "y": 84.0
@@ -95,7 +86,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 89.0,
            "y": 104.0
@@ -104,7 +95,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 89.0,
            "y": 44.0
@@ -112,24 +103,17 @@
          "params": 1
        },
        {
-        "id": "dff",
-        "name": "dff#10",
-        "pos": {
-          "x": 95.0,
-          "y": 60.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#11",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 45.0,
-          "y": 40.0
-        }
+          "x": 89.0,
+          "y": 74.0
+        },
+        "params": 1
        },
        {
          "id": "dff",
-        "name": "dff#4",
+        "name": "dff#0",
          "pos": {
            "x": 45.0,
            "y": 10.0
@@ -137,7 +121,7 @@
        },
        {
          "id": "dff",
-        "name": "dff#5",
+        "name": "dff#1",
          "pos": {
            "x": 95.0,
            "y": 90.0
@@ -145,7 +129,7 @@
        },
        {
          "id": "dff",
-        "name": "dff#6",
+        "name": "dff#2",
          "pos": {
            "x": 95.0,
            "y": 120.0
@@ -153,7 +137,7 @@
        },
        {
          "id": "dff",
-        "name": "dff#7",
+        "name": "dff#3",
          "pos": {
            "x": 45.0,
            "y": 100.0
@@ -161,7 +145,7 @@
        },
        {
          "id": "dff",
-        "name": "dff#8",
+        "name": "dff#4",
          "pos": {
            "x": 45.0,
            "y": 70.0
@@ -169,11 +153,27 @@
        },
        {
          "id": "dff",
-        "name": "dff#9",
+        "name": "dff#5",
          "pos": {
            "x": 95.0,
            "y": 30.0
          }
+      },
+      {
+        "id": "dff",
+        "name": "dff#6",
+        "pos": {
+          "x": 95.0,
+          "y": 60.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#7",
+        "pos": {
+          "x": 45.0,
+          "y": 40.0
+        }
        }
      ],
      "wires": [
@@ -183,7 +183,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "name": "unnamedWire#0",
@@ -212,14 +212,104 @@
        },
        {
          "pin1": {
-          "compName": "dff#11",
+          "compName": "_submodelinterface",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff#0",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 15.0
+          },
+          {
+            "x": 20.0,
+            "y": 40.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dff#5",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 50.0
+          },
+          {
+            "x": 25.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#7",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O5"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#8",
          "path": [
            {
              "x": 30.0,
@@ -237,10 +327,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "dff#10",
+          "compName": "dff#6",
            "pinName": "D"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#9",
          "path": [
            {
              "x": 25.0,
@@ -254,14 +344,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#8",
+          "compName": "dff#4",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O3"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 25.0,
@@ -279,10 +369,10 @@
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "dff#5",
+          "compName": "dff#1",
            "pinName": "D"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#11",
          "path": [
            {
              "x": 25.0,
@@ -296,14 +386,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#7",
+          "compName": "dff#3",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O1"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 25.0,
@@ -321,10 +411,10 @@
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff#6",
+          "compName": "dff#2",
            "pinName": "D"
          },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#13",
          "path": [
            {
              "x": 20.0,
@@ -338,74 +428,50 @@
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff#11",
+          "compName": "dff#7",
            "pinName": "C"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff#8",
+          "compName": "dff#4",
            "pinName": "C"
          },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff#7",
+          "compName": "dff#3",
            "pinName": "C"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#17",
          "path": [
            {
              "x": 40.0,
@@ -415,14 +481,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#6",
+          "compName": "dff#2",
            "pinName": "C"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#18",
          "path": [
            {
              "x": 90.0,
@@ -432,86 +498,62 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff#5",
+          "compName": "dff#1",
            "pinName": "C"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff#10",
+          "compName": "dff#6",
            "pinName": "C"
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dff#4",
+          "compName": "dff#5",
            "pinName": "C"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
@@ -520,10 +562,10 @@
            "pinName": "O7"
          },
          "pin2": {
-          "compName": "dff#4",
+          "compName": "dff#0",
            "pinName": "Q"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#24",
          "path": [
            {
              "x": 155.0,
@@ -545,14 +587,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#9",
+          "compName": "dff#5",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O6"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#25",
          "path": [
            {
              "x": 150.0,
@@ -570,10 +612,10 @@
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "dff#11",
+          "compName": "dff#7",
            "pinName": "Q"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#26",
          "path": [
            {
              "x": 145.0,
@@ -599,10 +641,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "dff#10",
+          "compName": "dff#6",
            "pinName": "Q"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#27",
          "path": [
            {
              "x": 140.0,
@@ -620,10 +662,10 @@
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "dff#8",
+          "compName": "dff#4",
            "pinName": "Q"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#28",
          "path": [
            {
              "x": 140.0,
@@ -645,14 +687,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#5",
+          "compName": "dff#1",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#29",
          "path": [
            {
              "x": 140.0,
@@ -670,10 +712,10 @@
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "dff#7",
+          "compName": "dff#3",
            "pinName": "Q"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#30",
          "path": [
            {
              "x": 140.0,
@@ -695,14 +737,14 @@
        },
        {
          "pin1": {
-          "compName": "dff#6",
+          "compName": "dff#2",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O0"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 150.0,
@@ -713,48 +755,6 @@
              "y": 110.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 15.0
-          },
-          {
-            "x": 20.0,
-            "y": 40.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 50.0
-          },
-          {
-            "x": 25.0,
-            "y": 35.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
@@ -800,56 +800,56 @@
        "q1": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#6",
+          "delegateTarget": "dff#2",
            "subStateID": "q"
          }
        },
        "q2": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#7",
+          "delegateTarget": "dff#3",
            "subStateID": "q"
          }
        },
        "q3": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#5",
+          "delegateTarget": "dff#1",
            "subStateID": "q"
          }
        },
        "q4": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#8",
+          "delegateTarget": "dff#4",
            "subStateID": "q"
          }
        },
        "q5": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#10",
+          "delegateTarget": "dff#6",
            "subStateID": "q"
          }
        },
        "q6": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#11",
+          "delegateTarget": "dff#7",
            "subStateID": "q"
          }
        },
        "q7": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#9",
+          "delegateTarget": "dff#5",
            "subStateID": "q"
          }
        },
        "q8": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dff#4",
+          "delegateTarget": "dff#0",
            "subStateID": "q"
          }
        }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json

index e1f37bc..7002e05 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json
@@ -59,10 +59,10 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#2",
          "pos": {
            "x": 30.0,
-          "y": 670.0
+          "y": 30.0
          },
          "params": {
            "logicWidth": 8,
@@ -71,10 +71,10 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#3",
          "pos": {
            "x": 30.0,
-          "y": 750.0
+          "y": 110.0
          },
          "params": {
            "logicWidth": 8,
@@ -83,118 +83,118 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#4",
          "pos": {
-          "x": 90.0,
-          "y": 510.0
+          "x": 30.0,
+          "y": 190.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#5",
          "pos": {
-          "x": 90.0,
-          "y": 590.0
+          "x": 30.0,
+          "y": 270.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#6",
          "pos": {
-          "x": 90.0,
-          "y": 110.0
+          "x": 30.0,
+          "y": 350.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#7",
          "pos": {
-          "x": 90.0,
+          "x": 30.0,
            "y": 430.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#8",
          "pos": {
-          "x": 90.0,
-          "y": 190.0
+          "x": 30.0,
+          "y": 510.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#9",
          "pos": {
-          "x": 90.0,
-          "y": 350.0
+          "x": 30.0,
+          "y": 590.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#10",
          "pos": {
-          "x": 90.0,
-          "y": 270.0
+          "x": 30.0,
+          "y": 670.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#11",
          "pos": {
-          "x": 90.0,
-          "y": 670.0
+          "x": 30.0,
+          "y": 750.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#12",
          "pos": {
-          "x": 30.0,
-          "y": 30.0
+          "x": 90.0,
+          "y": 510.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#13",
          "pos": {
            "x": 90.0,
-          "y": 30.0
+          "y": 590.0
          },
          "params": {
            "logicWidth": 8,
@@ -203,97 +203,97 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#21",
+        "name": "Splitter#14",
          "pos": {
-          "x": 105.0,
-          "y": 30.0
+          "x": 90.0,
+          "y": 110.0
          },
          "params": {
-          "logicWidth": 80,
-          "orientation": "LEFT"
+          "logicWidth": 8,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#3",
+        "name": "Splitter#15",
          "pos": {
-          "x": 30.0,
-          "y": 110.0
+          "x": 90.0,
+          "y": 430.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#16",
          "pos": {
-          "x": 30.0,
+          "x": 90.0,
            "y": 190.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#5",
+        "name": "Splitter#17",
          "pos": {
-          "x": 30.0,
-          "y": 270.0
+          "x": 90.0,
+          "y": 350.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#6",
+        "name": "Splitter#18",
          "pos": {
-          "x": 30.0,
-          "y": 350.0
+          "x": 90.0,
+          "y": 270.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#19",
          "pos": {
-          "x": 30.0,
-          "y": 430.0
+          "x": 90.0,
+          "y": 670.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#20",
          "pos": {
-          "x": 30.0,
-          "y": 510.0
+          "x": 90.0,
+          "y": 30.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#21",
          "pos": {
-          "x": 30.0,
-          "y": 590.0
+          "x": 105.0,
+          "y": 30.0
          },
          "params": {
-          "logicWidth": 8,
+          "logicWidth": 80,
            "orientation": "LEFT"
          }
        },
@@ -487,2400 +487,2400 @@
        {
          "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O69"
+          "pinName": "O77"
          },
          "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
            "pinName": "O5"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O59"
+          "compName": "Splitter#2",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#0",
+          "pinName": "O76"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O75"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
            "pinName": "O3"
          },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O58"
+          "compName": "Splitter#0",
+          "pinName": "O74"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O57"
+          "compName": "Splitter#0",
+          "pinName": "O73"
          },
          "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O1"
          },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O56"
+          "compName": "Splitter#0",
+          "pinName": "O72"
          },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O55"
+          "compName": "Splitter#0",
+          "pinName": "O71"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O7"
          },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O54"
+          "compName": "Splitter#0",
+          "pinName": "O70"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O53"
+          "compName": "Splitter#0",
+          "pinName": "O69"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O5"
          },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O52"
+          "compName": "Splitter#0",
+          "pinName": "O68"
          },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#11",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O51"
+          "compName": "Splitter#0",
+          "pinName": "O67"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O3"
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O50"
+          "compName": "Splitter#0",
+          "pinName": "O66"
          },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O4"
+          "compName": "Splitter#0",
+          "pinName": "O65"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O68"
+          "compName": "Splitter#3",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O49"
-        },
-        "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#110",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O48"
+          "compName": "Splitter#0",
+          "pinName": "O64"
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O47"
+          "compName": "Splitter#0",
+          "pinName": "O63"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O7"
          },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O46"
+          "compName": "Splitter#0",
+          "pinName": "O62"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#17",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O45"
+          "compName": "Splitter#0",
+          "pinName": "O61"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O5"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O44"
+          "compName": "Splitter#0",
+          "pinName": "O60"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O43"
+          "compName": "Splitter#0",
+          "pinName": "O59"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O3"
          },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O42"
+          "compName": "Splitter#0",
+          "pinName": "O58"
          },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O41"
+          "compName": "Splitter#0",
+          "pinName": "O57"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O1"
          },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O40"
-        },
-        "name": "unnamedWire#119",
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O67"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "pinName": "O56"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O39"
+          "compName": "Splitter#0",
+          "pinName": "O55"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O7"
          },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O38"
+          "compName": "Splitter#0",
+          "pinName": "O54"
          },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O37"
+          "compName": "Splitter#0",
+          "pinName": "O53"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O5"
          },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O36"
+          "compName": "Splitter#0",
+          "pinName": "O52"
          },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O35"
+          "compName": "Splitter#0",
+          "pinName": "O51"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O3"
          },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#28",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O34"
+          "compName": "Splitter#0",
+          "pinName": "O50"
          },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#29",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O33"
+          "compName": "Splitter#0",
+          "pinName": "O49"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O1"
          },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#30",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O32"
+          "compName": "Splitter#0",
+          "pinName": "O48"
          },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#31",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O31"
+          "compName": "Splitter#0",
+          "pinName": "O47"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O7"
          },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#32",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O6"
          },
-        "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O30"
-        },
-        "name": "unnamedWire#129",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O66"
+          "pinName": "O46"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#33",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O29"
+          "compName": "Splitter#0",
+          "pinName": "O45"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O5"
          },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#34",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O28"
+          "compName": "Splitter#0",
+          "pinName": "O44"
          },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#35",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O27"
+          "compName": "Splitter#0",
+          "pinName": "O43"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O3"
          },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O26"
+          "compName": "Splitter#0",
+          "pinName": "O42"
          },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#37",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O25"
+          "compName": "Splitter#0",
+          "pinName": "O41"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O1"
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#38",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O24"
+          "compName": "Splitter#0",
+          "pinName": "O40"
          },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#39",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O23"
+          "compName": "Splitter#0",
+          "pinName": "O39"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O7"
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O22"
+          "compName": "Splitter#0",
+          "pinName": "O38"
          },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#41",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O21"
+          "compName": "Splitter#0",
+          "pinName": "O37"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O5"
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#42",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O20"
-        },
-        "name": "unnamedWire#139",
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O65"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "pinName": "O36"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O19"
+          "compName": "Splitter#0",
+          "pinName": "O35"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O3"
          },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O18"
+          "compName": "Splitter#0",
+          "pinName": "O34"
          },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#45",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O17"
+          "compName": "Splitter#0",
+          "pinName": "O33"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O1"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O16"
+          "compName": "Splitter#0",
+          "pinName": "O32"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O15"
+          "compName": "Splitter#0",
+          "pinName": "O31"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O7"
          },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O14"
+          "compName": "Splitter#0",
+          "pinName": "O30"
          },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O13"
+          "compName": "Splitter#0",
+          "pinName": "O29"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O5"
          },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O12"
+          "compName": "Splitter#0",
+          "pinName": "O28"
          },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#51",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O11"
+          "compName": "Splitter#0",
+          "pinName": "O27"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O3"
          },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O2"
          },
-        "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#149",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O64"
+          "pinName": "O26"
          },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O9"
+          "compName": "Splitter#0",
+          "pinName": "O25"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O1"
          },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O8"
+          "compName": "Splitter#0",
+          "pinName": "O24"
          },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O7"
+          "compName": "Splitter#0",
+          "pinName": "O23"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O7"
          },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O6"
+          "compName": "Splitter#0",
+          "pinName": "O22"
          },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O5"
+          "compName": "Splitter#0",
+          "pinName": "O21"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O5"
          },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#58",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O4"
+          "compName": "Splitter#0",
+          "pinName": "O20"
          },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#59",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O3"
+          "compName": "Splitter#0",
+          "pinName": "O19"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O3"
          },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#60",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O2"
+          "compName": "Splitter#0",
+          "pinName": "O18"
          },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#61",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O1"
+          "compName": "Splitter#0",
+          "pinName": "O17"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O1"
          },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#62",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O0"
+          "compName": "Splitter#0",
+          "pinName": "O16"
          },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#63",
          "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O63"
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#10",
            "pinName": "O7"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#64",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dff8#9",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#65",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff8#9",
-          "pinName": "Q"
+          "compName": "Splitter#0",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#161",
+        "name": "unnamedWire#66",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "dff8#8",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#162",
+        "name": "unnamedWire#67",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "dff8#7",
-          "pinName": "D"
+          "compName": "Splitter#10",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#163",
+        "name": "unnamedWire#68",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dff8#6",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#164",
+        "name": "unnamedWire#69",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "dff8#5",
-          "pinName": "D"
+          "compName": "Splitter#10",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#70",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff8#4",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#71",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "dff8#3",
-          "pinName": "D"
+          "compName": "Splitter#11",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#167",
+        "name": "unnamedWire#72",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "I"
+          "compName": "Splitter#11",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dff8#2",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#168",
+        "name": "unnamedWire#73",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "dff8#1",
-          "pinName": "D"
+          "compName": "Splitter#11",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#169",
+        "name": "unnamedWire#74",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O6"
+          "compName": "Splitter#11",
+          "pinName": "O4"
          },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O62"
+          "pinName": "O4"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#75",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "Splitter#11",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#76",
          "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#11",
-          "pinName": "I"
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dff8#0",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#170",
+        "name": "unnamedWire#77",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "dff8#0",
-          "pinName": "Q"
+          "compName": "Splitter#11",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#78",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff8#1",
-          "pinName": "Q"
+          "compName": "Splitter#11",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#79",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O79"
          },
          "pin2": {
-          "compName": "dff8#2",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#80",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff8#3",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O78"
          },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#81",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O77"
          },
          "pin2": {
-          "compName": "dff8#4",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#175",
+        "name": "unnamedWire#82",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff8#5",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O76"
          },
-        "name": "unnamedWire#176",
+        "name": "unnamedWire#83",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O75"
          },
          "pin2": {
-          "compName": "dff8#6",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#177",
+        "name": "unnamedWire#84",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dff8#7",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O74"
          },
-        "name": "unnamedWire#178",
+        "name": "unnamedWire#85",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O73"
          },
          "pin2": {
-          "compName": "dff8#8",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#179",
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O61"
+          "compName": "Splitter#20",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O5"
+          "compName": "Splitter#21",
+          "pinName": "O72"
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#87",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
+          "compName": "Splitter#21",
+          "pinName": "O71"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "Splitter#14",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#180",
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
+          "compName": "Splitter#14",
+          "pinName": "O6"
          },
          "pin2": {
            "compName": "Splitter#21",
-          "pinName": "I"
+          "pinName": "O70"
          },
-        "name": "unnamedWire#181",
+        "name": "unnamedWire#89",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O69"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#182",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#90",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "dff8#9",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O68"
          },
-        "name": "unnamedWire#183",
+        "name": "unnamedWire#91",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O67"
          },
          "pin2": {
-          "compName": "dff8#8",
-          "pinName": "C"
+          "compName": "Splitter#14",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#184",
+        "name": "unnamedWire#92",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O66"
          },
-        "name": "unnamedWire#185",
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O65"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#186",
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff8#7",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O64"
          },
-        "name": "unnamedWire#187",
+        "name": "unnamedWire#95",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O63"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#188",
+        "name": "unnamedWire#96",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dff8#6",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O62"
          },
-        "name": "unnamedWire#189",
+        "name": "unnamedWire#97",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#21",
+          "pinName": "O61"
+        },
+        "pin2": {
+          "compName": "Splitter#16",
+          "pinName": "O5"
+        },
+        "name": "unnamedWire#98",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#16",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#21",
            "pinName": "O60"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#99",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O59"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#190",
+        "name": "unnamedWire#100",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dff8#5",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O58"
          },
-        "name": "unnamedWire#191",
+        "name": "unnamedWire#101",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O57"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#192",
+        "name": "unnamedWire#102",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff8#4",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O56"
          },
-        "name": "unnamedWire#193",
+        "name": "unnamedWire#103",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O55"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#194",
+        "name": "unnamedWire#104",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#18",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "Splitter#21",
+          "pinName": "O54"
+        },
+        "name": "unnamedWire#105",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#21",
+          "pinName": "O53"
+        },
+        "pin2": {
+          "compName": "Splitter#18",
+          "pinName": "O5"
+        },
+        "name": "unnamedWire#106",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#18",
+          "pinName": "O4"
+        },
+        "pin2": {
+          "compName": "Splitter#21",
+          "pinName": "O52"
+        },
+        "name": "unnamedWire#107",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#21",
+          "pinName": "O51"
+        },
+        "pin2": {
+          "compName": "Splitter#18",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#108",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dff8#3",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O50"
          },
-        "name": "unnamedWire#195",
+        "name": "unnamedWire#109",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O49"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#196",
+        "name": "unnamedWire#110",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dff8#2",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O48"
          },
-        "name": "unnamedWire#197",
+        "name": "unnamedWire#111",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O47"
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#17",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#198",
+        "name": "unnamedWire#112",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#17",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dff8#1",
-          "pinName": "C"
+          "compName": "Splitter#21",
+          "pinName": "O46"
          },
-        "name": "unnamedWire#199",
+        "name": "unnamedWire#113",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O77"
+          "compName": "Splitter#21",
+          "pinName": "O45"
          },
          "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#17",
            "pinName": "O5"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#114",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O59"
+          "compName": "Splitter#17",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O44"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#115",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O43"
          },
          "pin2": {
-          "compName": "dff8#0",
-          "pinName": "C"
+          "compName": "Splitter#17",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#200",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 775.0
-          }
-        ]
+        "name": "unnamedWire#116",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O58"
+          "compName": "Splitter#21",
+          "pinName": "O42"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#117",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O57"
+          "compName": "Splitter#21",
+          "pinName": "O41"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O1"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#118",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O56"
+          "compName": "Splitter#21",
+          "pinName": "O40"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#119",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O55"
+          "compName": "Splitter#21",
+          "pinName": "O39"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O7"
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#120",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O54"
+          "compName": "Splitter#21",
+          "pinName": "O38"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#121",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O53"
+          "compName": "Splitter#21",
+          "pinName": "O37"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O5"
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#122",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O52"
+          "compName": "Splitter#21",
+          "pinName": "O36"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#123",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O51"
+          "compName": "Splitter#21",
+          "pinName": "O35"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O3"
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#124",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O50"
-        },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O4"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O76"
+          "compName": "Splitter#21",
+          "pinName": "O34"
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#125",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O49"
+          "compName": "Splitter#21",
+          "pinName": "O33"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O1"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#126",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O48"
+          "compName": "Splitter#21",
+          "pinName": "O32"
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#127",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O47"
+          "compName": "Splitter#21",
+          "pinName": "O31"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O7"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#128",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O46"
+          "compName": "Splitter#21",
+          "pinName": "O30"
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#129",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O45"
+          "compName": "Splitter#21",
+          "pinName": "O29"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O5"
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#130",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O44"
+          "compName": "Splitter#21",
+          "pinName": "O28"
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#131",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O43"
+          "compName": "Splitter#21",
+          "pinName": "O27"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O3"
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#132",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O42"
+          "compName": "Splitter#21",
+          "pinName": "O26"
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#133",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O41"
+          "compName": "Splitter#21",
+          "pinName": "O25"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O1"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#134",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O40"
-        },
-        "name": "unnamedWire#39",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O75"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O24"
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#135",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O39"
+          "compName": "Splitter#21",
+          "pinName": "O23"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O7"
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#136",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O38"
+          "compName": "Splitter#21",
+          "pinName": "O22"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#137",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O37"
+          "compName": "Splitter#21",
+          "pinName": "O21"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O5"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#138",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O36"
+          "compName": "Splitter#21",
+          "pinName": "O20"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#139",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O35"
+          "compName": "Splitter#21",
+          "pinName": "O19"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O3"
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#140",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O34"
+          "compName": "Splitter#21",
+          "pinName": "O18"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#141",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O33"
+          "compName": "Splitter#21",
+          "pinName": "O17"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O1"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#142",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O32"
+          "compName": "Splitter#21",
+          "pinName": "O16"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#143",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O31"
+          "compName": "Splitter#21",
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O7"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#144",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O30"
-        },
-        "name": "unnamedWire#49",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O74"
+          "compName": "Splitter#21",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#145",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O29"
+          "compName": "Splitter#21",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O5"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#146",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O28"
+          "compName": "Splitter#21",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#147",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O27"
+          "compName": "Splitter#21",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O3"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#148",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O26"
+          "compName": "Splitter#21",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#149",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O25"
+          "compName": "Splitter#21",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O1"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#150",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O24"
+          "compName": "Splitter#21",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#151",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O23"
+          "compName": "Splitter#21",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O7"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#152",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O22"
+          "compName": "Splitter#21",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#153",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O21"
+          "compName": "Splitter#21",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O5"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#154",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O20"
+          "compName": "Splitter#21",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#155",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O73"
+          "compName": "Splitter#21",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "Splitter#1",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#156",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O19"
+          "compName": "Splitter#1",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#157",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O2"
+          "compName": "Splitter#21",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O18"
+          "compName": "Splitter#1",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#158",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O17"
+          "compName": "Splitter#1",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O1"
+          "compName": "Splitter#21",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#159",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O0"
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O16"
+          "compName": "dff8#9",
+          "pinName": "D"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#160",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O15"
+          "compName": "dff8#9",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O7"
+          "compName": "Splitter#20",
+          "pinName": "I"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#161",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O6"
+          "compName": "Splitter#3",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O14"
+          "compName": "dff8#8",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#162",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "dff8#7",
+          "pinName": "D"
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#163",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O13"
+          "compName": "Splitter#5",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O5"
+          "compName": "dff8#6",
+          "pinName": "D"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#164",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O4"
+          "compName": "Splitter#6",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O12"
+          "compName": "dff8#5",
+          "pinName": "D"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#165",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
+          "compName": "Splitter#7",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O3"
+          "compName": "dff8#4",
+          "pinName": "D"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#166",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O2"
+          "compName": "Splitter#8",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
+          "compName": "dff8#3",
+          "pinName": "D"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#167",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "Splitter#9",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O72"
+          "compName": "dff8#2",
+          "pinName": "D"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#168",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
+          "compName": "Splitter#10",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O1"
+          "compName": "dff8#1",
+          "pinName": "D"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#169",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O0"
+          "compName": "Splitter#11",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
+          "compName": "dff8#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#170",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O7"
+          "compName": "dff8#0",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#171",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O6"
+          "compName": "dff8#1",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
+          "compName": "Splitter#19",
+          "pinName": "I"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#172",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O5"
+          "compName": "Splitter#13",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O5"
+          "compName": "dff8#2",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#173",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O4"
+          "compName": "dff8#3",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O4"
+          "compName": "Splitter#12",
+          "pinName": "I"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#174",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
+          "compName": "Splitter#15",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O3"
+          "compName": "dff8#4",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#175",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O2"
+          "compName": "dff8#5",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
+          "compName": "Splitter#17",
+          "pinName": "I"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#176",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "Splitter#18",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
+          "compName": "dff8#6",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#177",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
+          "compName": "dff8#7",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "compName": "Splitter#16",
+          "pinName": "I"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#178",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O71"
+          "compName": "Splitter#14",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O7"
+          "compName": "dff8#8",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#179",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O79"
+          "compName": "_submodelinterface",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O7"
+          "compName": "Splitter#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#180",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O6"
+          "compName": "_submodelinterface",
+          "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#21",
-          "pinName": "O78"
+          "pinName": "I"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#181",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O77"
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#82",
-        "path": []
+        "name": "unnamedWire#182",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 25.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O76"
+          "compName": "dff8#9",
+          "pinName": "C"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#183",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O75"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O3"
+          "compName": "dff8#8",
+          "pinName": "C"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#184",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O74"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#185",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O73"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#186",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O72"
+          "compName": "dff8#7",
+          "pinName": "C"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#187",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O71"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O7"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#188",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O70"
+          "compName": "dff8#6",
+          "pinName": "C"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#189",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O70"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#190",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O69"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O5"
+          "compName": "dff8#5",
+          "pinName": "C"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#191",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O68"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#192",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O67"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O3"
+          "compName": "dff8#4",
+          "pinName": "C"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#193",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O66"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#194",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O65"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O1"
+          "compName": "dff8#3",
+          "pinName": "C"
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#195",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O64"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#196",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O63"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O7"
+          "compName": "dff8#2",
+          "pinName": "C"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#197",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O62"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#198",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O61"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O5"
+          "compName": "dff8#1",
+          "pinName": "C"
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#199",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O60"
+          "compName": "dff8#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#99",
-        "path": []
+        "name": "unnamedWire#200",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 775.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
@@ -2934,6 +2934,69 @@
            "subStateID": "q1"
          }
        },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q2"
+        }
+      },
+      "q3": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q3"
+        }
+      },
+      "q4": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q4"
+        }
+      },
+      "q5": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q5"
+        }
+      },
+      "q6": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q6"
+        }
+      },
+      "q7": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q7"
+        }
+      },
+      "q8": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q8"
+        }
+      },
+      "q8-1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#0",
+          "subStateID": "q"
+        }
+      },
+      "q9": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff8#1",
+          "subStateID": "q1"
+        }
+      },
        "q10": {
          "id": "delegating",
          "params": {
@@ -3011,13 +3074,6 @@
            "subStateID": "q3"
          }
        },
-      "q2": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q2"
-        }
-      },
        "q20": {
          "id": "delegating",
          "params": {
@@ -3095,13 +3151,6 @@
            "subStateID": "q5"
          }
        },
-      "q3": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q3"
-        }
-      },
        "q30": {
          "id": "delegating",
          "params": {
@@ -3179,13 +3228,6 @@
            "subStateID": "q7"
          }
        },
-      "q4": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q4"
-        }
-      },
        "q40": {
          "id": "delegating",
          "params": {
@@ -3270,13 +3312,6 @@
            "subStateID": "q1"
          }
        },
-      "q5": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q5"
-        }
-      },
        "q50": {
          "id": "delegating",
          "params": {
@@ -3354,13 +3389,6 @@
            "subStateID": "q3"
          }
        },
-      "q6": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q6"
-        }
-      },
        "q60": {
          "id": "delegating",
          "params": {
@@ -3438,13 +3466,6 @@
            "subStateID": "q5"
          }
        },
-      "q7": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q7"
-        }
-      },
        "q70": {
          "id": "delegating",
          "params": {
@@ -3522,20 +3543,6 @@
            "subStateID": "q7"
          }
        },
-      "q8": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q8"
-        }
-      },
-      "q8-1": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#0",
-          "subStateID": "q"
-        }
-      },
        "q80": {
          "id": "delegating",
          "params": {
@@ -3549,13 +3556,6 @@
            "delegateTarget": "dff8#9",
            "subStateID": "q"
          }
-      },
-      "q9": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff8#1",
-          "subStateID": "q1"
-        }
        }
      }
    },
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json

index 87f5370..bcac03d 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
@@ -177,66 +177,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
-          "compName": "dlatch#3",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch#0",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch#1",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q2"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch#2",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q3"
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch#3",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q4"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#2",
@@ -337,6 +277,66 @@
          },
          "name": "unnamedWire#9",
          "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D4"
+        },
+        "pin2": {
+          "compName": "dlatch#3",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#0",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q1"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#1",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q2"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#2",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q3"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#3",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q4"
+        },
+        "name": "unnamedWire#14",
+        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json

index c871a95..8b5ed99 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json
@@ -68,16 +68,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 89.0,
-          "y": 74.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 39.0,
            "y": 54.0
@@ -86,7 +77,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 39.0,
            "y": 84.0
@@ -95,7 +86,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 89.0,
            "y": 104.0
@@ -104,7 +95,7 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 89.0,
            "y": 44.0
@@ -112,24 +103,17 @@
          "params": 1
        },
        {
-        "id": "dlatch",
-        "name": "dlatch#10",
-        "pos": {
-          "x": 95.0,
-          "y": 60.0
-        }
-      },
-      {
-        "id": "dlatch",
-        "name": "dlatch#11",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 45.0,
-          "y": 40.0
-        }
+          "x": 89.0,
+          "y": 74.0
+        },
+        "params": 1
        },
        {
          "id": "dlatch",
-        "name": "dlatch#4",
+        "name": "dlatch#0",
          "pos": {
            "x": 45.0,
            "y": 10.0
@@ -137,7 +121,7 @@
        },
        {
          "id": "dlatch",
-        "name": "dlatch#5",
+        "name": "dlatch#1",
          "pos": {
            "x": 95.0,
            "y": 90.0
@@ -145,7 +129,7 @@
        },
        {
          "id": "dlatch",
-        "name": "dlatch#6",
+        "name": "dlatch#2",
          "pos": {
            "x": 95.0,
            "y": 120.0
@@ -153,7 +137,7 @@
        },
        {
          "id": "dlatch",
-        "name": "dlatch#7",
+        "name": "dlatch#3",
          "pos": {
            "x": 45.0,
            "y": 100.0
@@ -161,7 +145,7 @@
        },
        {
          "id": "dlatch",
-        "name": "dlatch#8",
+        "name": "dlatch#4",
          "pos": {
            "x": 45.0,
            "y": 70.0
@@ -169,11 +153,27 @@
        },
        {
          "id": "dlatch",
-        "name": "dlatch#9",
+        "name": "dlatch#5",
          "pos": {
            "x": 95.0,
            "y": 30.0
          }
+      },
+      {
+        "id": "dlatch",
+        "name": "dlatch#6",
+        "pos": {
+          "x": 95.0,
+          "y": 60.0
+        }
+      },
+      {
+        "id": "dlatch",
+        "name": "dlatch#7",
+        "pos": {
+          "x": 45.0,
+          "y": 40.0
+        }
        }
      ],
      "wires": [
@@ -183,7 +183,7 @@
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "name": "unnamedWire#0",
@@ -212,14 +212,104 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#11",
+          "compName": "_submodelinterface",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dlatch#0",
+          "pinName": "E"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#0",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 15.0
+          },
+          {
+            "x": 20.0,
+            "y": 40.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dlatch#5",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 50.0
+          },
+          {
+            "x": 25.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#7",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O5"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#8",
          "path": [
            {
              "x": 30.0,
@@ -237,10 +327,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "dlatch#10",
+          "compName": "dlatch#6",
            "pinName": "D"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#9",
          "path": [
            {
              "x": 25.0,
@@ -254,14 +344,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#8",
+          "compName": "dlatch#4",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O3"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 25.0,
@@ -279,10 +369,10 @@
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch#5",
+          "compName": "dlatch#1",
            "pinName": "D"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#11",
          "path": [
            {
              "x": 25.0,
@@ -296,14 +386,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#7",
+          "compName": "dlatch#3",
            "pinName": "D"
          },
          "pin2": {
            "compName": "Splitter#0",
            "pinName": "O1"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 25.0,
@@ -321,10 +411,10 @@
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "dlatch#6",
+          "compName": "dlatch#2",
            "pinName": "D"
          },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#13",
          "path": [
            {
              "x": 20.0,
@@ -338,74 +428,50 @@
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch#11",
+          "compName": "dlatch#7",
            "pinName": "E"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch#8",
+          "compName": "dlatch#4",
            "pinName": "E"
          },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch#7",
+          "compName": "dlatch#3",
            "pinName": "E"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#17",
          "path": [
            {
              "x": 40.0,
@@ -415,14 +481,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#6",
+          "compName": "dlatch#2",
            "pinName": "E"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#18",
          "path": [
            {
              "x": 90.0,
@@ -432,86 +498,62 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch#5",
+          "compName": "dlatch#1",
            "pinName": "E"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch#10",
+          "compName": "dlatch#6",
            "pinName": "E"
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "dlatch#9",
-          "pinName": "E"
-        },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch#4",
+          "compName": "dlatch#5",
            "pinName": "E"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
@@ -520,10 +562,10 @@
            "pinName": "O7"
          },
          "pin2": {
-          "compName": "dlatch#4",
+          "compName": "dlatch#0",
            "pinName": "Q"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#24",
          "path": [
            {
              "x": 155.0,
@@ -545,14 +587,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#9",
+          "compName": "dlatch#5",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O6"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#25",
          "path": [
            {
              "x": 150.0,
@@ -570,10 +612,10 @@
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "dlatch#11",
+          "compName": "dlatch#7",
            "pinName": "Q"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#26",
          "path": [
            {
              "x": 145.0,
@@ -599,10 +641,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "dlatch#10",
+          "compName": "dlatch#6",
            "pinName": "Q"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#27",
          "path": [
            {
              "x": 140.0,
@@ -620,10 +662,10 @@
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "dlatch#8",
+          "compName": "dlatch#4",
            "pinName": "Q"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#28",
          "path": [
            {
              "x": 140.0,
@@ -645,14 +687,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#5",
+          "compName": "dlatch#1",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#29",
          "path": [
            {
              "x": 140.0,
@@ -670,10 +712,10 @@
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "dlatch#7",
+          "compName": "dlatch#3",
            "pinName": "Q"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#30",
          "path": [
            {
              "x": 140.0,
@@ -695,14 +737,14 @@
        },
        {
          "pin1": {
-          "compName": "dlatch#6",
+          "compName": "dlatch#2",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#1",
            "pinName": "O0"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 150.0,
@@ -713,48 +755,6 @@
              "y": 110.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "dlatch#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 15.0
-          },
-          {
-            "x": 20.0,
-            "y": 40.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dlatch#9",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 50.0
-          },
-          {
-            "x": 25.0,
-            "y": 35.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
@@ -800,56 +800,56 @@
        "q1": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#6",
+          "delegateTarget": "dlatch#2",
            "subStateID": "q"
          }
        },
        "q2": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#7",
+          "delegateTarget": "dlatch#3",
            "subStateID": "q"
          }
        },
        "q3": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#5",
+          "delegateTarget": "dlatch#1",
            "subStateID": "q"
          }
        },
        "q4": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#8",
+          "delegateTarget": "dlatch#4",
            "subStateID": "q"
          }
        },
        "q5": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#10",
+          "delegateTarget": "dlatch#6",
            "subStateID": "q"
          }
        },
        "q6": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#11",
+          "delegateTarget": "dlatch#7",
            "subStateID": "q"
          }
        },
        "q7": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#9",
+          "delegateTarget": "dlatch#5",
            "subStateID": "q"
          }
        },
        "q8": {
          "id": "delegating",
          "params": {
-          "delegateTarget": "dlatch#4",
+          "delegateTarget": "dlatch#0",
            "subStateID": "q"
          }
        }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json

index d46c784..bd92d89 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json
@@ -59,10 +59,10 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#2",
          "pos": {
            "x": 30.0,
-          "y": 670.0
+          "y": 30.0
          },
          "params": {
            "logicWidth": 8,
@@ -71,10 +71,10 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#3",
          "pos": {
            "x": 30.0,
-          "y": 750.0
+          "y": 110.0
          },
          "params": {
            "logicWidth": 8,
@@ -83,118 +83,118 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#4",
          "pos": {
-          "x": 90.0,
-          "y": 510.0
+          "x": 30.0,
+          "y": 190.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#5",
          "pos": {
-          "x": 90.0,
-          "y": 590.0
+          "x": 30.0,
+          "y": 270.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#6",
          "pos": {
-          "x": 90.0,
-          "y": 110.0
+          "x": 30.0,
+          "y": 350.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#7",
          "pos": {
-          "x": 90.0,
+          "x": 30.0,
            "y": 430.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#8",
          "pos": {
-          "x": 90.0,
-          "y": 190.0
+          "x": 30.0,
+          "y": 510.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#9",
          "pos": {
-          "x": 90.0,
-          "y": 350.0
+          "x": 30.0,
+          "y": 590.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#10",
          "pos": {
-          "x": 90.0,
-          "y": 270.0
+          "x": 30.0,
+          "y": 670.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#11",
          "pos": {
-          "x": 90.0,
-          "y": 670.0
+          "x": 30.0,
+          "y": 750.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#12",
          "pos": {
-          "x": 30.0,
-          "y": 30.0
+          "x": 90.0,
+          "y": 510.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#13",
          "pos": {
            "x": 90.0,
-          "y": 30.0
+          "y": 590.0
          },
          "params": {
            "logicWidth": 8,
@@ -203,97 +203,97 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#21",
+        "name": "Splitter#14",
          "pos": {
-          "x": 105.0,
-          "y": 30.0
+          "x": 90.0,
+          "y": 110.0
          },
          "params": {
-          "logicWidth": 80,
-          "orientation": "LEFT"
+          "logicWidth": 8,
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#3",
+        "name": "Splitter#15",
          "pos": {
-          "x": 30.0,
-          "y": 110.0
+          "x": 90.0,
+          "y": 430.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#16",
          "pos": {
-          "x": 30.0,
+          "x": 90.0,
            "y": 190.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#5",
+        "name": "Splitter#17",
          "pos": {
-          "x": 30.0,
-          "y": 270.0
+          "x": 90.0,
+          "y": 350.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#6",
+        "name": "Splitter#18",
          "pos": {
-          "x": 30.0,
-          "y": 350.0
+          "x": 90.0,
+          "y": 270.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#19",
          "pos": {
-          "x": 30.0,
-          "y": 430.0
+          "x": 90.0,
+          "y": 670.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#20",
          "pos": {
-          "x": 30.0,
-          "y": 510.0
+          "x": 90.0,
+          "y": 30.0
          },
          "params": {
            "logicWidth": 8,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
          }
        },
        {
          "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#21",
          "pos": {
-          "x": 30.0,
-          "y": 590.0
+          "x": 105.0,
+          "y": 30.0
          },
          "params": {
-          "logicWidth": 8,
+          "logicWidth": 80,
            "orientation": "LEFT"
          }
        },
@@ -487,2400 +487,2400 @@
        {
          "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O69"
+          "pinName": "O77"
          },
          "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
            "pinName": "O5"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O59"
+          "compName": "Splitter#2",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#0",
+          "pinName": "O76"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O75"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
            "pinName": "O3"
          },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O58"
+          "compName": "Splitter#0",
+          "pinName": "O74"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O57"
+          "compName": "Splitter#0",
+          "pinName": "O73"
          },
          "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O1"
          },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#2",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O56"
+          "compName": "Splitter#0",
+          "pinName": "O72"
          },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O55"
+          "compName": "Splitter#0",
+          "pinName": "O71"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O7"
          },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O54"
+          "compName": "Splitter#0",
+          "pinName": "O70"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O53"
+          "compName": "Splitter#0",
+          "pinName": "O69"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O5"
          },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O52"
+          "compName": "Splitter#0",
+          "pinName": "O68"
          },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#11",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O51"
+          "compName": "Splitter#0",
+          "pinName": "O67"
          },
          "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O3"
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O50"
+          "compName": "Splitter#0",
+          "pinName": "O66"
          },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O4"
+          "compName": "Splitter#0",
+          "pinName": "O65"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O68"
+          "compName": "Splitter#3",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O49"
-        },
-        "pin2": {
-          "compName": "Splitter#18",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#110",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#3",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O48"
+          "compName": "Splitter#0",
+          "pinName": "O64"
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O47"
+          "compName": "Splitter#0",
+          "pinName": "O63"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O7"
          },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O46"
+          "compName": "Splitter#0",
+          "pinName": "O62"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#17",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O45"
+          "compName": "Splitter#0",
+          "pinName": "O61"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O5"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O44"
+          "compName": "Splitter#0",
+          "pinName": "O60"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O43"
+          "compName": "Splitter#0",
+          "pinName": "O59"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O3"
          },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O42"
+          "compName": "Splitter#0",
+          "pinName": "O58"
          },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O41"
+          "compName": "Splitter#0",
+          "pinName": "O57"
          },
          "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O1"
          },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#4",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O40"
-        },
-        "name": "unnamedWire#119",
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O67"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "pinName": "O56"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O39"
+          "compName": "Splitter#0",
+          "pinName": "O55"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O7"
          },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O38"
+          "compName": "Splitter#0",
+          "pinName": "O54"
          },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O37"
+          "compName": "Splitter#0",
+          "pinName": "O53"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O5"
          },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O36"
+          "compName": "Splitter#0",
+          "pinName": "O52"
          },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O35"
+          "compName": "Splitter#0",
+          "pinName": "O51"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O3"
          },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#28",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O34"
+          "compName": "Splitter#0",
+          "pinName": "O50"
          },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#29",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O33"
+          "compName": "Splitter#0",
+          "pinName": "O49"
          },
          "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O1"
          },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#30",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#5",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O32"
+          "compName": "Splitter#0",
+          "pinName": "O48"
          },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#31",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O31"
+          "compName": "Splitter#0",
+          "pinName": "O47"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O7"
          },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#32",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O6"
          },
-        "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O30"
-        },
-        "name": "unnamedWire#129",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O66"
+          "pinName": "O46"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#33",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O29"
+          "compName": "Splitter#0",
+          "pinName": "O45"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O5"
          },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#34",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O28"
+          "compName": "Splitter#0",
+          "pinName": "O44"
          },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#35",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O27"
+          "compName": "Splitter#0",
+          "pinName": "O43"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O3"
          },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O26"
+          "compName": "Splitter#0",
+          "pinName": "O42"
          },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#37",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O25"
+          "compName": "Splitter#0",
+          "pinName": "O41"
          },
          "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O1"
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#38",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O24"
+          "compName": "Splitter#0",
+          "pinName": "O40"
          },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#39",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O23"
+          "compName": "Splitter#0",
+          "pinName": "O39"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O7"
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O22"
+          "compName": "Splitter#0",
+          "pinName": "O38"
          },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#41",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O21"
+          "compName": "Splitter#0",
+          "pinName": "O37"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O5"
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#42",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O20"
-        },
-        "name": "unnamedWire#139",
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O65"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "pinName": "O36"
          },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O19"
+          "compName": "Splitter#0",
+          "pinName": "O35"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O3"
          },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O18"
+          "compName": "Splitter#0",
+          "pinName": "O34"
          },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#45",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O17"
+          "compName": "Splitter#0",
+          "pinName": "O33"
          },
          "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O1"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O16"
+          "compName": "Splitter#0",
+          "pinName": "O32"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O15"
+          "compName": "Splitter#0",
+          "pinName": "O31"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O7"
          },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O14"
+          "compName": "Splitter#0",
+          "pinName": "O30"
          },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O13"
+          "compName": "Splitter#0",
+          "pinName": "O29"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O5"
          },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O12"
+          "compName": "Splitter#0",
+          "pinName": "O28"
          },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#51",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O11"
+          "compName": "Splitter#0",
+          "pinName": "O27"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O3"
          },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O2"
          },
-        "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#149",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O64"
+          "pinName": "O26"
          },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O9"
+          "compName": "Splitter#0",
+          "pinName": "O25"
          },
          "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O1"
          },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#8",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O8"
+          "compName": "Splitter#0",
+          "pinName": "O24"
          },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O7"
+          "compName": "Splitter#0",
+          "pinName": "O23"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O7"
          },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O6"
+          "compName": "Splitter#0",
+          "pinName": "O22"
          },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O5"
+          "compName": "Splitter#0",
+          "pinName": "O21"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O5"
          },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#58",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O4"
+          "compName": "Splitter#0",
+          "pinName": "O20"
          },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#59",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O3"
+          "compName": "Splitter#0",
+          "pinName": "O19"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O3"
          },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#60",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O2"
+          "compName": "Splitter#0",
+          "pinName": "O18"
          },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#61",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O1"
+          "compName": "Splitter#0",
+          "pinName": "O17"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O1"
          },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#62",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#9",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O0"
+          "compName": "Splitter#0",
+          "pinName": "O16"
          },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#63",
          "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#0",
-          "pinName": "O63"
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#10",
            "pinName": "O7"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#64",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dlatch8#9",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#65",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch8#9",
-          "pinName": "Q"
+          "compName": "Splitter#0",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#161",
+        "name": "unnamedWire#66",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "dlatch8#8",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#162",
+        "name": "unnamedWire#67",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "dlatch8#7",
-          "pinName": "D"
+          "compName": "Splitter#10",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#163",
+        "name": "unnamedWire#68",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch8#6",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#164",
+        "name": "unnamedWire#69",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "dlatch8#5",
-          "pinName": "D"
+          "compName": "Splitter#10",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#70",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "Splitter#10",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dlatch8#4",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#71",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "dlatch8#3",
-          "pinName": "D"
+          "compName": "Splitter#11",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#167",
+        "name": "unnamedWire#72",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "I"
+          "compName": "Splitter#11",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dlatch8#2",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#168",
+        "name": "unnamedWire#73",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "dlatch8#1",
-          "pinName": "D"
+          "compName": "Splitter#11",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#169",
+        "name": "unnamedWire#74",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O6"
+          "compName": "Splitter#11",
+          "pinName": "O4"
          },
          "pin2": {
            "compName": "Splitter#0",
-          "pinName": "O62"
+          "pinName": "O4"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#75",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "Splitter#11",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#76",
          "path": []
        },
        {
          "pin1": {
            "compName": "Splitter#11",
-          "pinName": "I"
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch8#0",
-          "pinName": "D"
+          "compName": "Splitter#0",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#170",
+        "name": "unnamedWire#77",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "dlatch8#0",
-          "pinName": "Q"
+          "compName": "Splitter#11",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#78",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch8#1",
-          "pinName": "Q"
+          "compName": "Splitter#11",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#79",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O79"
          },
          "pin2": {
-          "compName": "dlatch8#2",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#80",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch8#3",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O78"
          },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#81",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O77"
          },
          "pin2": {
-          "compName": "dlatch8#4",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#175",
+        "name": "unnamedWire#82",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch8#5",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#17",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O76"
          },
-        "name": "unnamedWire#176",
+        "name": "unnamedWire#83",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#18",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O75"
          },
          "pin2": {
-          "compName": "dlatch8#6",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#177",
+        "name": "unnamedWire#84",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch8#7",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O74"
          },
-        "name": "unnamedWire#178",
+        "name": "unnamedWire#85",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "I"
+          "compName": "Splitter#21",
+          "pinName": "O73"
          },
          "pin2": {
-          "compName": "dlatch8#8",
-          "pinName": "Q"
+          "compName": "Splitter#20",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#179",
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O61"
+          "compName": "Splitter#20",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O5"
+          "compName": "Splitter#21",
+          "pinName": "O72"
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#87",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
+          "compName": "Splitter#21",
+          "pinName": "O71"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "Splitter#14",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#180",
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
+          "compName": "Splitter#14",
+          "pinName": "O6"
          },
          "pin2": {
            "compName": "Splitter#21",
-          "pinName": "I"
+          "pinName": "O70"
          },
-        "name": "unnamedWire#181",
+        "name": "unnamedWire#89",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O69"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O5"
          },
-        "name": "unnamedWire#182",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#90",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "dlatch8#9",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O68"
          },
-        "name": "unnamedWire#183",
+        "name": "unnamedWire#91",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O67"
          },
          "pin2": {
-          "compName": "dlatch8#8",
-          "pinName": "E"
+          "compName": "Splitter#14",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#184",
+        "name": "unnamedWire#92",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O66"
          },
-        "name": "unnamedWire#185",
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O65"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#186",
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#14",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dlatch8#7",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O64"
          },
-        "name": "unnamedWire#187",
+        "name": "unnamedWire#95",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O63"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#188",
+        "name": "unnamedWire#96",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dlatch8#6",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O62"
          },
-        "name": "unnamedWire#189",
+        "name": "unnamedWire#97",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#21",
+          "pinName": "O61"
+        },
+        "pin2": {
+          "compName": "Splitter#16",
+          "pinName": "O5"
+        },
+        "name": "unnamedWire#98",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#16",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#21",
            "pinName": "O60"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#99",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O59"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#190",
+        "name": "unnamedWire#100",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch8#5",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O58"
          },
-        "name": "unnamedWire#191",
+        "name": "unnamedWire#101",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O57"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#192",
+        "name": "unnamedWire#102",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dlatch8#4",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O56"
          },
-        "name": "unnamedWire#193",
+        "name": "unnamedWire#103",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O55"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#194",
+        "name": "unnamedWire#104",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#18",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "Splitter#21",
+          "pinName": "O54"
+        },
+        "name": "unnamedWire#105",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#21",
+          "pinName": "O53"
+        },
+        "pin2": {
+          "compName": "Splitter#18",
+          "pinName": "O5"
+        },
+        "name": "unnamedWire#106",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#18",
+          "pinName": "O4"
+        },
+        "pin2": {
+          "compName": "Splitter#21",
+          "pinName": "O52"
+        },
+        "name": "unnamedWire#107",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#21",
+          "pinName": "O51"
+        },
+        "pin2": {
+          "compName": "Splitter#18",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#108",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "dlatch8#3",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O50"
          },
-        "name": "unnamedWire#195",
+        "name": "unnamedWire#109",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O49"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#196",
+        "name": "unnamedWire#110",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#18",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "dlatch8#2",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O48"
          },
-        "name": "unnamedWire#197",
+        "name": "unnamedWire#111",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O47"
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#17",
+          "pinName": "O7"
          },
-        "name": "unnamedWire#198",
+        "name": "unnamedWire#112",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#17",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "dlatch8#1",
-          "pinName": "E"
+          "compName": "Splitter#21",
+          "pinName": "O46"
          },
-        "name": "unnamedWire#199",
+        "name": "unnamedWire#113",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O77"
+          "compName": "Splitter#21",
+          "pinName": "O45"
          },
          "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#17",
            "pinName": "O5"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#114",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O59"
+          "compName": "Splitter#17",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O44"
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#115",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "Splitter#21",
+          "pinName": "O43"
          },
          "pin2": {
-          "compName": "dlatch8#0",
-          "pinName": "E"
+          "compName": "Splitter#17",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#200",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 775.0
-          }
-        ]
+        "name": "unnamedWire#116",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O58"
+          "compName": "Splitter#21",
+          "pinName": "O42"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#117",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O57"
+          "compName": "Splitter#21",
+          "pinName": "O41"
          },
          "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O1"
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#118",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#17",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O56"
+          "compName": "Splitter#21",
+          "pinName": "O40"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#119",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O55"
+          "compName": "Splitter#21",
+          "pinName": "O39"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O7"
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#120",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O54"
+          "compName": "Splitter#21",
+          "pinName": "O38"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#121",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O53"
+          "compName": "Splitter#21",
+          "pinName": "O37"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O5"
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#122",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O52"
+          "compName": "Splitter#21",
+          "pinName": "O36"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#123",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O51"
+          "compName": "Splitter#21",
+          "pinName": "O35"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O3"
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#124",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O50"
-        },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O4"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O76"
+          "compName": "Splitter#21",
+          "pinName": "O34"
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#125",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O49"
+          "compName": "Splitter#21",
+          "pinName": "O33"
          },
          "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O1"
          },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#126",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#15",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O48"
+          "compName": "Splitter#21",
+          "pinName": "O32"
          },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#127",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O47"
+          "compName": "Splitter#21",
+          "pinName": "O31"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O7"
          },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#128",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O46"
+          "compName": "Splitter#21",
+          "pinName": "O30"
          },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#129",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O45"
+          "compName": "Splitter#21",
+          "pinName": "O29"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O5"
          },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#130",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O44"
+          "compName": "Splitter#21",
+          "pinName": "O28"
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#131",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O43"
+          "compName": "Splitter#21",
+          "pinName": "O27"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O3"
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#132",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O42"
+          "compName": "Splitter#21",
+          "pinName": "O26"
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#133",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O41"
+          "compName": "Splitter#21",
+          "pinName": "O25"
          },
          "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O1"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#134",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#12",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O40"
-        },
-        "name": "unnamedWire#39",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O75"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O24"
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#135",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O39"
+          "compName": "Splitter#21",
+          "pinName": "O23"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O7"
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#136",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O38"
+          "compName": "Splitter#21",
+          "pinName": "O22"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#137",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O37"
+          "compName": "Splitter#21",
+          "pinName": "O21"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O5"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#138",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O36"
+          "compName": "Splitter#21",
+          "pinName": "O20"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#139",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O35"
+          "compName": "Splitter#21",
+          "pinName": "O19"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O3"
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#140",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O34"
+          "compName": "Splitter#21",
+          "pinName": "O18"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#141",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O33"
+          "compName": "Splitter#21",
+          "pinName": "O17"
          },
          "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O1"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#142",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#13",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O32"
+          "compName": "Splitter#21",
+          "pinName": "O16"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#143",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O31"
+          "compName": "Splitter#21",
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O7"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#144",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O30"
-        },
-        "name": "unnamedWire#49",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O74"
+          "compName": "Splitter#21",
+          "pinName": "O14"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#145",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O29"
+          "compName": "Splitter#21",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O5"
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#146",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O28"
+          "compName": "Splitter#21",
+          "pinName": "O12"
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#147",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O27"
+          "compName": "Splitter#21",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O3"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#148",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O26"
+          "compName": "Splitter#21",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#149",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O25"
+          "compName": "Splitter#21",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O1"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#150",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#19",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O24"
+          "compName": "Splitter#21",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#151",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O23"
+          "compName": "Splitter#21",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O7"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#152",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O22"
+          "compName": "Splitter#21",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#153",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O21"
+          "compName": "Splitter#21",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O5"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#154",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#1",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O20"
+          "compName": "Splitter#21",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#155",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O73"
+          "compName": "Splitter#21",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "Splitter#1",
+          "pinName": "O3"
          },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#156",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O19"
+          "compName": "Splitter#1",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O3"
+          "compName": "Splitter#21",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#157",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O2"
+          "compName": "Splitter#21",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O18"
+          "compName": "Splitter#1",
+          "pinName": "O1"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#158",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O17"
+          "compName": "Splitter#1",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O1"
+          "compName": "Splitter#21",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#159",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O0"
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O16"
+          "compName": "dlatch8#9",
+          "pinName": "D"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#160",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O15"
+          "compName": "dlatch8#9",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O7"
+          "compName": "Splitter#20",
+          "pinName": "I"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#161",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O6"
+          "compName": "Splitter#3",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O14"
+          "compName": "dlatch8#8",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#162",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "dlatch8#7",
+          "pinName": "D"
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#163",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O13"
+          "compName": "Splitter#5",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O5"
+          "compName": "dlatch8#6",
+          "pinName": "D"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#164",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O4"
+          "compName": "Splitter#6",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O12"
+          "compName": "dlatch8#5",
+          "pinName": "D"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#165",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
+          "compName": "Splitter#7",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O3"
+          "compName": "dlatch8#4",
+          "pinName": "D"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#166",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O2"
+          "compName": "Splitter#8",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
+          "compName": "dlatch8#3",
+          "pinName": "D"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#167",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "Splitter#9",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O72"
+          "compName": "dlatch8#2",
+          "pinName": "D"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#168",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
+          "compName": "Splitter#10",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O1"
+          "compName": "dlatch8#1",
+          "pinName": "D"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#169",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O0"
+          "compName": "Splitter#11",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
+          "compName": "dlatch8#0",
+          "pinName": "D"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#170",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O7"
+          "compName": "dlatch8#0",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#171",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O6"
+          "compName": "dlatch8#1",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
+          "compName": "Splitter#19",
+          "pinName": "I"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#172",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O5"
+          "compName": "Splitter#13",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O5"
+          "compName": "dlatch8#2",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#173",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O4"
+          "compName": "dlatch8#3",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O4"
+          "compName": "Splitter#12",
+          "pinName": "I"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#174",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
+          "compName": "Splitter#15",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O3"
+          "compName": "dlatch8#4",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#175",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O2"
+          "compName": "dlatch8#5",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
+          "compName": "Splitter#17",
+          "pinName": "I"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#176",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "Splitter#18",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
+          "compName": "dlatch8#6",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#177",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
+          "compName": "dlatch8#7",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "compName": "Splitter#16",
+          "pinName": "I"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#178",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O71"
+          "compName": "Splitter#14",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O7"
+          "compName": "dlatch8#8",
+          "pinName": "Q"
          },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#179",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O79"
+          "compName": "_submodelinterface",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O7"
+          "compName": "Splitter#0",
+          "pinName": "I"
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#180",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O6"
+          "compName": "_submodelinterface",
+          "pinName": "Q"
          },
          "pin2": {
            "compName": "Splitter#21",
-          "pinName": "O78"
+          "pinName": "I"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#181",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O77"
+          "compName": "_submodelinterface",
+          "pinName": "E"
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#82",
-        "path": []
+        "name": "unnamedWire#182",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 25.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O76"
+          "compName": "dlatch8#9",
+          "pinName": "E"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#183",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O75"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O3"
+          "compName": "dlatch8#8",
+          "pinName": "E"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#184",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O74"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#185",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O73"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#20",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#186",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#20",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O72"
+          "compName": "dlatch8#7",
+          "pinName": "E"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#187",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O71"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O7"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#188",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O70"
+          "compName": "dlatch8#6",
+          "pinName": "E"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#189",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O70"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#190",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O69"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O5"
+          "compName": "dlatch8#5",
+          "pinName": "E"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#191",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O68"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#192",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O67"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O3"
+          "compName": "dlatch8#4",
+          "pinName": "E"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#193",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O66"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#194",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O65"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#14",
-          "pinName": "O1"
+          "compName": "dlatch8#3",
+          "pinName": "E"
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#195",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#14",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O64"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#196",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O63"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O7"
+          "compName": "dlatch8#2",
+          "pinName": "E"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#197",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O62"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#198",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#21",
-          "pinName": "O61"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O5"
+          "compName": "dlatch8#1",
+          "pinName": "E"
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#199",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O4"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#21",
-          "pinName": "O60"
+          "compName": "dlatch8#0",
+          "pinName": "E"
          },
-        "name": "unnamedWire#99",
-        "path": []
+        "name": "unnamedWire#200",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 775.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
@@ -2934,6 +2934,69 @@
            "subStateID": "q1"
          }
        },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q2"
+        }
+      },
+      "q3": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q3"
+        }
+      },
+      "q4": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q4"
+        }
+      },
+      "q5": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q5"
+        }
+      },
+      "q6": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q6"
+        }
+      },
+      "q7": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q7"
+        }
+      },
+      "q8": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q8"
+        }
+      },
+      "q8-1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#0",
+          "subStateID": "q"
+        }
+      },
+      "q9": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dlatch8#1",
+          "subStateID": "q1"
+        }
+      },
        "q10": {
          "id": "delegating",
          "params": {
@@ -3011,13 +3074,6 @@
            "subStateID": "q3"
          }
        },
-      "q2": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q2"
-        }
-      },
        "q20": {
          "id": "delegating",
          "params": {
@@ -3095,13 +3151,6 @@
            "subStateID": "q5"
          }
        },
-      "q3": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q3"
-        }
-      },
        "q30": {
          "id": "delegating",
          "params": {
@@ -3179,13 +3228,6 @@
            "subStateID": "q7"
          }
        },
-      "q4": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q4"
-        }
-      },
        "q40": {
          "id": "delegating",
          "params": {
@@ -3270,13 +3312,6 @@
            "subStateID": "q1"
          }
        },
-      "q5": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q5"
-        }
-      },
        "q50": {
          "id": "delegating",
          "params": {
@@ -3354,13 +3389,6 @@
            "subStateID": "q3"
          }
        },
-      "q6": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q6"
-        }
-      },
        "q60": {
          "id": "delegating",
          "params": {
@@ -3438,13 +3466,6 @@
            "subStateID": "q5"
          }
        },
-      "q7": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q7"
-        }
-      },
        "q70": {
          "id": "delegating",
          "params": {
@@ -3522,20 +3543,6 @@
            "subStateID": "q7"
          }
        },
-      "q8": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q8"
-        }
-      },
-      "q8-1": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#0",
-          "subStateID": "q"
-        }
-      },
        "q80": {
          "id": "delegating",
          "params": {
@@ -3549,13 +3556,6 @@
            "delegateTarget": "dlatch8#9",
            "subStateID": "q"
          }
-      },
-      "q9": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dlatch8#1",
-          "subStateID": "q1"
-        }
        }
      }
    },
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json

index d56f83e..f3970fc 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
@@ -136,60 +136,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#10",
-        "path": [
-          {
-            "x": 62.5,
-            "y": 12.5
-          },
-          {
-            "x": 62.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 62.5,
-            "y": 37.5
-          },
-          {
-            "x": 62.5,
-            "y": 17.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -319,6 +265,60 @@
              "y": 32.5
            }
          ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 62.5,
+            "y": 12.5
+          },
+          {
+            "x": 62.5,
+            "y": 7.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 62.5,
+            "y": 37.5
+          },
+          {
+            "x": 62.5,
+            "y": 17.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#12",
+        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json

index 3997209..241afab 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json
@@ -122,17 +122,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#10"
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -230,6 +219,17 @@
            "pinName": "B"
          },
          "name": "unnamedWire#9"
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#10"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json

index 9f1da98..8d87b13 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json
@@ -107,199 +107,199 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 89.0,
-          "y": 4.0
+          "x": 144.0,
+          "y": 119.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 84.0,
-          "y": 19.0
+          "x": 139.0,
+          "y": 109.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 49.0,
-          "y": 24.0
+          "x": 139.0,
+          "y": 169.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 49.0,
-          "y": 14.0
+          "x": 144.0,
+          "y": 179.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 84.0,
-          "y": 269.0
+          "x": 144.0,
+          "y": 239.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 89.0,
-          "y": 279.0
+          "x": 139.0,
+          "y": 229.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 84.0,
-          "y": 209.0
+          "x": 144.0,
+          "y": 299.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 89.0,
-          "y": 219.0
+          "x": 139.0,
+          "y": 289.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 89.0,
-          "y": 159.0
+          "y": 4.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 84.0,
-          "y": 149.0
+          "y": 19.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 144.0,
-          "y": 119.0
+          "x": 49.0,
+          "y": 24.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 84.0,
-          "y": 89.0
+          "x": 49.0,
+          "y": 14.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 89.0,
-          "y": 99.0
+          "x": 84.0,
+          "y": 269.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 84.0,
-          "y": 29.0
+          "x": 89.0,
+          "y": 279.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
+        "name": "WireCrossPoint#16",
          "pos": {
-          "x": 89.0,
-          "y": 39.0
+          "x": 84.0,
+          "y": 209.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#17",
          "pos": {
-          "x": 139.0,
-          "y": 109.0
+          "x": 89.0,
+          "y": 219.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#18",
          "pos": {
-          "x": 139.0,
-          "y": 169.0
+          "x": 89.0,
+          "y": 159.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#19",
          "pos": {
-          "x": 144.0,
-          "y": 179.0
+          "x": 84.0,
+          "y": 149.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#20",
          "pos": {
-          "x": 144.0,
-          "y": 239.0
+          "x": 84.0,
+          "y": 89.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#21",
          "pos": {
-          "x": 139.0,
-          "y": 229.0
+          "x": 89.0,
+          "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#22",
          "pos": {
-          "x": 144.0,
-          "y": 299.0
+          "x": 84.0,
+          "y": 29.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#23",
          "pos": {
-          "x": 139.0,
-          "y": 289.0
+          "x": 89.0,
+          "y": 39.0
          },
          "params": 1
        },
@@ -319,22 +319,6 @@
            "y": 85.0
          }
        },
-      {
-        "id": "sel1",
-        "name": "sel1#10",
-        "pos": {
-          "x": 95.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "sel1#11",
-        "pos": {
-          "x": 150.0,
-          "y": 345.0
-        }
-      },
        {
          "id": "sel1",
          "name": "sel1#2",
@@ -398,6 +382,22 @@
            "x": 150.0,
            "y": 225.0
          }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#10",
+        "pos": {
+          "x": 95.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#11",
+        "pos": {
+          "x": 150.0,
+          "y": 345.0
+        }
        }
      ],
      "wires": [
@@ -427,308 +427,133 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#10",
-        "path": []
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 20.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "sel1#3",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O11"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 210.0,
-            "y": 30.0
-          },
-          {
-            "x": 210.0,
-            "y": 95.0
+            "x": 145.0,
+            "y": 5.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel1#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O10"
+          "compName": "sel1#3",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#104",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 50.0
-          },
-          {
-            "x": 205.0,
-            "y": 105.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O9"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#1",
-          "pinName": "Y"
+          "compName": "sel1#3",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#105",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 115.0
-          },
-          {
-            "x": 200.0,
-            "y": 90.0
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O8"
+          "compName": "sel1#1",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#106",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 110.0
-          },
-          {
-            "x": 195.0,
-            "y": 125.0
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O7"
+          "compName": "sel1#1",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "sel1#6",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#107",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 135.0
-          },
-          {
-            "x": 195.0,
-            "y": 150.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O6"
-        },
-        "name": "unnamedWire#108",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 170.0
-          },
-          {
-            "x": 200.0,
-            "y": 145.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O5"
-        },
-        "pin2": {
-          "compName": "sel1#7",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#109",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 155.0
-          },
-          {
-            "x": 205.0,
-            "y": 210.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#9",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#110",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 230.0
-          },
-          {
-            "x": 210.0,
-            "y": 165.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "sel1#10",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#111",
-        "path": [
-          {
-            "x": 215.0,
-            "y": 175.0
-          },
-          {
-            "x": 215.0,
-            "y": 270.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#8",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#112",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 290.0
-          },
-          {
-            "x": 220.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#4",
-          "pinName": "Y"
+          "compName": "sel1#6",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#113",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 195.0
-          },
-          {
-            "x": 225.0,
-            "y": 330.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#11",
-          "pinName": "Y"
+          "compName": "sel1#6",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
-        "name": "unnamedWire#114",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 350.0
-          },
-          {
-            "x": 230.0,
-            "y": 205.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "sel1#7",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "sel1#7",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 5.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
@@ -763,7 +588,7 @@
            "compName": "sel1#11",
            "pinName": "S1"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#14",
          "path": [
            {
              "x": 140.0,
@@ -780,7 +605,7 @@
            "compName": "WireCrossPoint#8",
            "pinName": ""
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
@@ -792,26 +617,9 @@
            "compName": "sel1#8",
            "pinName": "S1"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#16",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 20.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "sel1#9",
@@ -821,7 +629,7 @@
            "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#17",
          "path": []
        },
        {
@@ -833,7 +641,7 @@
            "compName": "sel1#9",
            "pinName": "S1"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
@@ -845,7 +653,7 @@
            "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
@@ -857,7 +665,7 @@
            "compName": "sel1#5",
            "pinName": "S1"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
@@ -869,7 +677,7 @@
            "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#21",
          "path": []
        },
        {
@@ -881,7 +689,7 @@
            "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
@@ -893,7 +701,7 @@
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
@@ -905,26 +713,9 @@
            "compName": "sel1#0",
            "pinName": "S1"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#24",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 145.0,
-            "y": 5.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -934,7 +725,7 @@
            "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#25",
          "path": []
        },
        {
@@ -946,7 +737,7 @@
            "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
@@ -958,7 +749,7 @@
            "compName": "WireCrossPoint#7",
            "pinName": ""
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
@@ -970,7 +761,7 @@
            "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#28",
          "path": []
        },
        {
@@ -982,31 +773,19 @@
            "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#29",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#3",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#30",
          "path": []
        },
        {
@@ -1018,7 +797,7 @@
            "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#31",
          "path": []
        },
        {
@@ -1030,7 +809,7 @@
            "compName": "WireCrossPoint#8",
            "pinName": ""
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#32",
          "path": []
        },
        {
@@ -1042,7 +821,7 @@
            "compName": "sel1#11",
            "pinName": "S2"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#33",
          "path": [
            {
              "x": 145.0,
@@ -1059,7 +838,7 @@
            "compName": "WireCrossPoint#20",
            "pinName": ""
          },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#34",
          "path": []
        },
        {
@@ -1071,7 +850,7 @@
            "compName": "WireCrossPoint#19",
            "pinName": ""
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#35",
          "path": []
        },
        {
@@ -1083,7 +862,7 @@
            "compName": "WireCrossPoint#16",
            "pinName": ""
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
@@ -1095,7 +874,7 @@
            "compName": "WireCrossPoint#14",
            "pinName": ""
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#37",
          "path": []
        },
        {
@@ -1107,7 +886,7 @@
            "compName": "sel1#4",
            "pinName": "S1"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#38",
          "path": [
            {
              "x": 85.0,
@@ -1124,7 +903,7 @@
            "compName": "sel1#4",
            "pinName": "S2"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#39",
          "path": [
            {
              "x": 90.0,
@@ -1132,18 +911,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#3",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#15",
@@ -1153,7 +920,7 @@
            "compName": "WireCrossPoint#17",
            "pinName": ""
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#40",
          "path": []
        },
        {
@@ -1165,7 +932,7 @@
            "compName": "WireCrossPoint#18",
            "pinName": ""
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#41",
          "path": []
        },
        {
@@ -1177,7 +944,7 @@
            "compName": "WireCrossPoint#18",
            "pinName": ""
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#42",
          "path": []
        },
        {
@@ -1189,19 +956,7 @@
            "compName": "WireCrossPoint#23",
            "pinName": ""
          },
-        "name": "unnamedWire#53",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#1",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#43",
          "path": []
        },
        {
@@ -1213,7 +968,7 @@
            "compName": "sel1#3",
            "pinName": "I1"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#44",
          "path": [
            {
              "x": 75.0,
@@ -1234,7 +989,7 @@
            "compName": "sel1#0",
            "pinName": "I1"
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#45",
          "path": [
            {
              "x": 70.0,
@@ -1255,7 +1010,7 @@
            "compName": "sel1#1",
            "pinName": "I1"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#46",
          "path": [
            {
              "x": 65.0,
@@ -1276,7 +1031,7 @@
            "compName": "sel1#2",
            "pinName": "I1"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#47",
          "path": [
            {
              "x": 60.0,
@@ -1297,7 +1052,7 @@
            "compName": "sel1#6",
            "pinName": "I1"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#48",
          "path": [
            {
              "x": 55.0,
@@ -1318,7 +1073,7 @@
            "compName": "sel1#5",
            "pinName": "I1"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#49",
          "path": [
            {
              "x": 50.0,
@@ -1330,18 +1085,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "sel1#1",
-          "pinName": "S2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Splitter#0",
@@ -1351,7 +1094,7 @@
            "compName": "sel1#7",
            "pinName": "I1"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#50",
          "path": [
            {
              "x": 45.0,
@@ -1372,7 +1115,7 @@
            "compName": "sel1#9",
            "pinName": "I1"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#51",
          "path": [
            {
              "x": 40.0,
@@ -1393,7 +1136,7 @@
            "compName": "sel1#10",
            "pinName": "I1"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#52",
          "path": [
            {
              "x": 35.0,
@@ -1414,7 +1157,7 @@
            "compName": "sel1#8",
            "pinName": "I1"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#53",
          "path": [
            {
              "x": 30.0,
@@ -1435,7 +1178,7 @@
            "compName": "sel1#4",
            "pinName": "I1"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#54",
          "path": [
            {
              "x": 25.0,
@@ -1456,7 +1199,7 @@
            "compName": "sel1#11",
            "pinName": "I1"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#55",
          "path": [
            {
              "x": 20.0,
@@ -1477,7 +1220,7 @@
            "compName": "Splitter#1",
            "pinName": "I"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
@@ -1489,19 +1232,7 @@
            "compName": "Splitter#0",
            "pinName": "I"
          },
-        "name": "unnamedWire#77",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#6",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
@@ -1513,7 +1244,7 @@
            "compName": "sel1#3",
            "pinName": "I2"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#58",
          "path": [
            {
              "x": 75.0,
@@ -1534,7 +1265,7 @@
            "compName": "sel1#0",
            "pinName": "I2"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#59",
          "path": [
            {
              "x": 70.0,
@@ -1555,7 +1286,7 @@
            "compName": "sel1#1",
            "pinName": "I2"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#60",
          "path": [
            {
              "x": 65.0,
@@ -1576,7 +1307,7 @@
            "compName": "sel1#2",
            "pinName": "I2"
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#61",
          "path": [
            {
              "x": 60.0,
@@ -1597,7 +1328,7 @@
            "compName": "sel1#6",
            "pinName": "I2"
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#62",
          "path": [
            {
              "x": 55.0,
@@ -1618,7 +1349,7 @@
            "compName": "sel1#5",
            "pinName": "I2"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#63",
          "path": [
            {
              "x": 50.0,
@@ -1639,7 +1370,7 @@
            "compName": "sel1#7",
            "pinName": "I2"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#64",
          "path": [
            {
              "x": 45.0,
@@ -1660,7 +1391,7 @@
            "compName": "sel1#9",
            "pinName": "I2"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#65",
          "path": [
            {
              "x": 40.0,
@@ -1672,18 +1403,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "sel1#6",
-          "pinName": "S2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Splitter#1",
@@ -1693,7 +1412,7 @@
            "compName": "sel1#10",
            "pinName": "I2"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#66",
          "path": [
            {
              "x": 35.0,
@@ -1714,7 +1433,7 @@
            "compName": "sel1#8",
            "pinName": "I2"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#67",
          "path": [
            {
              "x": 30.0,
@@ -1735,7 +1454,7 @@
            "compName": "sel1#4",
            "pinName": "I2"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#68",
          "path": [
            {
              "x": 45.0,
@@ -1756,7 +1475,7 @@
            "compName": "sel1#11",
            "pinName": "I2"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#69",
          "path": [
            {
              "x": 40.0,
@@ -1777,7 +1496,7 @@
            "compName": "WireCrossPoint#11",
            "pinName": ""
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#70",
          "path": []
        },
        {
@@ -1789,7 +1508,7 @@
            "compName": "WireCrossPoint#13",
            "pinName": ""
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#71",
          "path": []
        },
        {
@@ -1801,7 +1520,7 @@
            "compName": "NandGate#0",
            "pinName": "B"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#72",
          "path": []
        },
        {
@@ -1813,7 +1532,7 @@
            "compName": "NandGate#0",
            "pinName": "A"
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#73",
          "path": []
        },
        {
@@ -1825,8 +1544,289 @@
            "compName": "WireCrossPoint#12",
            "pinName": ""
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#74",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "sel1#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O11"
+        },
+        "name": "unnamedWire#75",
+        "path": [
+          {
+            "x": 210.0,
+            "y": 30.0
+          },
+          {
+            "x": 210.0,
+            "y": 95.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O10"
+        },
+        "name": "unnamedWire#76",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 50.0
+          },
+          {
+            "x": 205.0,
+            "y": 105.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O9"
+        },
+        "pin2": {
+          "compName": "sel1#1",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#77",
+        "path": [
+          {
+            "x": 200.0,
+            "y": 115.0
+          },
+          {
+            "x": 200.0,
+            "y": 90.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O8"
+        },
+        "name": "unnamedWire#78",
+        "path": [
+          {
+            "x": 195.0,
+            "y": 110.0
+          },
+          {
+            "x": 195.0,
+            "y": 125.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O7"
+        },
+        "pin2": {
+          "compName": "sel1#6",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#79",
+        "path": [
+          {
+            "x": 195.0,
+            "y": 135.0
+          },
+          {
+            "x": 195.0,
+            "y": 150.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#5",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O6"
+        },
+        "name": "unnamedWire#80",
+        "path": [
+          {
+            "x": 200.0,
+            "y": 170.0
+          },
+          {
+            "x": 200.0,
+            "y": 145.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O5"
+        },
+        "pin2": {
+          "compName": "sel1#7",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#81",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 155.0
+          },
+          {
+            "x": 205.0,
+            "y": 210.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#9",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O4"
+        },
+        "name": "unnamedWire#82",
+        "path": [
+          {
+            "x": 210.0,
+            "y": 230.0
+          },
+          {
+            "x": 210.0,
+            "y": 165.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "sel1#10",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#83",
+        "path": [
+          {
+            "x": 215.0,
+            "y": 175.0
+          },
+          {
+            "x": 215.0,
+            "y": 270.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#8",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#84",
+        "path": [
+          {
+            "x": 220.0,
+            "y": 290.0
+          },
+          {
+            "x": 220.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "sel1#4",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#85",
+        "path": [
+          {
+            "x": 225.0,
+            "y": 195.0
+          },
+          {
+            "x": 225.0,
+            "y": 330.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#11",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#86",
+        "path": [
+          {
+            "x": 230.0,
+            "y": 350.0
+          },
+          {
+            "x": 230.0,
+            "y": 205.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#87",
          "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "name": "unnamedWire#88",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 5.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json

index e29bbbf..cd67936 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
@@ -105,6 +105,78 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 164.0,
+          "y": 109.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 169.0,
+          "y": 119.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 164.0,
+          "y": 169.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 169.0,
+          "y": 179.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 169.0,
+          "y": 239.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 164.0,
+          "y": 229.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 164.0,
+          "y": 289.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 169.0,
+          "y": 299.0
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#10",
@@ -195,15 +267,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 164.0,
-          "y": 109.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -294,15 +357,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 169.0,
-          "y": 119.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#30",
@@ -321,60 +375,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 164.0,
-          "y": 169.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 169.0,
-          "y": 179.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 169.0,
-          "y": 239.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 164.0,
-          "y": 229.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 164.0,
-          "y": 289.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 169.0,
-          "y": 299.0
-        },
-        "params": 1
-      },
        {
          "id": "sel1",
          "name": "sel1#0",
@@ -393,114 +393,114 @@
        },
        {
          "id": "sel1",
-        "name": "sel1#10",
+        "name": "sel1#2",
          "pos": {
            "x": 115.0,
-          "y": 265.0
+          "y": 85.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#11",
+        "name": "sel1#3",
          "pos": {
-          "x": 115.0,
-          "y": 325.0
+          "x": 175.0,
+          "y": 105.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#12",
+        "name": "sel1#4",
          "pos": {
            "x": 175.0,
-          "y": 405.0
+          "y": 165.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#13",
+        "name": "sel1#5",
          "pos": {
-          "x": 175.0,
-          "y": 345.0
+          "x": 115.0,
+          "y": 205.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#14",
+        "name": "sel1#6",
          "pos": {
-          "x": 115.0,
-          "y": 385.0
+          "x": 175.0,
+          "y": 225.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#15",
+        "name": "sel1#7",
          "pos": {
-          "x": 175.0,
-          "y": 465.0
+          "x": 115.0,
+          "y": 145.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#2",
+        "name": "sel1#8",
          "pos": {
            "x": 115.0,
-          "y": 85.0
+          "y": 445.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#3",
+        "name": "sel1#9",
          "pos": {
            "x": 175.0,
-          "y": 105.0
+          "y": 285.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#4",
+        "name": "sel1#10",
          "pos": {
-          "x": 175.0,
-          "y": 165.0
+          "x": 115.0,
+          "y": 265.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#5",
+        "name": "sel1#11",
          "pos": {
            "x": 115.0,
-          "y": 205.0
+          "y": 325.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#6",
+        "name": "sel1#12",
          "pos": {
            "x": 175.0,
-          "y": 225.0
+          "y": 405.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#7",
+        "name": "sel1#13",
          "pos": {
-          "x": 115.0,
-          "y": 145.0
+          "x": 175.0,
+          "y": 345.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#8",
+        "name": "sel1#14",
          "pos": {
            "x": 115.0,
-          "y": 445.0
+          "y": 385.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#9",
+        "name": "sel1#15",
          "pos": {
            "x": 175.0,
-          "y": 285.0
+          "y": 465.0
          }
        }
      ],
@@ -531,225 +531,111 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#11",
+          "compName": "sel1#2",
            "pinName": "S1"
          },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O14"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#1",
-          "pinName": "Y"
+          "compName": "sel1#2",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#100",
-        "path": [
-          {
-            "x": 250.0,
-            "y": 185.0
-          },
-          {
-            "x": 250.0,
-            "y": 50.0
-          }
-        ]
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O13"
+          "compName": "sel1#7",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#101",
-        "path": [
-          {
-            "x": 245.0,
-            "y": 90.0
-          },
-          {
-            "x": 245.0,
-            "y": 195.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O12"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#3",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#102",
-        "path": [
-          {
-            "x": 240.0,
-            "y": 205.0
-          },
-          {
-            "x": 240.0,
-            "y": 110.0
-          }
-        ]
-      },
-      {
-        "pin1": {
            "compName": "sel1#7",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O11"
-        },
-        "name": "unnamedWire#103",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 150.0
-          },
-          {
-            "x": 235.0,
-            "y": 215.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#4",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O10"
+          "pinName": "S2"
          },
-        "name": "unnamedWire#104",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 170.0
-          },
-          {
-            "x": 230.0,
-            "y": 225.0
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O9"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
            "compName": "sel1#5",
-          "pinName": "Y"
+          "pinName": "S1"
          },
-        "name": "unnamedWire#105",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 235.0
-          },
-          {
-            "x": 225.0,
-            "y": 210.0
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#6",
-          "pinName": "Y"
+          "compName": "sel1#5",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O8"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#106",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 230.0
-          },
-          {
-            "x": 220.0,
-            "y": 245.0
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O7"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
            "compName": "sel1#10",
-          "pinName": "Y"
+          "pinName": "S1"
          },
-        "name": "unnamedWire#107",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 255.0
-          },
-          {
-            "x": 220.0,
-            "y": 270.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#9",
-          "pinName": "Y"
+          "compName": "sel1#10",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
-        "name": "unnamedWire#108",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 290.0
-          },
-          {
-            "x": 225.0,
-            "y": 265.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
            "compName": "sel1#11",
-          "pinName": "Y"
+          "pinName": "S1"
          },
-        "name": "unnamedWire#109",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 275.0
-          },
-          {
-            "x": 230.0,
-            "y": 330.0
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
@@ -763,140 +649,6 @@
          "name": "unnamedWire#11",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "sel1#13",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#110",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 350.0
-          },
-          {
-            "x": 235.0,
-            "y": 285.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "sel1#14",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#111",
-        "path": [
-          {
-            "x": 240.0,
-            "y": 295.0
-          },
-          {
-            "x": 240.0,
-            "y": 390.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#12",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#112",
-        "path": [
-          {
-            "x": 245.0,
-            "y": 410.0
-          },
-          {
-            "x": 245.0,
-            "y": 305.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "sel1#8",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#113",
-        "path": [
-          {
-            "x": 250.0,
-            "y": 315.0
-          },
-          {
-            "x": 250.0,
-            "y": 450.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#15",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#114",
-        "path": [
-          {
-            "x": 255.0,
-            "y": 470.0
-          },
-          {
-            "x": 255.0,
-            "y": 325.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#115",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 65.0,
-            "y": 5.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "sel1#14",
@@ -998,18 +750,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#2",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "sel1#13",
@@ -1130,18 +870,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#2",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "sel1#1",
@@ -1192,1178 +920,1450 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#34",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#35",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "name": "unnamedWire#36",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "name": "unnamedWire#37",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "name": "unnamedWire#38",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "name": "unnamedWire#39",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "name": "unnamedWire#40",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "name": "unnamedWire#41",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "name": "unnamedWire#42",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "sel1#15",
+          "pinName": "S2"
+        },
+        "name": "unnamedWire#43",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 480.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
+        },
+        "name": "unnamedWire#44",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
+        },
+        "name": "unnamedWire#45",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "name": "unnamedWire#46",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
+        },
+        "name": "unnamedWire#47",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "sel1#8",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#34",
-        "path": []
+        "name": "unnamedWire#48",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 450.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "sel1#8",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#35",
-        "path": []
+        "name": "unnamedWire#49",
+        "path": [
+          {
+            "x": 110.0,
+            "y": 460.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#51",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#28",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#28",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#15",
-          "pinName": "S2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#58",
          "path": [
            {
-            "x": 170.0,
-            "y": 480.0
+            "x": 165.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#44",
-        "path": []
+        "name": "unnamedWire#59",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 5.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O15"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "sel1#0",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#60",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O14"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "sel1#1",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#46",
-        "path": []
+        "name": "unnamedWire#61",
+        "path": [
+          {
+            "x": 90.0,
+            "y": 60.0
+          },
+          {
+            "x": 90.0,
+            "y": 70.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O13"
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "sel1#2",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#47",
-        "path": []
+        "name": "unnamedWire#62",
+        "path": [
+          {
+            "x": 85.0,
+            "y": 70.0
+          },
+          {
+            "x": 85.0,
+            "y": 110.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O12"
          },
          "pin2": {
-          "compName": "sel1#8",
-          "pinName": "S1"
+          "compName": "sel1#3",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#63",
          "path": [
            {
-            "x": 105.0,
-            "y": 450.0
+            "x": 80.0,
+            "y": 80.0
+          },
+          {
+            "x": 80.0,
+            "y": 130.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O11"
          },
          "pin2": {
-          "compName": "sel1#8",
-          "pinName": "S2"
+          "compName": "sel1#7",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#64",
          "path": [
            {
-            "x": 110.0,
-            "y": 460.0
+            "x": 75.0,
+            "y": 90.0
+          },
+          {
+            "x": 75.0,
+            "y": 170.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O10"
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S2"
+          "compName": "sel1#4",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#5",
-        "path": []
+        "name": "unnamedWire#65",
+        "path": [
+          {
+            "x": 70.0,
+            "y": 100.0
+          },
+          {
+            "x": 70.0,
+            "y": 190.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O9"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "sel1#5",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#50",
-        "path": []
+        "name": "unnamedWire#66",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 110.0
+          },
+          {
+            "x": 65.0,
+            "y": 230.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O8"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "sel1#6",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#51",
-        "path": []
+        "name": "unnamedWire#67",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 120.0
+          },
+          {
+            "x": 60.0,
+            "y": 250.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O7"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "sel1#10",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#52",
-        "path": []
+        "name": "unnamedWire#68",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 130.0
+          },
+          {
+            "x": 55.0,
+            "y": 290.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O6"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "sel1#9",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#53",
-        "path": []
+        "name": "unnamedWire#69",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 140.0
+          },
+          {
+            "x": 50.0,
+            "y": 310.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O5"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "sel1#11",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#54",
-        "path": []
+        "name": "unnamedWire#70",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 150.0
+          },
+          {
+            "x": 45.0,
+            "y": 350.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "sel1#13",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#55",
-        "path": []
+        "name": "unnamedWire#71",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 160.0
+          },
+          {
+            "x": 40.0,
+            "y": 370.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "sel1#14",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#56",
-        "path": []
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 170.0
+          },
+          {
+            "x": 35.0,
+            "y": 410.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "sel1#12",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#57",
-        "path": []
+        "name": "unnamedWire#73",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 180.0
+          },
+          {
+            "x": 30.0,
+            "y": 430.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "sel1#8",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#74",
          "path": [
            {
-            "x": 165.0,
-            "y": 20.0
+            "x": 25.0,
+            "y": 190.0
+          },
+          {
+            "x": 25.0,
+            "y": 470.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "O0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "sel1#15",
+          "pinName": "I1"
          },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#75",
          "path": [
            {
-            "x": 170.0,
-            "y": 5.0
+            "x": 20.0,
+            "y": 200.0
+          },
+          {
+            "x": 20.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "sel1#5",
-          "pinName": "S1"
+          "compName": "Splitter#1",
+          "pinName": "I"
          },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#76",
          "path": []
        },
        {
          "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I0"
+        },
+        "pin2": {
            "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#77",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
            "pinName": "O15"
          },
          "pin2": {
            "compName": "sel1#0",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#60",
-        "path": []
+        "name": "unnamedWire#78",
+        "path": [
+          {
+            "x": 95.0,
+            "y": 375.0
+          },
+          {
+            "x": 95.0,
+            "y": 60.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O14"
          },
          "pin2": {
            "compName": "sel1#1",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#79",
          "path": [
            {
              "x": 90.0,
-            "y": 60.0
+            "y": 385.0
            },
            {
              "x": 90.0,
-            "y": 70.0
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O13"
          },
          "pin2": {
            "compName": "sel1#2",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#80",
          "path": [
            {
              "x": 85.0,
-            "y": 70.0
+            "y": 395.0
            },
            {
              "x": 85.0,
-            "y": 110.0
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O12"
          },
          "pin2": {
            "compName": "sel1#3",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#81",
          "path": [
            {
              "x": 80.0,
-            "y": 80.0
+            "y": 405.0
            },
            {
              "x": 80.0,
-            "y": 130.0
+            "y": 140.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O11"
          },
          "pin2": {
            "compName": "sel1#7",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#82",
          "path": [
            {
              "x": 75.0,
-            "y": 90.0
+            "y": 415.0
            },
            {
              "x": 75.0,
-            "y": 170.0
+            "y": 180.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O10"
          },
          "pin2": {
            "compName": "sel1#4",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#83",
          "path": [
            {
              "x": 70.0,
-            "y": 100.0
+            "y": 425.0
            },
            {
              "x": 70.0,
-            "y": 190.0
+            "y": 200.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O9"
          },
          "pin2": {
            "compName": "sel1#5",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#84",
          "path": [
            {
              "x": 65.0,
-            "y": 110.0
+            "y": 435.0
            },
            {
              "x": 65.0,
-            "y": 230.0
+            "y": 240.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O8"
          },
          "pin2": {
            "compName": "sel1#6",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#85",
          "path": [
            {
              "x": 60.0,
-            "y": 120.0
+            "y": 445.0
            },
            {
              "x": 60.0,
-            "y": 250.0
+            "y": 260.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O7"
          },
          "pin2": {
            "compName": "sel1#10",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#86",
          "path": [
            {
              "x": 55.0,
-            "y": 130.0
+            "y": 455.0
            },
            {
              "x": 55.0,
-            "y": 290.0
+            "y": 300.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O6"
          },
          "pin2": {
            "compName": "sel1#9",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#87",
          "path": [
            {
              "x": 50.0,
-            "y": 140.0
+            "y": 465.0
            },
            {
              "x": 50.0,
-            "y": 310.0
+            "y": 320.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel1#5",
-          "pinName": "S2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O5"
          },
          "pin2": {
            "compName": "sel1#11",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#88",
          "path": [
            {
              "x": 45.0,
-            "y": 150.0
+            "y": 475.0
            },
            {
              "x": 45.0,
-            "y": 350.0
+            "y": 360.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O4"
          },
          "pin2": {
            "compName": "sel1#13",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#89",
          "path": [
            {
              "x": 40.0,
-            "y": 160.0
+            "y": 485.0
            },
            {
              "x": 40.0,
-            "y": 370.0
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O3"
          },
          "pin2": {
            "compName": "sel1#14",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#90",
          "path": [
            {
              "x": 35.0,
-            "y": 170.0
+            "y": 495.0
            },
            {
              "x": 35.0,
-            "y": 410.0
+            "y": 420.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O2"
          },
          "pin2": {
            "compName": "sel1#12",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#91",
          "path": [
            {
              "x": 30.0,
-            "y": 180.0
+            "y": 505.0
            },
            {
              "x": 30.0,
-            "y": 430.0
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O1"
          },
          "pin2": {
            "compName": "sel1#8",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#92",
          "path": [
            {
              "x": 25.0,
-            "y": 190.0
+            "y": 515.0
            },
            {
              "x": 25.0,
-            "y": 470.0
+            "y": 480.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O0"
          },
          "pin2": {
            "compName": "sel1#15",
-          "pinName": "I1"
+          "pinName": "I2"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#93",
          "path": [
            {
              "x": 20.0,
-            "y": 200.0
+            "y": 525.0
            },
            {
              "x": 20.0,
-            "y": 490.0
+            "y": 500.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
+          "compName": "NandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#95",
          "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O15"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#96",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#97",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "S"
          },
          "pin2": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "name": "unnamedWire#98",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "sel1#0",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#78",
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O15"
+        },
+        "name": "unnamedWire#99",
          "path": [
            {
-            "x": 95.0,
-            "y": 375.0
+            "x": 255.0,
+            "y": 30.0
            },
            {
-            "x": 95.0,
-            "y": 60.0
+            "x": 255.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O14"
          },
          "pin2": {
            "compName": "sel1#1",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#100",
          "path": [
            {
-            "x": 90.0,
-            "y": 385.0
+            "x": 250.0,
+            "y": 185.0
            },
            {
-            "x": 90.0,
-            "y": 80.0
+            "x": 250.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "sel1#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#10",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O13"
          },
-        "pin2": {
-          "compName": "sel1#2",
-          "pinName": "I2"
-        },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 85.0,
-            "y": 395.0
+            "x": 245.0,
+            "y": 90.0
            },
            {
-            "x": 85.0,
-            "y": 120.0
+            "x": 245.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O12"
          },
          "pin2": {
            "compName": "sel1#3",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#102",
          "path": [
            {
-            "x": 80.0,
-            "y": 405.0
+            "x": 240.0,
+            "y": 205.0
            },
            {
-            "x": 80.0,
-            "y": 140.0
+            "x": 240.0,
+            "y": 110.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O11"
+          "compName": "sel1#7",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O11"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#103",
          "path": [
            {
-            "x": 75.0,
-            "y": 415.0
+            "x": 235.0,
+            "y": 150.0
            },
            {
-            "x": 75.0,
-            "y": 180.0
+            "x": 235.0,
+            "y": 215.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O10"
+          "compName": "sel1#4",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#4",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O10"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#104",
          "path": [
            {
-            "x": 70.0,
-            "y": 425.0
+            "x": 230.0,
+            "y": 170.0
            },
            {
-            "x": 70.0,
-            "y": 200.0
+            "x": 230.0,
+            "y": 225.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O9"
          },
          "pin2": {
            "compName": "sel1#5",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#105",
          "path": [
            {
-            "x": 65.0,
-            "y": 435.0
+            "x": 225.0,
+            "y": 235.0
            },
            {
-            "x": 65.0,
-            "y": 240.0
+            "x": 225.0,
+            "y": 210.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O8"
+          "compName": "sel1#6",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#6",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O8"
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#106",
          "path": [
            {
-            "x": 60.0,
-            "y": 445.0
+            "x": 220.0,
+            "y": 230.0
            },
            {
-            "x": 60.0,
-            "y": 260.0
+            "x": 220.0,
+            "y": 245.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O7"
          },
          "pin2": {
            "compName": "sel1#10",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#107",
          "path": [
            {
-            "x": 55.0,
-            "y": 455.0
+            "x": 220.0,
+            "y": 255.0
            },
            {
-            "x": 55.0,
-            "y": 300.0
+            "x": 220.0,
+            "y": 270.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O6"
+          "compName": "sel1#9",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#9",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O6"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#108",
          "path": [
            {
-            "x": 50.0,
-            "y": 465.0
+            "x": 225.0,
+            "y": 290.0
            },
            {
-            "x": 50.0,
-            "y": 320.0
+            "x": 225.0,
+            "y": 265.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O5"
          },
          "pin2": {
            "compName": "sel1#11",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#109",
          "path": [
            {
-            "x": 45.0,
-            "y": 475.0
+            "x": 230.0,
+            "y": 275.0
            },
            {
-            "x": 45.0,
-            "y": 360.0
+            "x": 230.0,
+            "y": 330.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O4"
+          "compName": "sel1#13",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#13",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O4"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#110",
          "path": [
            {
-            "x": 40.0,
-            "y": 485.0
+            "x": 235.0,
+            "y": 350.0
            },
            {
-            "x": 40.0,
-            "y": 380.0
+            "x": 235.0,
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "sel1#10",
-          "pinName": "S2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O3"
          },
          "pin2": {
            "compName": "sel1#14",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 35.0,
-            "y": 495.0
+            "x": 240.0,
+            "y": 295.0
            },
            {
-            "x": 35.0,
-            "y": 420.0
+            "x": 240.0,
+            "y": 390.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
+          "compName": "sel1#12",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#12",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O2"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 30.0,
-            "y": 505.0
+            "x": 245.0,
+            "y": 410.0
            },
            {
-            "x": 30.0,
-            "y": 440.0
+            "x": 245.0,
+            "y": 305.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O1"
          },
          "pin2": {
            "compName": "sel1#8",
-          "pinName": "I2"
+          "pinName": "Y"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 25.0,
-            "y": 515.0
+            "x": 250.0,
+            "y": 315.0
            },
            {
-            "x": 25.0,
-            "y": 480.0
+            "x": 250.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "sel1#15",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "sel1#15",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O0"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 20.0,
-            "y": 525.0
+            "x": 255.0,
+            "y": 470.0
            },
            {
-            "x": 20.0,
-            "y": 500.0
+            "x": 255.0,
+            "y": 325.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "name": "unnamedWire#94",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#2",
+          "pinName": "I"
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y"
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#115",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#96",
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "WireCrossPoint#17",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "name": "unnamedWire#98",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel1#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O15"
-        },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#116",
          "path": [
            {
-            "x": 255.0,
-            "y": 30.0
-          },
-          {
-            "x": 255.0,
-            "y": 175.0
+            "x": 65.0,
+            "y": 5.0
            }
          ]
        }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json

index b5b16b8..cc9df38 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json
@@ -208,283 +208,283 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#2",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_3"
+          "pinName": "I0_1"
          },
          "pin2": {
-          "compName": "mux1#2",
+          "compName": "mux1#0",
            "pinName": "I0"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#2",
          "path": [
            {
              "x": 5.0,
-            "y": 87.5
+            "y": 37.5
            },
            {
              "x": 5.0,
-            "y": 92.5
+            "y": 22.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_3"
+          "pinName": "I1_1"
          },
          "pin2": {
-          "compName": "mux1#2",
+          "compName": "mux1#0",
            "pinName": "I1"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 20.0,
-            "y": 187.5
+            "x": 10.0,
+            "y": 137.5
            },
            {
-            "x": 20.0,
-            "y": 102.5
+            "x": 10.0,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#2",
+          "compName": "mux1#0",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "pinName": "Y1"
          },
-        "name": "unnamedWire#14"
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1#3",
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux1#1",
            "pinName": "S0"
          },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 117.5
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_4"
+          "pinName": "I0_2"
          },
          "pin2": {
-          "compName": "mux1#3",
+          "compName": "mux1#1",
            "pinName": "I0"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 5.0,
-            "y": 112.5
+            "y": 62.5
            },
            {
              "x": 5.0,
-            "y": 127.5
+            "y": 57.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_4"
+          "pinName": "I1_2"
          },
          "pin2": {
-          "compName": "mux1#3",
+          "compName": "mux1#1",
            "pinName": "I1"
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 25.0,
-            "y": 212.5
+            "x": 15.0,
+            "y": 162.5
            },
            {
-            "x": 25.0,
-            "y": 137.5
+            "x": 15.0,
+            "y": 67.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#3",
+          "compName": "mux1#1",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "pinName": "Y2"
          },
-        "name": "unnamedWire#18"
+        "name": "unnamedWire#9"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux1#2",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_1"
+          "pinName": "I0_3"
          },
          "pin2": {
-          "compName": "mux1#0",
+          "compName": "mux1#2",
            "pinName": "I0"
          },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 5.0,
-            "y": 37.5
+            "y": 87.5
            },
            {
              "x": 5.0,
-            "y": 22.5
+            "y": 92.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_1"
+          "pinName": "I1_3"
          },
          "pin2": {
-          "compName": "mux1#0",
+          "compName": "mux1#2",
            "pinName": "I1"
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 10.0,
-            "y": 137.5
+            "x": 20.0,
+            "y": 187.5
            },
            {
-            "x": 10.0,
-            "y": 32.5
+            "x": 20.0,
+            "y": 102.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#0",
+          "compName": "mux1#2",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "pinName": "Y3"
          },
-        "name": "unnamedWire#5",
-        "path": []
+        "name": "unnamedWire#14"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "mux1#1",
+          "compName": "mux1#3",
            "pinName": "S0"
          },
-        "name": "unnamedWire#6",
-        "path": []
+        "name": "unnamedWire#15",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 117.5
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_2"
+          "pinName": "I0_4"
          },
          "pin2": {
-          "compName": "mux1#1",
+          "compName": "mux1#3",
            "pinName": "I0"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#16",
          "path": [
            {
              "x": 5.0,
-            "y": 62.5
+            "y": 112.5
            },
            {
              "x": 5.0,
-            "y": 57.5
+            "y": 127.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_2"
+          "pinName": "I1_4"
          },
          "pin2": {
-          "compName": "mux1#1",
+          "compName": "mux1#3",
            "pinName": "I1"
          },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 15.0,
-            "y": 162.5
+            "x": 25.0,
+            "y": 212.5
            },
            {
-            "x": 15.0,
-            "y": 67.5
+            "x": 25.0,
+            "y": 137.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "mux1#1",
+          "compName": "mux1#3",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "pinName": "Y4"
          },
-        "name": "unnamedWire#9"
+        "name": "unnamedWire#18"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json

index 4a34c7c..9170ecc 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json
@@ -89,221 +89,221 @@
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#0",
          "pos": {
-          "x": 69.0,
-          "y": 4.0
+          "x": 114.0,
+          "y": 49.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#1",
          "pos": {
-          "x": 64.0,
-          "y": 19.0
+          "x": 119.0,
+          "y": 59.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#2",
          "pos": {
-          "x": 9.0,
-          "y": 24.0
+          "x": 119.0,
+          "y": 119.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#3",
          "pos": {
-          "x": 9.0,
-          "y": 14.0
+          "x": 114.0,
+          "y": 109.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#4",
          "pos": {
-          "x": 64.0,
-          "y": 149.0
+          "x": 119.0,
+          "y": 179.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#5",
          "pos": {
-          "x": 69.0,
-          "y": 159.0
+          "x": 114.0,
+          "y": 169.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#6",
          "pos": {
-          "x": 64.0,
-          "y": 89.0
+          "x": 69.0,
+          "y": 4.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "name": "WireCrossPoint#7",
          "pos": {
-          "x": 69.0,
-          "y": 99.0
+          "x": 64.0,
+          "y": 19.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "name": "WireCrossPoint#8",
          "pos": {
-          "x": 69.0,
-          "y": 39.0
+          "x": 9.0,
+          "y": 24.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "name": "WireCrossPoint#9",
          "pos": {
-          "x": 64.0,
-          "y": 29.0
+          "x": 9.0,
+          "y": 14.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#10",
          "pos": {
-          "x": 114.0,
-          "y": 49.0
+          "x": 64.0,
+          "y": 149.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#11",
          "pos": {
-          "x": 119.0,
-          "y": 59.0
+          "x": 69.0,
+          "y": 159.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#12",
          "pos": {
-          "x": 119.0,
-          "y": 119.0
+          "x": 64.0,
+          "y": 89.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#13",
          "pos": {
-          "x": 114.0,
-          "y": 109.0
+          "x": 69.0,
+          "y": 99.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#14",
          "pos": {
-          "x": 119.0,
-          "y": 179.0
+          "x": 69.0,
+          "y": 39.0
          },
          "params": 1
        },
        {
          "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#15",
          "pos": {
-          "x": 114.0,
-          "y": 169.0
+          "x": 64.0,
+          "y": 29.0
          },
          "params": 1
        },
        {
          "id": "sel1",
-        "name": "sel1#10",
+        "name": "sel1#0",
          "pos": {
            "x": 75.0,
-          "y": 145.0
+          "y": 205.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#11",
+        "name": "sel1#1",
          "pos": {
            "x": 125.0,
-          "y": 225.0
+          "y": 45.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#4",
+        "name": "sel1#2",
          "pos": {
            "x": 75.0,
-          "y": 205.0
+          "y": 25.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#5",
+        "name": "sel1#3",
          "pos": {
-          "x": 125.0,
-          "y": 45.0
+          "x": 75.0,
+          "y": 85.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#6",
+        "name": "sel1#4",
          "pos": {
-          "x": 75.0,
-          "y": 25.0
+          "x": 125.0,
+          "y": 165.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#7",
+        "name": "sel1#5",
          "pos": {
-          "x": 75.0,
-          "y": 85.0
+          "x": 125.0,
+          "y": 105.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#8",
+        "name": "sel1#6",
          "pos": {
-          "x": 125.0,
-          "y": 165.0
+          "x": 75.0,
+          "y": 145.0
          }
        },
        {
          "id": "sel1",
-        "name": "sel1#9",
+        "name": "sel1#7",
          "pos": {
            "x": 125.0,
-          "y": 105.0
+          "y": 225.0
          }
        }
      ],
      "wires": [
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "name": "unnamedWire#0",
@@ -311,11 +311,11 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "name": "unnamedWire#1",
@@ -323,259 +323,120 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O7"
-        },
-        "pin2": {
-          "compName": "sel1#6",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#107",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 90.0
-          },
-          {
-            "x": 180.0,
-            "y": 30.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 175.0,
-            "y": 50.0
-          },
-          {
-            "x": 175.0,
-            "y": 100.0
+            "x": 120.0,
+            "y": 5.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O5"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 170.0,
-            "y": 110.0
-          },
-          {
-            "x": 170.0,
-            "y": 90.0
+            "x": 115.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#7",
-          "pinName": "S2"
+          "compName": "sel1#2",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#9",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#110",
-        "path": [
-          {
-            "x": 165.0,
-            "y": 110.0
-          },
-          {
-            "x": 165.0,
-            "y": 120.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "sel1#10",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#111",
-        "path": [
-          {
-            "x": 165.0,
-            "y": 130.0
-          },
-          {
-            "x": 165.0,
-            "y": 150.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#8",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#112",
-        "path": [
-          {
-            "x": 170.0,
-            "y": 170.0
-          },
-          {
-            "x": 170.0,
-            "y": 140.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "sel1#4",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#113",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 150.0
-          },
-          {
-            "x": 175.0,
-            "y": 210.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel1#11",
-          "pinName": "Y"
+          "compName": "sel1#2",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
-        "name": "unnamedWire#114",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 230.0
-          },
-          {
-            "x": 180.0,
-            "y": 160.0
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "sel1#3",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "sel1#3",
+          "pinName": "S2"
          },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 5.0
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#10",
+          "compName": "sel1#6",
            "pinName": "S1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#10",
+          "compName": "sel1#6",
            "pinName": "S2"
          },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#11",
+          "compName": "sel1#7",
            "pinName": "S1"
          },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 115.0,
@@ -585,168 +446,134 @@
        },
        {
          "pin1": {
-          "compName": "sel1#8",
+          "compName": "sel1#4",
            "pinName": "S2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#11",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#8",
+          "compName": "sel1#4",
            "pinName": "S1"
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#9",
+          "compName": "sel1#5",
            "pinName": "S2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#9",
+          "compName": "sel1#5",
            "pinName": "S1"
          },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "sel1#5",
+          "compName": "sel1#1",
            "pinName": "S2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#5",
+          "compName": "sel1#1",
            "pinName": "S1"
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 120.0,
-            "y": 5.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#17",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 115.0,
-            "y": 20.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#20",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#11",
+          "compName": "sel1#7",
            "pinName": "S2"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#21",
          "path": [
            {
              "x": 120.0,
@@ -756,38 +583,38 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#4",
+          "compName": "sel1#0",
            "pinName": "S1"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#24",
          "path": [
            {
              "x": 65.0,
@@ -797,14 +624,14 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "sel1#4",
+          "compName": "sel1#0",
            "pinName": "S2"
          },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#25",
          "path": [
            {
              "x": 70.0,
@@ -814,26 +641,26 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#27",
          "path": []
        },
        {
@@ -842,10 +669,10 @@
            "pinName": "O7"
          },
          "pin2": {
-          "compName": "sel1#6",
+          "compName": "sel1#2",
            "pinName": "I1"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#28",
          "path": [
            {
              "x": 55.0,
@@ -863,10 +690,10 @@
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "sel1#5",
+          "compName": "sel1#1",
            "pinName": "I1"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#29",
          "path": [
            {
              "x": 50.0,
@@ -884,10 +711,10 @@
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "sel1#7",
+          "compName": "sel1#3",
            "pinName": "I1"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#30",
          "path": [
            {
              "x": 45.0,
@@ -905,10 +732,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "sel1#9",
+          "compName": "sel1#5",
            "pinName": "I1"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 40.0,
@@ -926,10 +753,10 @@
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "sel1#10",
+          "compName": "sel1#6",
            "pinName": "I1"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#32",
          "path": [
            {
              "x": 35.0,
@@ -947,10 +774,10 @@
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "sel1#8",
+          "compName": "sel1#4",
            "pinName": "I1"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#33",
          "path": [
            {
              "x": 30.0,
@@ -968,10 +795,10 @@
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "sel1#4",
+          "compName": "sel1#0",
            "pinName": "I1"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#34",
          "path": [
            {
              "x": 25.0,
@@ -989,10 +816,10 @@
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "sel1#11",
+          "compName": "sel1#7",
            "pinName": "I1"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#35",
          "path": [
            {
              "x": 20.0,
@@ -1013,7 +840,7 @@
            "compName": "Splitter#1",
            "pinName": "I"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#36",
          "path": []
        },
        {
@@ -1025,19 +852,7 @@
            "compName": "Splitter#0",
            "pinName": "I"
          },
-        "name": "unnamedWire#77",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#6",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#37",
          "path": []
        },
        {
@@ -1046,10 +861,10 @@
            "pinName": "O7"
          },
          "pin2": {
-          "compName": "sel1#6",
+          "compName": "sel1#2",
            "pinName": "I2"
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#38",
          "path": [
            {
              "x": 55.0,
@@ -1067,10 +882,10 @@
            "pinName": "O6"
          },
          "pin2": {
-          "compName": "sel1#5",
+          "compName": "sel1#1",
            "pinName": "I2"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#39",
          "path": [
            {
              "x": 50.0,
@@ -1088,10 +903,10 @@
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "sel1#7",
+          "compName": "sel1#3",
            "pinName": "I2"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#40",
          "path": [
            {
              "x": 45.0,
@@ -1109,10 +924,10 @@
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "sel1#9",
+          "compName": "sel1#5",
            "pinName": "I2"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#41",
          "path": [
            {
              "x": 40.0,
@@ -1124,28 +939,16 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "sel1#6",
-          "pinName": "S2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "Splitter#1",
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "sel1#10",
+          "compName": "sel1#6",
            "pinName": "I2"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#42",
          "path": [
            {
              "x": 35.0,
@@ -1163,10 +966,10 @@
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "sel1#8",
+          "compName": "sel1#4",
            "pinName": "I2"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#43",
          "path": [
            {
              "x": 30.0,
@@ -1184,10 +987,10 @@
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "sel1#4",
+          "compName": "sel1#0",
            "pinName": "I2"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#44",
          "path": [
            {
              "x": 45.0,
@@ -1205,10 +1008,10 @@
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "sel1#11",
+          "compName": "sel1#7",
            "pinName": "I2"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#45",
          "path": [
            {
              "x": 40.0,
@@ -1226,46 +1029,46 @@
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
            "compName": "NandGate#0",
            "pinName": "B"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
            "compName": "NandGate#0",
            "pinName": "A"
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
@@ -1274,11 +1077,208 @@
            "pinName": "S"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#50",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O7"
+        },
+        "pin2": {
+          "compName": "sel1#2",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#51",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 90.0
+          },
+          {
+            "x": 180.0,
+            "y": 30.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O6"
+        },
+        "name": "unnamedWire#52",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 50.0
+          },
+          {
+            "x": 175.0,
+            "y": 100.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O5"
+        },
+        "pin2": {
+          "compName": "sel1#3",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#53",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 110.0
+          },
+          {
+            "x": 170.0,
+            "y": 90.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#5",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O4"
+        },
+        "name": "unnamedWire#54",
+        "path": [
+          {
+            "x": 165.0,
+            "y": 110.0
+          },
+          {
+            "x": 165.0,
+            "y": 120.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "sel1#6",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#55",
+        "path": [
+          {
+            "x": 165.0,
+            "y": 130.0
+          },
+          {
+            "x": 165.0,
+            "y": 150.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#4",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#56",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 170.0
+          },
+          {
+            "x": 170.0,
+            "y": 140.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "sel1#0",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#57",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 150.0
+          },
+          {
+            "x": 175.0,
+            "y": 210.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "sel1#7",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#58",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 230.0
+          },
+          {
+            "x": 180.0,
+            "y": 160.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#59",
          "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "name": "unnamedWire#60",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 5.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json

index 91d1220..d9002c2 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json
@@ -155,110 +155,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#0",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel1#0",
-          "pinName": "S1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 25.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#1",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 115.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "sel1#1",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#17",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 105.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#18",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 20.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -416,6 +312,110 @@
              "y": 25.0
            }
          ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "sel1#0",
+          "pinName": "S2"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "sel1#0",
+          "pinName": "S1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 25.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "sel1#1",
+          "pinName": "S2"
+        },
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 115.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "sel1#1",
+          "pinName": "S1"
+        },
+        "name": "unnamedWire#15",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 105.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 20.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json

index ac5aa8a..0f70cab 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
@@ -192,6 +192,130 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux2#1",
+          "pinName": "S1"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux2#1",
+          "pinName": "S0"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux2#0",
+          "pinName": "S1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux2#0",
+          "pinName": "S0"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 205.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux1#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I000"
+        },
+        "pin2": {
+          "compName": "mux2#1",
+          "pinName": "I00"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 100.0
+          },
+          {
+            "x": 10.0,
+            "y": 115.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux2#1",
+          "pinName": "I01"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "I001"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I010"
+        },
+        "pin2": {
+          "compName": "mux2#1",
+          "pinName": "I10"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 150.0
+          },
+          {
+            "x": 10.0,
+            "y": 135.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "mux2#1",
@@ -341,130 +465,6 @@
          },
          "name": "unnamedWire#17",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux2#1",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux2#1",
-          "pinName": "S0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux2#0",
-          "pinName": "S1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 195.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "mux2#0",
-          "pinName": "S0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 205.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "mux1#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I000"
-        },
-        "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I00"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 100.0
-          },
-          {
-            "x": 10.0,
-            "y": 115.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "mux2#1",
-          "pinName": "I01"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "I001"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I010"
-        },
-        "pin2": {
-          "compName": "mux2#1",
-          "pinName": "I10"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 135.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json

index 4b4e51f..90cfcc7 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json
@@ -176,88 +176,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#10",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 67.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 92.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
-        },
-        "name": "unnamedWire#15",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -383,6 +301,88 @@
              "y": 42.5
            }
          ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#2",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 67.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 92.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#14",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#15",
+        "path": []
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json

index 33e50e5..6ce2d29 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
@@ -212,6 +212,132 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 20.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 70.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 120.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 170.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 30.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 80.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#2",
@@ -348,18 +474,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#5",
@@ -426,120 +540,6 @@
            "pinName": "Y"
          },
          "name": "unnamedWire#24"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 20.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 70.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 120.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 170.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 30.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 80.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json

index 46801b2..26dbd77 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json
@@ -132,24 +132,6 @@
          },
          "params": 1
        },
-      {
-        "id": "NandGate",
-        "name": "NandGate#10",
-        "pos": {
-          "x": 65.0,
-          "y": 52.5
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#11",
-        "pos": {
-          "x": 65.0,
-          "y": 77.5
-        },
-        "params": 1
-      },
        {
          "id": "NandGate",
          "name": "NandGate#2",
@@ -222,6 +204,24 @@
          },
          "params": 1
        },
+      {
+        "id": "NandGate",
+        "name": "NandGate#10",
+        "pos": {
+          "x": 65.0,
+          "y": 52.5
+        },
+        "params": 1
+      },
+      {
+        "id": "NandGate",
+        "name": "NandGate#11",
+        "pos": {
+          "x": 65.0,
+          "y": 77.5
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#0",
@@ -320,6 +320,112 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 7.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 17.5
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -490,18 +596,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
@@ -696,18 +790,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "NandGate#3",
@@ -797,88 +879,6 @@
          },
          "name": "unnamedWire#35",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 17.5
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json

index 3732257..436d07f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@ -177,6 +177,78 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 99.0,
+          "y": 174.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 94.0,
+          "y": 184.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 34.0,
+          "y": 549.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 39.0,
+          "y": 649.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 44.0,
+          "y": 749.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 49.0,
+          "y": 809.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 34.0,
+          "y": 479.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 39.0,
+          "y": 489.0
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#10",
@@ -267,15 +339,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 99.0,
-          "y": 174.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -366,15 +429,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 94.0,
-          "y": 184.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#30",
@@ -393,60 +447,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 34.0,
-          "y": 549.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 39.0,
-          "y": 649.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 44.0,
-          "y": 749.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 49.0,
-          "y": 809.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 34.0,
-          "y": 479.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 39.0,
-          "y": 489.0
-        },
-        "params": 1
-      },
        {
          "id": "and41",
          "name": "and41#0",
@@ -604,2366 +604,2366 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#100",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "B0"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C1"
+          "compName": "demux2#1",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 290.0,
-            "y": 380.0
-          },
-          {
-            "x": 290.0,
-            "y": 445.0
-          },
-          {
-            "x": 230.0,
-            "y": 445.0
+            "x": 5.0,
+            "y": 250.0
            },
            {
-            "x": 230.0,
-            "y": 490.0
+            "x": 5.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C2"
+          "compName": "demux2#1",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 285.0,
-            "y": 390.0
-          },
-          {
-            "x": 285.0,
-            "y": 440.0
-          },
-          {
-            "x": 225.0,
-            "y": 440.0
+            "x": 10.0,
+            "y": 350.0
            },
            {
-            "x": 225.0,
-            "y": 500.0
+            "x": 10.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y3"
+          "compName": "demux2#1",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#103",
-        "path": [
-          {
-            "x": 280.0,
-            "y": 400.0
-          },
-          {
-            "x": 280.0,
-            "y": 435.0
-          },
-          {
-            "x": 220.0,
-            "y": 435.0
-          },
-          {
-            "x": 220.0,
-            "y": 510.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y4"
+          "compName": "demux2#1",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C4"
-        },
-        "name": "unnamedWire#104",
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "demux2#1",
+          "pinName": "Y10"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "demux2#1",
+          "pinName": "Y11"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "WE"
+        },
+        "pin2": {
+          "compName": "and41#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 275.0,
-            "y": 410.0
+            "x": 5.0,
+            "y": 450.0
            },
            {
-            "x": 275.0,
-            "y": 430.0
+            "x": 5.0,
+            "y": 300.0
            },
            {
-            "x": 215.0,
-            "y": 430.0
+            "x": 125.0,
+            "y": 300.0
            },
            {
-            "x": 215.0,
-            "y": 520.0
+            "x": 125.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#0",
+          "compName": "and41#0",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C1"
+          "compName": "dlatch4#0",
+          "pinName": "C"
          },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 290.0,
-            "y": 490.0
+            "x": 185.0,
+            "y": 155.0
            },
            {
-            "x": 290.0,
-            "y": 595.0
+            "x": 185.0,
+            "y": 250.0
            },
            {
-            "x": 230.0,
-            "y": 595.0
+            "x": 30.0,
+            "y": 250.0
            },
            {
-            "x": 230.0,
-            "y": 640.0
+            "x": 30.0,
+            "y": 370.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#0",
+          "compName": "and41#0",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C2"
+          "compName": "dlatch4#1",
+          "pinName": "C"
          },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 285.0,
-            "y": 500.0
+            "x": 180.0,
+            "y": 165.0
            },
            {
-            "x": 285.0,
-            "y": 590.0
+            "x": 180.0,
+            "y": 245.0
            },
            {
-            "x": 225.0,
-            "y": 590.0
+            "x": 25.0,
+            "y": 245.0
            },
            {
-            "x": 225.0,
-            "y": 650.0
+            "x": 25.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#0",
+          "compName": "and41#0",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C3"
+          "compName": "dlatch4#2",
+          "pinName": "C"
          },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 280.0,
-            "y": 510.0
+            "x": 175.0,
+            "y": 175.0
            },
            {
-            "x": 280.0,
-            "y": 585.0
+            "x": 175.0,
+            "y": 240.0
            },
            {
-            "x": 220.0,
-            "y": 585.0
+            "x": 20.0,
+            "y": 240.0
            },
            {
-            "x": 220.0,
-            "y": 660.0
+            "x": 20.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#0",
+          "compName": "and41#0",
            "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C4"
+          "compName": "dlatch4#3",
+          "pinName": "C"
          },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 275.0,
-            "y": 520.0
+            "x": 170.0,
+            "y": 185.0
            },
            {
-            "x": 275.0,
-            "y": 580.0
+            "x": 170.0,
+            "y": 235.0
            },
            {
-            "x": 215.0,
-            "y": 580.0
+            "x": 15.0,
+            "y": 235.0
            },
            {
-            "x": 215.0,
-            "y": 670.0
+            "x": 15.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#109",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 640.0
-          },
-          {
-            "x": 290.0,
-            "y": 745.0
-          },
-          {
-            "x": 230.0,
-            "y": 745.0
-          },
-          {
-            "x": 230.0,
-            "y": 790.0
-          }
-        ]
+        "name": "unnamedWire#17",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "and41#0",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "D3"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#110",
-        "path": [
-          {
-            "x": 285.0,
-            "y": 650.0
-          },
-          {
-            "x": 285.0,
-            "y": 740.0
-          },
-          {
-            "x": 225.0,
-            "y": 740.0
-          },
-          {
-            "x": 225.0,
-            "y": 800.0
-          }
-        ]
+        "name": "unnamedWire#19",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C3"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 280.0,
-            "y": 660.0
-          },
-          {
-            "x": 280.0,
-            "y": 735.0
-          },
-          {
-            "x": 220.0,
-            "y": 735.0
-          },
-          {
-            "x": 220.0,
-            "y": 810.0
+            "x": 50.0,
+            "y": 850.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C4"
+          "compName": "dlatch4#0",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 275.0,
-            "y": 670.0
-          },
-          {
-            "x": 275.0,
-            "y": 730.0
-          },
-          {
-            "x": 215.0,
-            "y": 730.0
-          },
-          {
-            "x": 215.0,
-            "y": 820.0
+            "x": 35.0,
+            "y": 330.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA1"
+          "compName": "dlatch4#0",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 300.0,
-            "y": 790.0
-          },
-          {
-            "x": 300.0,
-            "y": 50.0
+            "x": 40.0,
+            "y": 340.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
+          "compName": "dlatch4#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 305.0,
-            "y": 800.0
-          },
-          {
-            "x": 305.0,
-            "y": 150.0
+            "x": 45.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
+          "compName": "dlatch4#0",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#24",
          "path": [
            {
-            "x": 310.0,
-            "y": 810.0
-          },
-          {
-            "x": 310.0,
-            "y": 250.0
+            "x": 50.0,
+            "y": 360.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
+          "compName": "dlatch4#1",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 820.0
-          },
-          {
-            "x": 315.0,
-            "y": 350.0
-          }
-        ]
+        "name": "unnamedWire#25",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C1"
+          "compName": "dlatch4#1",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#117",
-        "path": [
-          {
-            "x": 190.0,
-            "y": 330.0
-          },
-          {
-            "x": 190.0,
-            "y": 430.0
-          },
-          {
-            "x": 130.0,
-            "y": 430.0
-          },
-          {
-            "x": 130.0,
-            "y": 440.0
-          }
-        ]
+        "name": "unnamedWire#26",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C2"
+          "compName": "dlatch4#1",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#118",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 340.0
-          },
-          {
-            "x": 185.0,
-            "y": 425.0
-          },
-          {
-            "x": 125.0,
-            "y": 425.0
-          },
-          {
-            "x": 125.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#27",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C3"
+          "compName": "dlatch4#1",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#119",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 350.0
-          },
-          {
-            "x": 180.0,
-            "y": 420.0
-          },
-          {
-            "x": 120.0,
-            "y": 420.0
-          },
-          {
-            "x": 120.0,
-            "y": 460.0
-          }
-        ]
+        "name": "unnamedWire#28",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "and41#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 450.0
-          },
-          {
-            "x": 5.0,
-            "y": 300.0
-          },
-          {
-            "x": 125.0,
-            "y": 300.0
-          },
-          {
-            "x": 125.0,
-            "y": 195.0
-          }
-        ]
+        "name": "unnamedWire#29",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "name": "unnamedWire#120",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 360.0
-          },
-          {
-            "x": 175.0,
-            "y": 415.0
-          },
-          {
-            "x": 115.0,
-            "y": 415.0
-          },
-          {
-            "x": 115.0,
-            "y": 470.0
-          }
-        ]
+        "name": "unnamedWire#30",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C1"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "name": "unnamedWire#121",
-        "path": [
-          {
-            "x": 190.0,
-            "y": 440.0
-          },
-          {
-            "x": 190.0,
-            "y": 580.0
-          },
-          {
-            "x": 130.0,
-            "y": 580.0
-          },
-          {
-            "x": 130.0,
-            "y": 590.0
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
-        "name": "unnamedWire#122",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 450.0
-          },
-          {
-            "x": 185.0,
-            "y": 575.0
-          },
-          {
-            "x": 125.0,
-            "y": 575.0
-          },
-          {
-            "x": 125.0,
-            "y": 600.0
-          }
-        ]
+        "name": "unnamedWire#32",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C3"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "name": "unnamedWire#123",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 460.0
-          },
-          {
-            "x": 180.0,
-            "y": 570.0
-          },
-          {
-            "x": 120.0,
-            "y": 570.0
-          },
-          {
-            "x": 120.0,
-            "y": 610.0
-          }
-        ]
+        "name": "unnamedWire#33",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C4"
+          "compName": "dlatch4#2",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#124",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 470.0
-          },
-          {
-            "x": 175.0,
-            "y": 565.0
-          },
-          {
-            "x": 115.0,
-            "y": 565.0
-          },
-          {
-            "x": 115.0,
-            "y": 620.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C1"
+          "compName": "dlatch4#2",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#125",
-        "path": [
-          {
-            "x": 190.0,
-            "y": 590.0
-          },
-          {
-            "x": 190.0,
-            "y": 730.0
-          },
-          {
-            "x": 130.0,
-            "y": 730.0
-          },
-          {
-            "x": 130.0,
-            "y": 740.0
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C2"
+          "compName": "dlatch4#2",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#126",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 600.0
-          },
-          {
-            "x": 185.0,
-            "y": 725.0
-          },
-          {
-            "x": 125.0,
-            "y": 725.0
-          },
-          {
-            "x": 125.0,
-            "y": 750.0
-          }
-        ]
+        "name": "unnamedWire#36",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C3"
+          "compName": "dlatch4#2",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#127",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 610.0
-          },
-          {
-            "x": 180.0,
-            "y": 720.0
-          },
-          {
-            "x": 120.0,
-            "y": 720.0
-          },
-          {
-            "x": 120.0,
-            "y": 760.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 620.0
-          },
-          {
-            "x": 175.0,
-            "y": 715.0
-          },
-          {
-            "x": 115.0,
-            "y": 715.0
-          },
-          {
-            "x": 115.0,
-            "y": 770.0
-          }
-        ]
+        "name": "unnamedWire#38",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "name": "unnamedWire#129",
-        "path": [
-          {
-            "x": 190.0,
-            "y": 740.0
-          },
-          {
-            "x": 190.0,
-            "y": 880.0
-          },
-          {
-            "x": 325.0,
-            "y": 880.0
-          },
-          {
-            "x": 325.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#39",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "C"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
-        "name": "unnamedWire#13",
-        "path": [
-          {
-            "x": 185.0,
-            "y": 155.0
-          },
-          {
-            "x": 185.0,
-            "y": 250.0
-          },
-          {
-            "x": 30.0,
-            "y": 250.0
-          },
-          {
-            "x": 30.0,
-            "y": 370.0
-          }
-        ]
+        "name": "unnamedWire#40",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
+          "compName": "dlatch4#3",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 185.0,
-            "y": 750.0
-          },
-          {
-            "x": 185.0,
-            "y": 885.0
-          },
-          {
-            "x": 330.0,
-            "y": 885.0
-          },
-          {
-            "x": 330.0,
-            "y": 550.0
+            "x": 35.0,
+            "y": 780.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
+          "compName": "dlatch4#3",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 180.0,
-            "y": 760.0
-          },
-          {
-            "x": 180.0,
-            "y": 890.0
-          },
-          {
-            "x": 335.0,
-            "y": 890.0
-          },
-          {
-            "x": 335.0,
-            "y": 650.0
+            "x": 40.0,
+            "y": 790.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB4"
+          "compName": "dlatch4#3",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#43",
          "path": [
            {
-            "x": 175.0,
-            "y": 770.0
-          },
-          {
-            "x": 175.0,
-            "y": 895.0
-          },
-          {
-            "x": 340.0,
-            "y": 895.0
-          },
-          {
-            "x": 340.0,
-            "y": 750.0
+            "x": 45.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "C"
+          "compName": "dlatch4#3",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#14",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 165.0
-          },
-          {
-            "x": 180.0,
-            "y": 245.0
-          },
-          {
-            "x": 25.0,
-            "y": 245.0
-          },
-          {
-            "x": 25.0,
-            "y": 520.0
-          }
-        ]
+        "name": "unnamedWire#44",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y3"
+          "compName": "dlatch4#0",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "C"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 175.0
-          },
-          {
-            "x": 175.0,
-            "y": 240.0
-          },
-          {
-            "x": 20.0,
-            "y": 240.0
-          },
-          {
-            "x": 20.0,
-            "y": 670.0
-          }
-        ]
+        "name": "unnamedWire#45",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y4"
+          "compName": "dlatch4#0",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "C"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 170.0,
-            "y": 185.0
-          },
-          {
-            "x": 170.0,
-            "y": 235.0
-          },
-          {
-            "x": 15.0,
-            "y": 235.0
-          },
-          {
-            "x": 15.0,
-            "y": 820.0
-          }
-        ]
+        "name": "unnamedWire#46",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "dlatch4#0",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "dlatch4#0",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "dlatch4#1",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#20",
            "pinName": ""
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "dlatch4#1",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "demux2#1",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 250.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#50",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "dlatch4#1",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "name": "unnamedWire#20",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 850.0
-          }
-        ]
+        "name": "unnamedWire#51",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "dlatch4#1",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 330.0
-          }
-        ]
+        "name": "unnamedWire#52",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "dlatch4#2",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 340.0
-          }
-        ]
+        "name": "unnamedWire#53",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "dlatch4#2",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#23",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 350.0
-          }
-        ]
+        "name": "unnamedWire#54",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "dlatch4#2",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
-        "name": "unnamedWire#24",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 360.0
-          }
-        ]
+        "name": "unnamedWire#55",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "dlatch4#2",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "dlatch4#3",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "dlatch4#3",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#58",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "dlatch4#3",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#59",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "dlatch4#3",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#60",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "demux2#0",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "demux2#1",
-          "pinName": "S1"
+          "compName": "and41#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#61",
          "path": [
            {
-            "x": 10.0,
-            "y": 350.0
+            "x": 210.0,
+            "y": 50.0
            },
            {
-            "x": 10.0,
-            "y": 165.0
+            "x": 210.0,
+            "y": 420.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#30",
-        "path": []
+        "name": "unnamedWire#62",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 60.0
+          },
+          {
+            "x": 205.0,
+            "y": 570.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y10"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#31",
-        "path": []
+        "name": "unnamedWire#63",
+        "path": [
+          {
+            "x": 200.0,
+            "y": 70.0
+          },
+          {
+            "x": 200.0,
+            "y": 720.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#32",
-        "path": []
+        "name": "unnamedWire#64",
+        "path": [
+          {
+            "x": 195.0,
+            "y": 80.0
+          },
+          {
+            "x": 195.0,
+            "y": 870.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#33",
-        "path": []
+        "name": "unnamedWire#65",
+        "path": [
+          {
+            "x": 110.0,
+            "y": 370.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D1"
+          "compName": "andor414#3",
+          "pinName": "B"
          },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
+        "name": "unnamedWire#66",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 520.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D2"
+          "compName": "andor414#4",
+          "pinName": "B"
          },
-        "name": "unnamedWire#35",
-        "path": []
+        "name": "unnamedWire#67",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 670.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D3"
+          "compName": "andor414#5",
+          "pinName": "B"
          },
-        "name": "unnamedWire#36",
-        "path": []
+        "name": "unnamedWire#68",
+        "path": [
+          {
+            "x": 95.0,
+            "y": 820.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D4"
+          "compName": "and41#1",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#37",
-        "path": []
+        "name": "unnamedWire#69",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 380.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#38",
-        "path": []
+        "name": "unnamedWire#70",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 390.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#39",
-        "path": []
+        "name": "unnamedWire#71",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 400.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y00"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#4",
-        "path": []
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 410.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#20",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#40",
-        "path": []
+        "name": "unnamedWire#73",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 530.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D1"
+          "compName": "andor414#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#74",
          "path": [
            {
-            "x": 35.0,
-            "y": 780.0
+            "x": 125.0,
+            "y": 540.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D2"
+          "compName": "andor414#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#75",
          "path": [
            {
-            "x": 40.0,
-            "y": 790.0
+            "x": 120.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D3"
+          "compName": "andor414#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#76",
          "path": [
            {
-            "x": 45.0,
-            "y": 800.0
+            "x": 115.0,
+            "y": 560.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
          "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D4"
+          "compName": "andor414#1",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#44",
-        "path": []
+        "name": "unnamedWire#77",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 680.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#45",
-        "path": []
+        "name": "unnamedWire#78",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 690.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#46",
-        "path": []
+        "name": "unnamedWire#79",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 700.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#47",
-        "path": []
+        "name": "unnamedWire#80",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 710.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#48",
-        "path": []
+        "name": "unnamedWire#81",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 830.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#49",
-        "path": []
+        "name": "unnamedWire#82",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 840.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y01"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#5",
-        "path": []
+        "name": "unnamedWire#83",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 850.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
+          "compName": "andor414#2",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#84",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 860.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
-        "name": "unnamedWire#50",
+        "pin2": {
+          "compName": "and41#2",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#85",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#87",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#89",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#90",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#91",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#92",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
+          "compName": "andor414#4",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#93",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
-        "name": "unnamedWire#58",
+        "pin2": {
+          "compName": "andor414#4",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "andor414#4",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#95",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
-        "name": "unnamedWire#59",
+        "pin2": {
+          "compName": "andor414#4",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#96",
          "path": []
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y10"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "andor414#5",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#97",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
-        "name": "unnamedWire#6",
+        "pin2": {
+          "compName": "andor414#5",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#98",
          "path": []
        },
        {
          "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
+          "compName": "andor414#5",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#99",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "WireCrossPoint#31",
            "pinName": ""
          },
-        "name": "unnamedWire#60",
+        "pin2": {
+          "compName": "andor414#5",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#100",
          "path": []
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y00"
+          "compName": "and41#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "B"
+          "compName": "andor414#0",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 210.0,
-            "y": 50.0
+            "x": 290.0,
+            "y": 380.0
            },
            {
-            "x": 210.0,
-            "y": 420.0
+            "x": 290.0,
+            "y": 445.0
+          },
+          {
+            "x": 230.0,
+            "y": 445.0
+          },
+          {
+            "x": 230.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y01"
+          "compName": "and41#1",
+          "pinName": "Y2"
          },
          "pin2": {
            "compName": "andor414#0",
-          "pinName": "B"
+          "pinName": "C2"
          },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#102",
          "path": [
            {
-            "x": 205.0,
-            "y": 60.0
+            "x": 285.0,
+            "y": 390.0
            },
            {
-            "x": 205.0,
-            "y": 570.0
+            "x": 285.0,
+            "y": 440.0
+          },
+          {
+            "x": 225.0,
+            "y": 440.0
+          },
+          {
+            "x": 225.0,
+            "y": 500.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y10"
+          "compName": "and41#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "B"
+          "compName": "andor414#0",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#103",
          "path": [
            {
-            "x": 200.0,
-            "y": 70.0
+            "x": 280.0,
+            "y": 400.0
            },
            {
-            "x": 200.0,
-            "y": 720.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y11"
-        },
-        "pin2": {
-          "compName": "andor414#2",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#64",
-        "path": [
+            "x": 280.0,
+            "y": 435.0
+          },
            {
-            "x": 195.0,
-            "y": 80.0
+            "x": 220.0,
+            "y": 435.0
            },
            {
-            "x": 195.0,
-            "y": 870.0
+            "x": 220.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "B"
+          "compName": "andor414#0",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#104",
          "path": [
            {
-            "x": 110.0,
-            "y": 370.0
+            "x": 275.0,
+            "y": 410.0
+          },
+          {
+            "x": 275.0,
+            "y": 430.0
+          },
+          {
+            "x": 215.0,
+            "y": 430.0
+          },
+          {
+            "x": 215.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#105",
          "path": [
            {
-            "x": 105.0,
-            "y": 520.0
+            "x": 290.0,
+            "y": 490.0
+          },
+          {
+            "x": 290.0,
+            "y": 595.0
+          },
+          {
+            "x": 230.0,
+            "y": 595.0
+          },
+          {
+            "x": 230.0,
+            "y": 640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#106",
          "path": [
            {
-            "x": 100.0,
-            "y": 670.0
+            "x": 285.0,
+            "y": 500.0
+          },
+          {
+            "x": 285.0,
+            "y": 590.0
+          },
+          {
+            "x": 225.0,
+            "y": 590.0
+          },
+          {
+            "x": 225.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#107",
          "path": [
            {
-            "x": 95.0,
-            "y": 820.0
+            "x": 280.0,
+            "y": 510.0
+          },
+          {
+            "x": 280.0,
+            "y": 585.0
+          },
+          {
+            "x": 220.0,
+            "y": 585.0
+          },
+          {
+            "x": 220.0,
+            "y": 660.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A1"
+          "compName": "andor414#1",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#108",
          "path": [
            {
-            "x": 130.0,
-            "y": 380.0
+            "x": 275.0,
+            "y": 520.0
+          },
+          {
+            "x": 275.0,
+            "y": 580.0
+          },
+          {
+            "x": 215.0,
+            "y": 580.0
+          },
+          {
+            "x": 215.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y11"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A2"
+          "compName": "andor414#2",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#109",
          "path": [
            {
-            "x": 125.0,
-            "y": 390.0
+            "x": 290.0,
+            "y": 640.0
+          },
+          {
+            "x": 290.0,
+            "y": 745.0
+          },
+          {
+            "x": 230.0,
+            "y": 745.0
+          },
+          {
+            "x": 230.0,
+            "y": 790.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A3"
+          "compName": "andor414#2",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#110",
          "path": [
            {
-            "x": 120.0,
-            "y": 400.0
+            "x": 285.0,
+            "y": 650.0
+          },
+          {
+            "x": 285.0,
+            "y": 740.0
+          },
+          {
+            "x": 225.0,
+            "y": 740.0
+          },
+          {
+            "x": 225.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A4"
+          "compName": "andor414#2",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 115.0,
-            "y": 410.0
+            "x": 280.0,
+            "y": 660.0
+          },
+          {
+            "x": 280.0,
+            "y": 735.0
+          },
+          {
+            "x": 220.0,
+            "y": 735.0
+          },
+          {
+            "x": 220.0,
+            "y": 810.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A1"
+          "compName": "andor414#2",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 130.0,
-            "y": 530.0
-          }
-        ]
-      },
+            "x": 275.0,
+            "y": 670.0
+          },
+          {
+            "x": 275.0,
+            "y": 730.0
+          },
+          {
+            "x": 215.0,
+            "y": 730.0
+          },
+          {
+            "x": 215.0,
+            "y": 820.0
+          }
+        ]
+      },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A2"
+          "compName": "_submodelinterface",
+          "pinName": "QA1"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 125.0,
-            "y": 540.0
+            "x": 300.0,
+            "y": 790.0
+          },
+          {
+            "x": 300.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "QA2"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 120.0,
-            "y": 550.0
+            "x": 305.0,
+            "y": 800.0
+          },
+          {
+            "x": 305.0,
+            "y": 150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "QA3"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 115.0,
-            "y": 560.0
+            "x": 310.0,
+            "y": 810.0
+          },
+          {
+            "x": 310.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "QA4"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#116",
          "path": [
            {
-            "x": 130.0,
-            "y": 680.0
+            "x": 315.0,
+            "y": 820.0
+          },
+          {
+            "x": 315.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A2"
+          "compName": "andor414#3",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#117",
          "path": [
            {
-            "x": 125.0,
-            "y": 690.0
+            "x": 190.0,
+            "y": 330.0
+          },
+          {
+            "x": 190.0,
+            "y": 430.0
+          },
+          {
+            "x": 130.0,
+            "y": 430.0
+          },
+          {
+            "x": 130.0,
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A3"
+          "compName": "andor414#3",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#118",
          "path": [
            {
-            "x": 120.0,
-            "y": 700.0
+            "x": 185.0,
+            "y": 340.0
+          },
+          {
+            "x": 185.0,
+            "y": 425.0
+          },
+          {
+            "x": 125.0,
+            "y": 425.0
+          },
+          {
+            "x": 125.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "and41#0",
-          "pinName": "A1"
+          "compName": "andor414#3",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#8",
-        "path": []
+        "name": "unnamedWire#119",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 350.0
+          },
+          {
+            "x": 180.0,
+            "y": 420.0
+          },
+          {
+            "x": 120.0,
+            "y": 420.0
+          },
+          {
+            "x": 120.0,
+            "y": 460.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A4"
+          "compName": "andor414#3",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#120",
          "path": [
+          {
+            "x": 175.0,
+            "y": 360.0
+          },
+          {
+            "x": 175.0,
+            "y": 415.0
+          },
            {
              "x": 115.0,
-            "y": 710.0
+            "y": 415.0
+          },
+          {
+            "x": 115.0,
+            "y": 470.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A1"
+          "compName": "andor414#4",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#121",
          "path": [
+          {
+            "x": 190.0,
+            "y": 440.0
+          },
+          {
+            "x": 190.0,
+            "y": 580.0
+          },
            {
              "x": 130.0,
-            "y": 830.0
+            "y": 580.0
+          },
+          {
+            "x": 130.0,
+            "y": 590.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A2"
+          "compName": "andor414#4",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#122",
          "path": [
+          {
+            "x": 185.0,
+            "y": 450.0
+          },
+          {
+            "x": 185.0,
+            "y": 575.0
+          },
            {
              "x": 125.0,
-            "y": 840.0
+            "y": 575.0
+          },
+          {
+            "x": 125.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A3"
+          "compName": "andor414#4",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#123",
          "path": [
            {
-            "x": 120.0,
-            "y": 850.0
-          }
-        ]
+            "x": 180.0,
+            "y": 460.0
+          },
+          {
+            "x": 180.0,
+            "y": 570.0
+          },
+          {
+            "x": 120.0,
+            "y": 570.0
+          },
+          {
+            "x": 120.0,
+            "y": 610.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A4"
+          "compName": "andor414#4",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#124",
          "path": [
+          {
+            "x": 175.0,
+            "y": 470.0
+          },
+          {
+            "x": 175.0,
+            "y": 565.0
+          },
            {
              "x": 115.0,
-            "y": 860.0
+            "y": 565.0
+          },
+          {
+            "x": 115.0,
+            "y": 620.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#2",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#85",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#2",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#86",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#2",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#87",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#2",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#88",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#89",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A2"
+          "compName": "andor414#5",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#90",
-        "path": []
+        "name": "unnamedWire#125",
+        "path": [
+          {
+            "x": 190.0,
+            "y": 590.0
+          },
+          {
+            "x": 190.0,
+            "y": 730.0
+          },
+          {
+            "x": 130.0,
+            "y": 730.0
+          },
+          {
+            "x": 130.0,
+            "y": 740.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A3"
+          "compName": "andor414#5",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#91",
-        "path": []
+        "name": "unnamedWire#126",
+        "path": [
+          {
+            "x": 185.0,
+            "y": 600.0
+          },
+          {
+            "x": 185.0,
+            "y": 725.0
+          },
+          {
+            "x": 125.0,
+            "y": 725.0
+          },
+          {
+            "x": 125.0,
+            "y": 750.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A4"
+          "compName": "andor414#5",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#92",
-        "path": []
+        "name": "unnamedWire#127",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 610.0
+          },
+          {
+            "x": 180.0,
+            "y": 720.0
+          },
+          {
+            "x": 120.0,
+            "y": 720.0
+          },
+          {
+            "x": 120.0,
+            "y": 760.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
-        },
-        "pin2": {
            "compName": "andor414#4",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#93",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A2"
+          "compName": "andor414#5",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#94",
-        "path": []
+        "name": "unnamedWire#128",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 620.0
+          },
+          {
+            "x": 175.0,
+            "y": 715.0
+          },
+          {
+            "x": 115.0,
+            "y": 715.0
+          },
+          {
+            "x": 115.0,
+            "y": 770.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "andor414#5",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "QB1"
          },
-        "name": "unnamedWire#95",
-        "path": []
+        "name": "unnamedWire#129",
+        "path": [
+          {
+            "x": 190.0,
+            "y": 740.0
+          },
+          {
+            "x": 190.0,
+            "y": 880.0
+          },
+          {
+            "x": 325.0,
+            "y": 880.0
+          },
+          {
+            "x": 325.0,
+            "y": 450.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "andor414#5",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "QB2"
          },
-        "name": "unnamedWire#96",
-        "path": []
+        "name": "unnamedWire#130",
+        "path": [
+          {
+            "x": 185.0,
+            "y": 750.0
+          },
+          {
+            "x": 185.0,
+            "y": 885.0
+          },
+          {
+            "x": 330.0,
+            "y": 885.0
+          },
+          {
+            "x": 330.0,
+            "y": 550.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
-        },
-        "pin2": {
            "compName": "andor414#5",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A2"
+          "compName": "_submodelinterface",
+          "pinName": "QB3"
          },
-        "name": "unnamedWire#98",
-        "path": []
+        "name": "unnamedWire#131",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 760.0
+          },
+          {
+            "x": 180.0,
+            "y": 890.0
+          },
+          {
+            "x": 335.0,
+            "y": 890.0
+          },
+          {
+            "x": 335.0,
+            "y": 650.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "andor414#5",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "QB4"
          },
-        "name": "unnamedWire#99",
-        "path": []
+        "name": "unnamedWire#132",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 770.0
+          },
+          {
+            "x": 175.0,
+            "y": 895.0
+          },
+          {
+            "x": 340.0,
+            "y": 895.0
+          },
+          {
+            "x": 340.0,
+            "y": 750.0
+          }
+        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json

index de91b6b..06fa3be 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
@@ -213,6 +213,78 @@
          },
          "params": 1
        },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 219.0,
+          "y": 174.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 214.0,
+          "y": 184.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 59.0,
+          "y": 534.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 64.0,
+          "y": 544.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 69.0,
+          "y": 554.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 74.0,
+          "y": 564.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 59.0,
+          "y": 684.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 64.0,
+          "y": 694.0
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#10",
@@ -303,15 +375,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 219.0,
-          "y": 174.0
-        },
-        "params": 1
-      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#20",
@@ -384,69 +447,6 @@
          },
          "params": 1
        },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
-        "pos": {
-          "x": 214.0,
-          "y": 184.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 59.0,
-          "y": 534.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 64.0,
-          "y": 544.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 69.0,
-          "y": 554.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 74.0,
-          "y": 564.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 59.0,
-          "y": 684.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 64.0,
-          "y": 694.0
-        },
-        "params": 1
-      },
        {
          "id": "and41",
          "name": "and41#0",
@@ -604,225 +604,129 @@
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA4"
+          "compName": "_submodelinterface",
+          "pinName": "B0"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "A4"
+          "compName": "demux2#1",
+          "pinName": "S0"
          },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 140.0,
-            "y": 365.0
+            "x": 5.0,
+            "y": 450.0
            },
            {
-            "x": 140.0,
-            "y": 360.0
+            "x": 5.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA1"
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A1"
+          "compName": "demux2#1",
+          "pinName": "S1"
          },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 140.0,
-            "y": 485.0
+            "x": 10.0,
+            "y": 550.0
            },
            {
-            "x": 140.0,
-            "y": 480.0
+            "x": 10.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA2"
+          "compName": "demux2#1",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "name": "unnamedWire#102",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 495.0
-          },
-          {
-            "x": 140.0,
-            "y": 490.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA3"
+          "compName": "demux2#1",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "name": "unnamedWire#103",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 505.0
-          },
-          {
-            "x": 140.0,
-            "y": 500.0
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA4"
+          "compName": "demux2#1",
+          "pinName": "Y10"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "name": "unnamedWire#104",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 515.0
-          },
-          {
-            "x": 140.0,
-            "y": 510.0
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA1"
-        },
-        "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#105",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 635.0
-          },
-          {
-            "x": 140.0,
-            "y": 630.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA2"
+          "compName": "demux2#1",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "name": "unnamedWire#106",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 645.0
-          },
-          {
-            "x": 140.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A3"
+          "compName": "and41#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#107",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 655.0
-          },
-          {
-            "x": 140.0,
-            "y": 650.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A4"
+          "compName": "and41#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#108",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 665.0
-          },
-          {
-            "x": 140.0,
-            "y": 660.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QA1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A1"
+          "compName": "and41#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#109",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 785.0
-          },
-          {
-            "x": 140.0,
-            "y": 780.0
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
@@ -838,2513 +742,2609 @@
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QA2"
+          "compName": "_submodelinterface",
+          "pinName": "WE"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A2"
+          "compName": "and41#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 140.0,
-            "y": 795.0
+            "x": 15.0,
+            "y": 850.0
            },
            {
-            "x": 140.0,
-            "y": 790.0
+            "x": 15.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QA3"
+          "compName": "and41#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A3"
+          "compName": "ram2#0",
+          "pinName": "WE"
          },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 140.0,
-            "y": 805.0
+            "x": 290.0,
+            "y": 155.0
            },
            {
-            "x": 140.0,
-            "y": 800.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QA4"
-        },
-        "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#112",
-        "path": [
+            "x": 290.0,
+            "y": 230.0
+          },
            {
-            "x": 140.0,
-            "y": 815.0
+            "x": 35.0,
+            "y": 230.0
            },
            {
-            "x": 140.0,
-            "y": 810.0
+            "x": 35.0,
+            "y": 375.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y1"
+          "compName": "and41#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C1"
+          "compName": "ram2#1",
+          "pinName": "WE"
          },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 305.0,
-            "y": 380.0
+            "x": 285.0,
+            "y": 165.0
            },
            {
-            "x": 305.0,
-            "y": 445.0
+            "x": 285.0,
+            "y": 225.0
            },
            {
-            "x": 245.0,
-            "y": 445.0
+            "x": 30.0,
+            "y": 225.0
            },
            {
-            "x": 245.0,
-            "y": 490.0
+            "x": 30.0,
+            "y": 525.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y2"
+          "compName": "and41#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C2"
+          "compName": "ram2#2",
+          "pinName": "WE"
          },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 300.0,
-            "y": 390.0
+            "x": 280.0,
+            "y": 175.0
            },
            {
-            "x": 300.0,
-            "y": 440.0
+            "x": 280.0,
+            "y": 220.0
            },
            {
-            "x": 240.0,
-            "y": 440.0
+            "x": 25.0,
+            "y": 220.0
            },
            {
-            "x": 240.0,
-            "y": 500.0
+            "x": 25.0,
+            "y": 675.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y3"
+          "compName": "and41#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C3"
+          "compName": "ram2#3",
+          "pinName": "WE"
          },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 295.0,
-            "y": 400.0
+            "x": 275.0,
+            "y": 185.0
            },
            {
-            "x": 295.0,
-            "y": 435.0
+            "x": 275.0,
+            "y": 215.0
            },
            {
-            "x": 235.0,
-            "y": 435.0
+            "x": 20.0,
+            "y": 215.0
            },
            {
-            "x": 235.0,
-            "y": 510.0
+            "x": 20.0,
+            "y": 825.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 410.0
-          },
-          {
-            "x": 290.0,
-            "y": 430.0
-          },
-          {
-            "x": 230.0,
-            "y": 430.0
-          },
-          {
-            "x": 230.0,
-            "y": 520.0
-          }
-        ]
+        "name": "unnamedWire#17",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C1"
+          "compName": "ram2#0",
+          "pinName": "A0"
          },
-        "name": "unnamedWire#117",
-        "path": [
-          {
-            "x": 305.0,
-            "y": 490.0
-          },
-          {
-            "x": 305.0,
-            "y": 595.0
-          },
-          {
-            "x": 245.0,
-            "y": 595.0
-          },
-          {
-            "x": 245.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#18",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#0",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#118",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 500.0
-          },
-          {
-            "x": 300.0,
-            "y": 590.0
-          },
-          {
-            "x": 240.0,
-            "y": 590.0
-          },
-          {
-            "x": 240.0,
-            "y": 650.0
-          }
-        ]
+        "name": "unnamedWire#19",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C3"
+          "compName": "ram2#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 295.0,
-            "y": 510.0
-          },
-          {
-            "x": 295.0,
-            "y": 585.0
-          },
-          {
-            "x": 235.0,
-            "y": 585.0
-          },
-          {
-            "x": 235.0,
-            "y": 660.0
+            "x": 45.0,
+            "y": 345.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "and41#0",
-          "pinName": "B"
+          "compName": "ram2#0",
+          "pinName": "B0"
          },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 15.0,
-            "y": 850.0
-          },
-          {
-            "x": 15.0,
-            "y": 195.0
+            "x": 50.0,
+            "y": 355.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C4"
+          "compName": "ram2#0",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 290.0,
-            "y": 520.0
-          },
-          {
-            "x": 290.0,
-            "y": 580.0
-          },
-          {
-            "x": 230.0,
-            "y": 580.0
-          },
-          {
-            "x": 230.0,
-            "y": 670.0
+            "x": 55.0,
+            "y": 365.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C1"
+          "compName": "ram2#1",
+          "pinName": "A0"
          },
-        "name": "unnamedWire#121",
-        "path": [
-          {
-            "x": 305.0,
-            "y": 640.0
-          },
-          {
-            "x": 305.0,
-            "y": 745.0
-          },
-          {
-            "x": 245.0,
-            "y": 745.0
-          },
-          {
-            "x": 245.0,
-            "y": 790.0
-          }
-        ]
+        "name": "unnamedWire#23",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C2"
+          "compName": "ram2#1",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#122",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 650.0
-          },
-          {
-            "x": 300.0,
-            "y": 740.0
-          },
-          {
-            "x": 240.0,
-            "y": 740.0
-          },
-          {
-            "x": 240.0,
-            "y": 800.0
-          }
-        ]
+        "name": "unnamedWire#24",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C3"
+          "compName": "ram2#1",
+          "pinName": "B0"
          },
-        "name": "unnamedWire#123",
-        "path": [
-          {
-            "x": 295.0,
-            "y": 660.0
-          },
-          {
-            "x": 295.0,
-            "y": 735.0
-          },
-          {
-            "x": 235.0,
-            "y": 735.0
-          },
-          {
-            "x": 235.0,
-            "y": 810.0
-          }
-        ]
+        "name": "unnamedWire#25",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C4"
+          "compName": "ram2#1",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#124",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 670.0
-          },
-          {
-            "x": 290.0,
-            "y": 730.0
-          },
-          {
-            "x": 230.0,
-            "y": 730.0
-          },
-          {
-            "x": 230.0,
-            "y": 820.0
-          }
-        ]
+        "name": "unnamedWire#26",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
-        "name": "unnamedWire#125",
-        "path": [
-          {
-            "x": 330.0,
-            "y": 790.0
-          },
-          {
-            "x": 330.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#27",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
-        "name": "unnamedWire#126",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 800.0
-          },
-          {
-            "x": 335.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#28",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
-        "name": "unnamedWire#127",
-        "path": [
-          {
-            "x": 340.0,
-            "y": 810.0
-          },
-          {
-            "x": 340.0,
-            "y": 650.0
-          }
-        ]
+        "name": "unnamedWire#29",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB4"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
-        "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 345.0,
-            "y": 820.0
-          },
-          {
-            "x": 345.0,
-            "y": 750.0
-          }
-        ]
+        "name": "unnamedWire#30",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C1"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
-        "name": "unnamedWire#129",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 330.0
-          },
-          {
-            "x": 210.0,
-            "y": 430.0
-          },
-          {
-            "x": 150.0,
-            "y": 430.0
-          },
-          {
-            "x": 150.0,
-            "y": 440.0
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
-        "name": "unnamedWire#13",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 155.0
-          },
-          {
-            "x": 290.0,
-            "y": 230.0
-          },
-          {
-            "x": 35.0,
-            "y": 230.0
-          },
-          {
-            "x": 35.0,
-            "y": 375.0
-          }
-        ]
+        "name": "unnamedWire#32",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C2"
+          "compName": "ram2#2",
+          "pinName": "A0"
          },
-        "name": "unnamedWire#130",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 340.0
-          },
-          {
-            "x": 205.0,
-            "y": 425.0
-          },
-          {
-            "x": 145.0,
-            "y": 425.0
-          },
-          {
-            "x": 145.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#33",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C3"
+          "compName": "ram2#2",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#131",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 350.0
-          },
-          {
-            "x": 200.0,
-            "y": 420.0
-          },
-          {
-            "x": 140.0,
-            "y": 420.0
-          },
-          {
-            "x": 140.0,
-            "y": 460.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#2",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "C4"
-        },
-        "name": "unnamedWire#132",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 360.0
-          },
-          {
-            "x": 195.0,
-            "y": 415.0
-          },
-          {
-            "x": 135.0,
-            "y": 415.0
-          },
-          {
-            "x": 135.0,
-            "y": 470.0
-          }
-        ]
+          "compName": "ram2#2",
+          "pinName": "B0"
+        },
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C1"
+          "compName": "ram2#2",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#133",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 440.0
-          },
-          {
-            "x": 210.0,
-            "y": 580.0
-          },
-          {
-            "x": 150.0,
-            "y": 580.0
-          },
-          {
-            "x": 150.0,
-            "y": 590.0
-          }
-        ]
+        "name": "unnamedWire#36",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C2"
+          "compName": "ram2#3",
+          "pinName": "A0"
          },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 205.0,
-            "y": 450.0
-          },
-          {
-            "x": 205.0,
-            "y": 575.0
-          },
-          {
-            "x": 145.0,
-            "y": 575.0
-          },
-          {
-            "x": 145.0,
-            "y": 600.0
+            "x": 40.0,
+            "y": 785.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C3"
+          "compName": "ram2#3",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#38",
          "path": [
            {
-            "x": 200.0,
-            "y": 460.0
-          },
-          {
-            "x": 200.0,
-            "y": 570.0
-          },
-          {
-            "x": 140.0,
-            "y": 570.0
-          },
-          {
-            "x": 140.0,
-            "y": 610.0
+            "x": 45.0,
+            "y": 795.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#3",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "C4"
+          "compName": "ram2#3",
+          "pinName": "B0"
          },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#39",
          "path": [
            {
-            "x": 195.0,
-            "y": 470.0
-          },
-          {
-            "x": 195.0,
-            "y": 565.0
-          },
-          {
-            "x": 135.0,
-            "y": 565.0
-          },
-          {
-            "x": 135.0,
-            "y": 620.0
+            "x": 50.0,
+            "y": 805.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C1"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#137",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 590.0
-          },
-          {
-            "x": 210.0,
-            "y": 730.0
-          },
-          {
-            "x": 150.0,
-            "y": 730.0
-          },
-          {
-            "x": 150.0,
-            "y": 740.0
-          }
-        ]
+        "name": "unnamedWire#40",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C2"
+          "compName": "ram2#3",
+          "pinName": "B1"
          },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 205.0,
-            "y": 600.0
-          },
-          {
-            "x": 205.0,
-            "y": 725.0
-          },
-          {
-            "x": 145.0,
-            "y": 725.0
-          },
-          {
-            "x": 145.0,
-            "y": 750.0
+            "x": 55.0,
+            "y": 815.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C3"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 200.0,
-            "y": 610.0
-          },
-          {
-            "x": 200.0,
-            "y": 720.0
-          },
-          {
-            "x": 140.0,
-            "y": 720.0
-          },
-          {
-            "x": 140.0,
-            "y": 760.0
+            "x": 40.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
-        "name": "unnamedWire#14",
-        "path": [
-          {
-            "x": 285.0,
-            "y": 165.0
-          },
-          {
-            "x": 285.0,
-            "y": 225.0
-          },
-          {
-            "x": 30.0,
-            "y": 225.0
-          },
-          {
-            "x": 30.0,
-            "y": 525.0
-          }
-        ]
+        "name": "unnamedWire#43",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "andor414#4",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "name": "unnamedWire#140",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 620.0
-          },
-          {
-            "x": 195.0,
-            "y": 715.0
-          },
-          {
-            "x": 135.0,
-            "y": 715.0
-          },
+        "name": "unnamedWire#44",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "ram2#0",
+          "pinName": "D1"
+        },
+        "name": "unnamedWire#45",
+        "path": [
            {
-            "x": 135.0,
-            "y": 770.0
+            "x": 60.0,
+            "y": 385.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA1"
+          "compName": "ram2#0",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#46",
          "path": [
            {
-            "x": 210.0,
-            "y": 740.0
-          },
-          {
-            "x": 210.0,
-            "y": 880.0
-          },
-          {
-            "x": 310.0,
-            "y": 880.0
-          },
-          {
-            "x": 310.0,
-            "y": 50.0
+            "x": 65.0,
+            "y": 395.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
+          "compName": "ram2#0",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 205.0,
-            "y": 750.0
-          },
-          {
-            "x": 205.0,
-            "y": 885.0
-          },
-          {
-            "x": 315.0,
-            "y": 885.0
-          },
-          {
-            "x": 315.0,
-            "y": 150.0
+            "x": 70.0,
+            "y": 405.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
+          "compName": "ram2#0",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#48",
          "path": [
            {
-            "x": 200.0,
-            "y": 760.0
-          },
-          {
-            "x": 200.0,
-            "y": 890.0
-          },
-          {
-            "x": 320.0,
-            "y": 890.0
-          },
-          {
-            "x": 320.0,
-            "y": 250.0
+            "x": 75.0,
+            "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
+          "compName": "ram2#1",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#144",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 770.0
-          },
-          {
-            "x": 195.0,
-            "y": 895.0
-          },
-          {
-            "x": 325.0,
-            "y": 895.0
-          },
-          {
-            "x": 325.0,
-            "y": 350.0
-          }
-        ]
+        "name": "unnamedWire#49",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "WE"
+          "compName": "ram2#1",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 280.0,
-            "y": 175.0
-          },
-          {
-            "x": 280.0,
-            "y": 220.0
-          },
-          {
-            "x": 25.0,
-            "y": 220.0
-          },
-          {
-            "x": 25.0,
-            "y": 675.0
-          }
-        ]
+        "name": "unnamedWire#50",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "WE"
+          "compName": "ram2#1",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 275.0,
-            "y": 185.0
-          },
-          {
-            "x": 275.0,
-            "y": 215.0
-          },
-          {
-            "x": 20.0,
-            "y": 215.0
-          },
-          {
-            "x": 20.0,
-            "y": 825.0
-          }
-        ]
+        "name": "unnamedWire#51",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
+          "compName": "ram2#1",
+          "pinName": "D4"
+        },
+        "name": "unnamedWire#52",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "name": "unnamedWire#17",
+        "pin2": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "demux2#1",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 450.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#56",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "ram2#2",
+          "pinName": "D1"
+        },
+        "name": "unnamedWire#57",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "ram2#2",
+          "pinName": "D2"
+        },
+        "name": "unnamedWire#58",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "ram2#2",
+          "pinName": "D3"
+        },
+        "name": "unnamedWire#59",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "A1"
+          "compName": "ram2#2",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#20",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 345.0
-          }
-        ]
+        "name": "unnamedWire#60",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "B0"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 355.0
-          }
-        ]
+        "name": "unnamedWire#61",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 365.0
-          }
-        ]
+        "name": "unnamedWire#62",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#63",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#64",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "B0"
+          "compName": "ram2#3",
+          "pinName": "D1"
          },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#65",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "B1"
+          "compName": "ram2#3",
+          "pinName": "D2"
          },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#66",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "D3"
          },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#67",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "D4"
          },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#68",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
-        "name": "unnamedWire#29",
-        "path": []
+        "name": "unnamedWire#69",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 950.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B1"
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "demux2#1",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#70",
          "path": [
            {
-            "x": 10.0,
-            "y": 550.0
-          },
-          {
-            "x": 10.0,
-            "y": 165.0
+            "x": 65.0,
+            "y": 1050.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B2"
+          "pinName": "D3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
-        "name": "unnamedWire#30",
-        "path": []
+        "name": "unnamedWire#71",
+        "path": [
+          {
+            "x": 70.0,
+            "y": 1150.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
-        "name": "unnamedWire#31",
-        "path": []
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 1250.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#32",
-        "path": []
+        "name": "unnamedWire#73",
+        "path": [
+          {
+            "x": 135.0,
+            "y": 50.0
+          },
+          {
+            "x": 135.0,
+            "y": 370.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "A0"
+          "compName": "andor414#3",
+          "pinName": "B"
          },
-        "name": "unnamedWire#33",
-        "path": []
+        "name": "unnamedWire#74",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 60.0
+          },
+          {
+            "x": 130.0,
+            "y": 520.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y10"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "A1"
+          "compName": "andor414#4",
+          "pinName": "B"
          },
-        "name": "unnamedWire#34",
-        "path": []
+        "name": "unnamedWire#75",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 70.0
+          },
+          {
+            "x": 125.0,
+            "y": 670.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "demux2#0",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "B0"
+          "compName": "andor414#5",
+          "pinName": "B"
          },
-        "name": "unnamedWire#35",
-        "path": []
+        "name": "unnamedWire#76",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 80.0
+          },
+          {
+            "x": 120.0,
+            "y": 820.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "B1"
+          "compName": "and41#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#36",
-        "path": []
+        "name": "unnamedWire#77",
+        "path": [
+          {
+            "x": 230.0,
+            "y": 420.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "A0"
+          "compName": "andor414#0",
+          "pinName": "B"
          },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 40.0,
-            "y": 785.0
+            "x": 225.0,
+            "y": 570.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "A1"
+          "compName": "andor414#1",
+          "pinName": "B"
          },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#79",
          "path": [
            {
-            "x": 45.0,
-            "y": 795.0
+            "x": 220.0,
+            "y": 720.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "B0"
+          "compName": "andor414#2",
+          "pinName": "B"
          },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#80",
          "path": [
            {
-            "x": 50.0,
-            "y": 805.0
+            "x": 215.0,
+            "y": 870.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y00"
+          "compName": "ram2#0",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#4",
-        "path": []
+        "name": "unnamedWire#81",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 375.0
+          },
+          {
+            "x": 140.0,
+            "y": 380.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QB2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#40",
-        "path": []
+        "name": "unnamedWire#82",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 385.0
+          },
+          {
+            "x": 140.0,
+            "y": 390.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "B1"
+          "compName": "and41#1",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#83",
          "path": [
            {
-            "x": 55.0,
-            "y": 815.0
+            "x": 140.0,
+            "y": 395.0
+          },
+          {
+            "x": 140.0,
+            "y": 400.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "ram2#0",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "and41#1",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#84",
          "path": [
            {
-            "x": 40.0,
-            "y": 250.0
+            "x": 140.0,
+            "y": 405.0
+          },
+          {
+            "x": 140.0,
+            "y": 410.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "ram2#1",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#43",
-        "path": []
+        "name": "unnamedWire#85",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 525.0
+          },
+          {
+            "x": 140.0,
+            "y": 530.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
+          "compName": "ram2#1",
+          "pinName": "QB2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#44",
-        "path": []
+        "name": "unnamedWire#86",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 535.0
+          },
+          {
+            "x": 140.0,
+            "y": 540.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D1"
+          "compName": "andor414#0",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#87",
          "path": [
            {
-            "x": 60.0,
-            "y": 385.0
+            "x": 140.0,
+            "y": 545.0
+          },
+          {
+            "x": 140.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D2"
+          "compName": "andor414#0",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#88",
          "path": [
            {
-            "x": 65.0,
-            "y": 395.0
+            "x": 140.0,
+            "y": 555.0
+          },
+          {
+            "x": 140.0,
+            "y": 560.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D3"
+          "compName": "andor414#1",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#89",
          "path": [
            {
-            "x": 70.0,
-            "y": 405.0
+            "x": 140.0,
+            "y": 675.0
+          },
+          {
+            "x": 140.0,
+            "y": 680.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QB2"
          },
          "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D4"
+          "compName": "andor414#1",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#90",
          "path": [
            {
-            "x": 75.0,
-            "y": 415.0
+            "x": 140.0,
+            "y": 685.0
+          },
+          {
+            "x": 140.0,
+            "y": 690.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D1"
+          "compName": "andor414#1",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#49",
-        "path": []
+        "name": "unnamedWire#91",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 695.0
+          },
+          {
+            "x": 140.0,
+            "y": 700.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y01"
+          "compName": "ram2#2",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#5",
-        "path": []
+        "name": "unnamedWire#92",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 705.0
+          },
+          {
+            "x": 140.0,
+            "y": 710.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D2"
+          "compName": "andor414#2",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#50",
-        "path": []
+        "name": "unnamedWire#93",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 825.0
+          },
+          {
+            "x": 140.0,
+            "y": 830.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QB2"
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D3"
+          "compName": "andor414#2",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#51",
-        "path": []
+        "name": "unnamedWire#94",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 835.0
+          },
+          {
+            "x": 140.0,
+            "y": 840.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D4"
+          "compName": "andor414#2",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#52",
-        "path": []
+        "name": "unnamedWire#95",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 845.0
+          },
+          {
+            "x": 140.0,
+            "y": 850.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#53",
-        "path": []
+        "name": "unnamedWire#96",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 855.0
+          },
+          {
+            "x": 140.0,
+            "y": 860.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#54",
-        "path": []
+        "name": "unnamedWire#97",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 335.0
+          },
+          {
+            "x": 140.0,
+            "y": 330.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#55",
-        "path": []
+        "name": "unnamedWire#98",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 345.0
+          },
+          {
+            "x": 140.0,
+            "y": 340.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "and41#2",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#56",
-        "path": []
+        "name": "unnamedWire#99",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 355.0
+          },
+          {
+            "x": 140.0,
+            "y": 350.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D1"
+          "compName": "and41#2",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#57",
-        "path": []
+        "name": "unnamedWire#100",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 365.0
+          },
+          {
+            "x": 140.0,
+            "y": 360.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D2"
+          "compName": "andor414#3",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#58",
-        "path": []
+        "name": "unnamedWire#101",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 485.0
+          },
+          {
+            "x": 140.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D3"
+          "compName": "andor414#3",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#59",
-        "path": []
+        "name": "unnamedWire#102",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 495.0
+          },
+          {
+            "x": 140.0,
+            "y": 490.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y10"
+          "compName": "ram2#1",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "andor414#3",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#6",
-        "path": []
+        "name": "unnamedWire#103",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 505.0
+          },
+          {
+            "x": 140.0,
+            "y": 500.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D4"
+          "compName": "andor414#3",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#60",
-        "path": []
+        "name": "unnamedWire#104",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 515.0
+          },
+          {
+            "x": 140.0,
+            "y": 510.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#61",
-        "path": []
+        "name": "unnamedWire#105",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 635.0
+          },
+          {
+            "x": 140.0,
+            "y": 630.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#62",
-        "path": []
+        "name": "unnamedWire#106",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 645.0
+          },
+          {
+            "x": 140.0,
+            "y": 640.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#63",
-        "path": []
+        "name": "unnamedWire#107",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 655.0
+          },
+          {
+            "x": 140.0,
+            "y": 650.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "andor414#4",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#64",
-        "path": []
+        "name": "unnamedWire#108",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 665.0
+          },
+          {
+            "x": 140.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D1"
+          "compName": "andor414#5",
+          "pinName": "A1"
          },
-        "name": "unnamedWire#65",
-        "path": []
+        "name": "unnamedWire#109",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 785.0
+          },
+          {
+            "x": 140.0,
+            "y": 780.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D2"
+          "compName": "andor414#5",
+          "pinName": "A2"
          },
-        "name": "unnamedWire#66",
-        "path": []
+        "name": "unnamedWire#110",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 795.0
+          },
+          {
+            "x": 140.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D3"
+          "compName": "andor414#5",
+          "pinName": "A3"
          },
-        "name": "unnamedWire#67",
-        "path": []
+        "name": "unnamedWire#111",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 805.0
+          },
+          {
+            "x": 140.0,
+            "y": 800.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "ram2#3",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D4"
+          "compName": "andor414#5",
+          "pinName": "A4"
          },
-        "name": "unnamedWire#68",
-        "path": []
+        "name": "unnamedWire#112",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 815.0
+          },
+          {
+            "x": 140.0,
+            "y": 810.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "and41#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 60.0,
-            "y": 950.0
+            "x": 305.0,
+            "y": 380.0
+          },
+          {
+            "x": 305.0,
+            "y": 445.0
+          },
+          {
+            "x": 245.0,
+            "y": 445.0
+          },
+          {
+            "x": 245.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y11"
+          "compName": "and41#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#7",
-        "path": []
+        "name": "unnamedWire#114",
+        "path": [
+          {
+            "x": 300.0,
+            "y": 390.0
+          },
+          {
+            "x": 300.0,
+            "y": 440.0
+          },
+          {
+            "x": 240.0,
+            "y": 440.0
+          },
+          {
+            "x": 240.0,
+            "y": 500.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "and41#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 65.0,
-            "y": 1050.0
+            "x": 295.0,
+            "y": 400.0
+          },
+          {
+            "x": 295.0,
+            "y": 435.0
+          },
+          {
+            "x": 235.0,
+            "y": 435.0
+          },
+          {
+            "x": 235.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "and41#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#116",
          "path": [
            {
-            "x": 70.0,
-            "y": 1150.0
+            "x": 290.0,
+            "y": 410.0
+          },
+          {
+            "x": 290.0,
+            "y": 430.0
+          },
+          {
+            "x": 230.0,
+            "y": 430.0
+          },
+          {
+            "x": 230.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "andor414#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#117",
          "path": [
            {
-            "x": 75.0,
-            "y": 1250.0
+            "x": 305.0,
+            "y": 490.0
+          },
+          {
+            "x": 305.0,
+            "y": 595.0
+          },
+          {
+            "x": 245.0,
+            "y": 595.0
+          },
+          {
+            "x": 245.0,
+            "y": 640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y00"
+          "compName": "andor414#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#118",
          "path": [
            {
-            "x": 135.0,
-            "y": 50.0
+            "x": 300.0,
+            "y": 500.0
            },
            {
-            "x": 135.0,
-            "y": 370.0
+            "x": 300.0,
+            "y": 590.0
+          },
+          {
+            "x": 240.0,
+            "y": 590.0
+          },
+          {
+            "x": 240.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y01"
+          "compName": "andor414#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#3",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#119",
          "path": [
            {
-            "x": 130.0,
-            "y": 60.0
+            "x": 295.0,
+            "y": 510.0
            },
            {
-            "x": 130.0,
-            "y": 520.0
+            "x": 295.0,
+            "y": 585.0
+          },
+          {
+            "x": 235.0,
+            "y": 585.0
+          },
+          {
+            "x": 235.0,
+            "y": 660.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y10"
+          "compName": "andor414#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#4",
-          "pinName": "B"
+          "compName": "andor414#1",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#120",
          "path": [
            {
-            "x": 125.0,
-            "y": 70.0
+            "x": 290.0,
+            "y": 520.0
            },
            {
-            "x": 125.0,
+            "x": 290.0,
+            "y": 580.0
+          },
+          {
+            "x": 230.0,
+            "y": 580.0
+          },
+          {
+            "x": 230.0,
              "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y11"
+          "compName": "andor414#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#5",
-          "pinName": "B"
+          "compName": "andor414#2",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#121",
          "path": [
            {
-            "x": 120.0,
-            "y": 80.0
+            "x": 305.0,
+            "y": 640.0
            },
            {
-            "x": 120.0,
-            "y": 820.0
+            "x": 305.0,
+            "y": 745.0
+          },
+          {
+            "x": 245.0,
+            "y": 745.0
+          },
+          {
+            "x": 245.0,
+            "y": 790.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "B"
+          "compName": "andor414#2",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#122",
          "path": [
            {
-            "x": 230.0,
-            "y": 420.0
+            "x": 300.0,
+            "y": 650.0
+          },
+          {
+            "x": 300.0,
+            "y": 740.0
+          },
+          {
+            "x": 240.0,
+            "y": 740.0
+          },
+          {
+            "x": 240.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "B"
+          "compName": "andor414#2",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#123",
          "path": [
            {
-            "x": 225.0,
-            "y": 570.0
+            "x": 295.0,
+            "y": 660.0
+          },
+          {
+            "x": 295.0,
+            "y": 735.0
+          },
+          {
+            "x": 235.0,
+            "y": 735.0
+          },
+          {
+            "x": 235.0,
+            "y": 810.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "andor414#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "B"
+          "compName": "andor414#2",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#124",
          "path": [
            {
-            "x": 220.0,
-            "y": 720.0
+            "x": 290.0,
+            "y": 670.0
+          },
+          {
+            "x": 290.0,
+            "y": 730.0
+          },
+          {
+            "x": 230.0,
+            "y": 730.0
+          },
+          {
+            "x": 230.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "QB1"
          },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#125",
          "path": [
            {
-            "x": 215.0,
-            "y": 870.0
+            "x": 330.0,
+            "y": 790.0
+          },
+          {
+            "x": 330.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB1"
+          "compName": "andor414#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "QB2"
          },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#126",
          "path": [
            {
-            "x": 140.0,
-            "y": 375.0
+            "x": 335.0,
+            "y": 800.0
            },
            {
-            "x": 140.0,
-            "y": 380.0
+            "x": 335.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB2"
+          "compName": "andor414#2",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A2"
+          "compName": "_submodelinterface",
+          "pinName": "QB3"
          },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#127",
          "path": [
            {
-            "x": 140.0,
-            "y": 385.0
+            "x": 340.0,
+            "y": 810.0
            },
            {
-            "x": 140.0,
-            "y": 390.0
+            "x": 340.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB3"
+          "compName": "andor414#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "QB4"
          },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#128",
          "path": [
            {
-            "x": 140.0,
-            "y": 395.0
+            "x": 345.0,
+            "y": 820.0
            },
            {
-            "x": 140.0,
-            "y": 400.0
+            "x": 345.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB4"
+          "compName": "and41#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "and41#1",
-          "pinName": "A4"
+          "compName": "andor414#3",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#129",
          "path": [
            {
-            "x": 140.0,
-            "y": 405.0
+            "x": 210.0,
+            "y": 330.0
            },
            {
-            "x": 140.0,
-            "y": 410.0
+            "x": 210.0,
+            "y": 430.0
+          },
+          {
+            "x": 150.0,
+            "y": 430.0
+          },
+          {
+            "x": 150.0,
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB1"
+          "compName": "and41#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A1"
+          "compName": "andor414#3",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#130",
          "path": [
            {
-            "x": 140.0,
-            "y": 525.0
+            "x": 205.0,
+            "y": 340.0
            },
            {
-            "x": 140.0,
-            "y": 530.0
+            "x": 205.0,
+            "y": 425.0
+          },
+          {
+            "x": 145.0,
+            "y": 425.0
+          },
+          {
+            "x": 145.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB2"
+          "compName": "and41#2",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A2"
+          "compName": "andor414#3",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#131",
          "path": [
+          {
+            "x": 200.0,
+            "y": 350.0
+          },
+          {
+            "x": 200.0,
+            "y": 420.0
+          },
            {
              "x": 140.0,
-            "y": 535.0
+            "y": 420.0
            },
            {
              "x": 140.0,
-            "y": 540.0
+            "y": 460.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB3"
+          "compName": "and41#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A3"
+          "compName": "andor414#3",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#132",
          "path": [
            {
-            "x": 140.0,
-            "y": 545.0
+            "x": 195.0,
+            "y": 360.0
            },
            {
-            "x": 140.0,
-            "y": 550.0
+            "x": 195.0,
+            "y": 415.0
+          },
+          {
+            "x": 135.0,
+            "y": 415.0
+          },
+          {
+            "x": 135.0,
+            "y": 470.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB4"
+          "compName": "andor414#3",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A4"
+          "compName": "andor414#4",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#133",
          "path": [
            {
-            "x": 140.0,
-            "y": 555.0
+            "x": 210.0,
+            "y": 440.0
            },
            {
-            "x": 140.0,
-            "y": 560.0
+            "x": 210.0,
+            "y": 580.0
+          },
+          {
+            "x": 150.0,
+            "y": 580.0
+          },
+          {
+            "x": 150.0,
+            "y": 590.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB1"
+          "compName": "andor414#3",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A1"
+          "compName": "andor414#4",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#134",
          "path": [
            {
-            "x": 140.0,
-            "y": 675.0
+            "x": 205.0,
+            "y": 450.0
            },
            {
-            "x": 140.0,
-            "y": 680.0
+            "x": 205.0,
+            "y": 575.0
+          },
+          {
+            "x": 145.0,
+            "y": 575.0
+          },
+          {
+            "x": 145.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB2"
+          "compName": "andor414#3",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A2"
+          "compName": "andor414#4",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#135",
          "path": [
+          {
+            "x": 200.0,
+            "y": 460.0
+          },
+          {
+            "x": 200.0,
+            "y": 570.0
+          },
            {
              "x": 140.0,
-            "y": 685.0
+            "y": 570.0
            },
            {
              "x": 140.0,
-            "y": 690.0
+            "y": 610.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB3"
+          "compName": "andor414#3",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A3"
+          "compName": "andor414#4",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#136",
          "path": [
            {
-            "x": 140.0,
-            "y": 695.0
+            "x": 195.0,
+            "y": 470.0
            },
            {
-            "x": 140.0,
-            "y": 700.0
+            "x": 195.0,
+            "y": 565.0
+          },
+          {
+            "x": 135.0,
+            "y": 565.0
+          },
+          {
+            "x": 135.0,
+            "y": 620.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB4"
+          "compName": "andor414#4",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A4"
+          "compName": "andor414#5",
+          "pinName": "C1"
          },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#137",
          "path": [
            {
-            "x": 140.0,
-            "y": 705.0
+            "x": 210.0,
+            "y": 590.0
            },
            {
-            "x": 140.0,
-            "y": 710.0
+            "x": 210.0,
+            "y": 730.0
+          },
+          {
+            "x": 150.0,
+            "y": 730.0
+          },
+          {
+            "x": 150.0,
+            "y": 740.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB1"
+          "compName": "andor414#4",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A1"
+          "compName": "andor414#5",
+          "pinName": "C2"
          },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#138",
          "path": [
            {
-            "x": 140.0,
-            "y": 825.0
+            "x": 205.0,
+            "y": 600.0
            },
            {
-            "x": 140.0,
-            "y": 830.0
+            "x": 205.0,
+            "y": 725.0
+          },
+          {
+            "x": 145.0,
+            "y": 725.0
+          },
+          {
+            "x": 145.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB2"
+          "compName": "andor414#4",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A2"
+          "compName": "andor414#5",
+          "pinName": "C3"
          },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#139",
          "path": [
+          {
+            "x": 200.0,
+            "y": 610.0
+          },
+          {
+            "x": 200.0,
+            "y": 720.0
+          },
            {
              "x": 140.0,
-            "y": 835.0
+            "y": 720.0
            },
            {
              "x": 140.0,
-            "y": 840.0
+            "y": 760.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB3"
+          "compName": "andor414#4",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A3"
+          "compName": "andor414#5",
+          "pinName": "C4"
          },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#140",
          "path": [
            {
-            "x": 140.0,
-            "y": 845.0
+            "x": 195.0,
+            "y": 620.0
            },
            {
-            "x": 140.0,
-            "y": 850.0
+            "x": 195.0,
+            "y": 715.0
+          },
+          {
+            "x": 135.0,
+            "y": 715.0
+          },
+          {
+            "x": 135.0,
+            "y": 770.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB4"
+          "compName": "andor414#5",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "QA1"
          },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#141",
          "path": [
            {
-            "x": 140.0,
-            "y": 855.0
+            "x": 210.0,
+            "y": 740.0
            },
            {
-            "x": 140.0,
-            "y": 860.0
+            "x": 210.0,
+            "y": 880.0
+          },
+          {
+            "x": 310.0,
+            "y": 880.0
+          },
+          {
+            "x": 310.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA1"
+          "compName": "andor414#5",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "QA2"
          },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#142",
          "path": [
            {
-            "x": 140.0,
-            "y": 335.0
+            "x": 205.0,
+            "y": 750.0
            },
            {
-            "x": 140.0,
-            "y": 330.0
+            "x": 205.0,
+            "y": 885.0
+          },
+          {
+            "x": 315.0,
+            "y": 885.0
+          },
+          {
+            "x": 315.0,
+            "y": 150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA2"
+          "compName": "andor414#5",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "A2"
+          "compName": "_submodelinterface",
+          "pinName": "QA3"
          },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#143",
          "path": [
            {
-            "x": 140.0,
-            "y": 345.0
+            "x": 200.0,
+            "y": 760.0
            },
            {
-            "x": 140.0,
-            "y": 340.0
+            "x": 200.0,
+            "y": 890.0
+          },
+          {
+            "x": 320.0,
+            "y": 890.0
+          },
+          {
+            "x": 320.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA3"
+          "compName": "andor414#5",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "and41#2",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "QA4"
          },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#144",
          "path": [
            {
-            "x": 140.0,
-            "y": 355.0
+            "x": 195.0,
+            "y": 770.0
            },
            {
-            "x": 140.0,
+            "x": 195.0,
+            "y": 895.0
+          },
+          {
+            "x": 325.0,
+            "y": 895.0
+          },
+          {
+            "x": 325.0,
              "y": 350.0
            }
          ]
@@ -3370,6 +3370,24 @@
            "delegateTarget": "ram2#0"
          }
        },
+      "c01": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "ram2#1"
+        }
+      },
+      "c10": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "ram2#2"
+        }
+      },
+      "c11": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "ram2#3"
+        }
+      },
        "c0000": {
          "id": "delegating",
          "params": {
@@ -3398,12 +3416,6 @@
            "prefix": "c00"
          }
        },
-      "c01": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "ram2#1"
-        }
-      },
        "c0100": {
          "id": "delegating",
          "params": {
@@ -3432,12 +3444,6 @@
            "prefix": "c01"
          }
        },
-      "c10": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "ram2#2"
-        }
-      },
        "c1000": {
          "id": "delegating",
          "params": {
@@ -3466,12 +3472,6 @@
            "prefix": "c10"
          }
        },
-      "c11": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "ram2#3"
-        }
-      },
        "c1100": {
          "id": "delegating",
          "params": {
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json

index afd89f1..6cc41df 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json
@@ -122,17 +122,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#10"
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -142,7 +131,7 @@
            "compName": "NandGate#0",
            "pinName": "B"
          },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#2",
          "path": [
            {
              "x": 25.0,
@@ -163,7 +152,7 @@
            "compName": "NandGate#1",
            "pinName": "B"
          },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#3",
          "path": [
            {
              "x": 15.0,
@@ -184,7 +173,7 @@
            "compName": "NandGate#2",
            "pinName": "A"
          },
-        "name": "unnamedWire#8"
+        "name": "unnamedWire#4"
        },
        {
          "pin1": {
@@ -195,7 +184,18 @@
            "compName": "NandGate#2",
            "pinName": "B"
          },
-        "name": "unnamedWire#9"
+        "name": "unnamedWire#5"
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#6"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json

index 22f3ce6..444d02b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json
@@ -150,24 +150,6 @@
          },
          "params": 1
        },
-      {
-        "id": "NandGate",
-        "name": "NandGate#10",
-        "pos": {
-          "x": 65.0,
-          "y": 52.5
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#11",
-        "pos": {
-          "x": 65.0,
-          "y": 77.5
-        },
-        "params": 1
-      },
        {
          "id": "NandGate",
          "name": "NandGate#2",
@@ -240,6 +222,24 @@
          },
          "params": 1
        },
+      {
+        "id": "NandGate",
+        "name": "NandGate#10",
+        "pos": {
+          "x": 65.0,
+          "y": 52.5
+        },
+        "params": 1
+      },
+      {
+        "id": "NandGate",
+        "name": "NandGate#11",
+        "pos": {
+          "x": 65.0,
+          "y": 77.5
+        },
+        "params": 1
+      },
        {
          "id": "WireCrossPoint",
          "name": "WireCrossPoint#0",
@@ -338,6 +338,154 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "NandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 112.5
+          },
+          {
+            "x": 17.5,
+            "y": 107.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 137.5
+          },
+          {
+            "x": 17.5,
+            "y": 157.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "NandGate#4",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 162.5
+          },
+          {
+            "x": 10.0,
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "NandGate#5",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 12.5,
+            "y": 187.5
+          },
+          {
+            "x": 12.5,
+            "y": 82.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "NandGate#6",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 212.5
+          },
+          {
+            "x": 15.0,
+            "y": 132.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "NandGate#7",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 237.5
+          },
+          {
+            "x": 10.0,
+            "y": 182.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SA"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SB"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9"
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -454,27 +602,6 @@
          },
          "name": "unnamedWire#19"
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 17.5,
-            "y": 112.5
-          },
-          {
-            "x": 17.5,
-            "y": 107.5
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#5",
@@ -671,27 +798,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 17.5,
-            "y": 137.5
-          },
-          {
-            "x": 17.5,
-            "y": 157.5
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "NandGate#8",
@@ -739,112 +845,6 @@
          },
          "name": "unnamedWire#33",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "NandGate#4",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 162.5
-          },
-          {
-            "x": 10.0,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 12.5,
-            "y": 187.5
-          },
-          {
-            "x": 12.5,
-            "y": 82.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "NandGate#6",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 212.5
-          },
-          {
-            "x": 15.0,
-            "y": 132.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 237.5
-          },
-          {
-            "x": 10.0,
-            "y": 182.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SA"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json

index c16624c..a9fdefe 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json
@@ -336,6 +336,174 @@
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A1"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 175.0
+          },
+          {
+            "x": 15.0,
+            "y": 275.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 225.0
+          },
+          {
+            "x": 10.0,
+            "y": 285.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 275.0
+          },
+          {
+            "x": 5.0,
+            "y": 295.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 325.0
+          },
+          {
+            "x": 5.0,
+            "y": 305.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "B1"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 375.0
+          },
+          {
+            "x": 10.0,
+            "y": 315.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "B2"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 425.0
+          },
+          {
+            "x": 15.0,
+            "y": 325.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "B3"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 475.0
+          },
+          {
+            "x": 20.0,
+            "y": 335.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "sel2_4#0",
+          "pinName": "B4"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 525.0
+          },
+          {
+            "x": 25.0,
+            "y": 345.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "sel2_4#0",
@@ -471,27 +639,6 @@
          "name": "unnamedWire#19",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 175.0
-          },
-          {
-            "x": 15.0,
-            "y": 275.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#2",
@@ -662,27 +809,6 @@
            }
          ]
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 225.0
-          },
-          {
-            "x": 10.0,
-            "y": 285.0
-          }
-        ]
-      },
        {
          "pin1": {
            "compName": "NandGate#1",
@@ -793,132 +919,6 @@
          },
          "name": "unnamedWire#36",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 275.0
-          },
-          {
-            "x": 5.0,
-            "y": 295.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 325.0
-          },
-          {
-            "x": 5.0,
-            "y": 305.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "B1"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 375.0
-          },
-          {
-            "x": 10.0,
-            "y": 315.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "B2"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 425.0
-          },
-          {
-            "x": 15.0,
-            "y": 325.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "B3"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 475.0
-          },
-          {
-            "x": 20.0,
-            "y": 335.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "sel2_4#0",
-          "pinName": "B4"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 525.0
-          },
-          {
-            "x": 25.0,
-            "y": 345.0
-          }
-        ]
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json

index 2eff80e..dc2d71b 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json
@@ -122,28 +122,6 @@
          "name": "unnamedWire#1",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#10"
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#11"
-      },
        {
          "pin1": {
            "compName": "WireCrossPoint#0",
@@ -267,6 +245,28 @@
            "pinName": "A"
          },
          "name": "unnamedWire#9"
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#10"
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#11"
        }
      ],
      "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java

index f34bf34..cf12111 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java
@@ -11,10 +11,9 @@ import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Map;
  import java.util.Map.Entry;
-import java.util.Optional;
  import java.util.Scanner;
  import java.util.Set;
-import java.util.function.Function;
+import java.util.TreeMap;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
@@ -22,8 +21,8 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
  import net.mograsim.logic.model.am2900.Am2900Loader;
  import net.mograsim.logic.model.model.LogicModelModifiable;
  import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.components.atomic.ModelTextComponent;
  import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
-import net.mograsim.logic.model.model.components.submodels.SubmodelInterface;
  import net.mograsim.logic.model.model.wires.ModelWire;
  import net.mograsim.logic.model.model.wires.ModelWireCrossPoint;
  import net.mograsim.logic.model.model.wires.MovablePin;
@@ -31,15 +30,26 @@ import net.mograsim.logic.model.model.wires.Pin;
  import net.mograsim.logic.model.model.wires.PinUsage;
  import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
  import net.mograsim.logic.model.serializing.IdentifyParams;
-import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
+import net.mograsim.logic.model.serializing.LogicModelParams.ComponentParams;
+import net.mograsim.logic.model.serializing.LogicModelParams.WireParams;
+import net.mograsim.logic.model.serializing.SubmodelComponentParams;
  import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
-import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler.StandardHighLevelStateHandlerParams;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.AtomicHighLevelStateHandler.AtomicHighLevelStateHandlerParams;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler.DelegatingAtomicHighLevelStateHandlerParams;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler.WireForcingAtomicHighLevelStateHandlerParams;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler.DelegatingSubcomponentHighLevelStateHandlerParams;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.SubcomponentHighLevelStateHandler.SubcomponentHighLevelStateHandlerParams;
+import net.mograsim.logic.model.util.JsonHandler;
  
  public class ReserializeAndVerifyJSONs
  {
         public static double GRIDSIZE = 2.5;
         public static boolean changePinUsages = false;
         public static boolean changeComponentNames = false;
+       public static boolean forceDefaultComponentNames = false;
+       public static boolean changeWireNames = true;
+       public static boolean forceDefaultWireNames = true;
         public static boolean snapWCPs = true;
         public static boolean warnNonSnappedPoints = true;
         public static boolean warnNonVertHorizLines = true;
@@ -73,16 +83,20 @@ public class ReserializeAndVerifyJSONs
         {
                 try
                 {
-                       DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator
-                                       .createComponent(new LogicModelModifiable(), "jsonfile:" + componentPath.toString());
+                       SubmodelComponentParams oldComponentJSON = JsonHandler.readJson(componentPath.toString(), SubmodelComponentParams.class);
+                       DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) SubmodelComponentSerializer
+                                       .deserialize(new LogicModelModifiable(), oldComponentJSON);
                         System.out.println("Reserializing " + componentPath);
                         LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable();
                         Map<String, String> componentNameRemapping = new HashMap<>();
+                       Map<String, String> wireNameRemapping = new HashMap<>();
  
                         if (changePinUsages)
                                 changePinUsages(sysin, comp);
                         if (changeComponentNames)
                                 changeComponentNames(sysin, submodelModifiable, componentNameRemapping);
+                       if (changeWireNames)
+                               changeWireNames(sysin, submodelModifiable, wireNameRemapping);
                         if (snapWCPs)
                                 snapWCPs(submodelModifiable);
                         if (warnNonSnappedPoints)
@@ -92,10 +106,15 @@ public class ReserializeAndVerifyJSONs
                         if (warnRedundantWires)
                                 warnRedundantWires(submodelModifiable);
  
-                       SubmodelComponentSerializer.serialize(comp, componentPath.toString());
+                       SubmodelComponentParams newComponentJSON = SubmodelComponentSerializer.serialize(comp);
  
                         if (changeComponentNames)
-                               changeComponentNames_AfterSerialization(sysin, comp, componentNameRemapping);
+                               changeComponentNames_AfterSerialization(newComponentJSON, componentNameRemapping);
+                       if (changeWireNames)
+                               changeWireNames_AfterSerialization(newComponentJSON, wireNameRemapping);
+                       sortAllJSONArrays(newComponentJSON);
+
+                       JsonHandler.writeJson(newComponentJSON, componentPath.toString());
                 }
                 catch (Exception e)
                 {
@@ -148,6 +167,7 @@ public class ReserializeAndVerifyJSONs
                 });
         }
  
+       @SuppressWarnings("unused") // TextComponent
         private static void changeComponentNames(Scanner sysin, LogicModelModifiable submodelModifiable,
                         Map<String, String> componentNameRemapping)
         {
@@ -161,7 +181,7 @@ public class ReserializeAndVerifyJSONs
                                         String oldName = e.getKey();
                                         ModelComponent subcomp = e.getValue();
                                         String defaultName = tempModel.getDefaultComponentName(subcomp);
-                                       String newName = null;
+                                       String newName = forceDefaultComponentNames ? defaultName : null;
                                         while (newName == null)
                                         {
                                                 System.out.print("  New name for component " + oldName + " of type " + subcomp.getIDForSerializing(iP) + " (empty: "
@@ -176,39 +196,92 @@ public class ReserializeAndVerifyJSONs
                                                 }
                                         }
                                         componentNameRemapping.put(oldName, newName);
-                                       IndirectModelComponentCreator
-                                                       .createComponent(tempModel, subcomp.getIDForSerializing(iP), subcomp.getParamsForSerializingJSON(iP), newName)
-                                                       .moveTo(subcomp.getPosX(), subcomp.getPosY());
+                                       new ModelTextComponent(tempModel, "", newName);
                                 });
-               SubmodelInterface tempSubmodelInterface = new SubmodelInterface(tempModel);
-               for (Pin p : submodelModifiable.getComponentsByName().get(SubmodelComponent.SUBMODEL_INTERFACE_NAME).getPins().values())
-                       tempSubmodelInterface
-                                       .addPin(new Pin(tempModel, tempSubmodelInterface, p.name, p.logicWidth, p.usage, p.getRelX(), p.getRelY()));
-               for (ModelWire w : submodelModifiable.getWiresByName().values())
-                       createWire(componentNameRemapping::get, tempModel, w);
+       }
  
-               Optional<ModelComponent> o;
-               while ((o = submodelModifiable.getComponentsByName().values().stream()
-                               .filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent())
-                       submodelModifiable.destroyComponent(o.get());
+       private static void changeComponentNames_AfterSerialization(SubmodelComponentParams newComponentJSON,
+                       Map<String, String> componentNameRemapping)
+       {
+               for (ComponentParams cParams : newComponentJSON.submodel.components)
+                       cParams.name = componentNameRemapping.get(cParams.name);
+               for (WireParams wParams : newComponentJSON.submodel.wires)
+               {
+                       wParams.pin1.compName = componentNameRemapping.get(wParams.pin1.compName);
+                       wParams.pin2.compName = componentNameRemapping.get(wParams.pin2.compName);
+               }
+               if ("standard".equals(newComponentJSON.highLevelStateHandlerSnippetID))
+               {
+                       StandardHighLevelStateHandlerParams hlshParams = JsonHandler.fromJsonTree(newComponentJSON.highLevelStateHandlerParams,
+                                       StandardHighLevelStateHandlerParams.class);
+                       for (AtomicHighLevelStateHandlerParams ahlshParams : hlshParams.atomicHighLevelStates.values())
+                               if ("delegating".equals(ahlshParams.id))
+                               {
+                                       DelegatingAtomicHighLevelStateHandlerParams dhlshParams = JsonHandler.fromJsonTree(ahlshParams.params,
+                                                       DelegatingAtomicHighLevelStateHandlerParams.class);
+                                       dhlshParams.delegateTarget = componentNameRemapping.get(dhlshParams.delegateTarget);
+                                       ahlshParams.params = JsonHandler.toJsonTree(dhlshParams);
+                               }
+                       for (SubcomponentHighLevelStateHandlerParams shlshParams : hlshParams.subcomponentHighLevelStates.values())
+                               if ("delegating".equals(shlshParams.id))
+                               {
+                                       DelegatingSubcomponentHighLevelStateHandlerParams dhlshParams = JsonHandler.fromJsonTree(shlshParams.params,
+                                                       DelegatingSubcomponentHighLevelStateHandlerParams.class);
+                                       dhlshParams.delegateTarget = componentNameRemapping.get(dhlshParams.delegateTarget);
+                                       shlshParams.params = JsonHandler.toJsonTree(dhlshParams);
+                               }
+                       newComponentJSON.highLevelStateHandlerParams = JsonHandler.toJsonTree(hlshParams);
+               }
+       }
  
-               tempModel.getComponentsByName().values().stream().filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME))
-                               .forEach(c -> IndirectModelComponentCreator
-                                               .createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.getName())
-                                               .moveTo(c.getPosX(), c.getPosY()));
-               for (ModelWire w : tempModel.getWiresByName().values())
-                       createWire(Function.identity(), submodelModifiable, w);
+       @SuppressWarnings("unused") // Wire
+       private static void changeWireNames(Scanner sysin, LogicModelModifiable submodelModifiable, Map<String, String> wireNameRemapping)
+       {
+               LogicModelModifiable tempModel = new LogicModelModifiable();
+               Pin p = new ModelWireCrossPoint(tempModel, 1).getPin();
+               IdentifyParams iP = new IdentifyParams();
+               submodelModifiable.getWiresByName().entrySet().stream()
+                               .sorted(Comparator.comparing(Entry::getKey, ReserializeAndVerifyJSONs::compareStringsWithIntegers)).forEach(e ->
+                               {
+                                       String oldName = e.getKey();
+                                       String defaultName = tempModel.getDefaultWireName();
+                                       String newName = forceDefaultWireNames ? defaultName : null;
+                                       while (newName == null)
+                                       {
+                                               System.out.print("  New name for wire " + oldName + " (empty: " + defaultName + ") >");
+                                               newName = sysin.nextLine();
+                                               if (newName.equals(""))
+                                                       newName = defaultName;
+                                               if (tempModel.getComponentsByName().containsKey(newName))
+                                               {
+                                                       System.err.println("  There already is a component with that name");
+                                                       newName = null;
+                                               }
+                                       }
+                                       wireNameRemapping.put(oldName, newName);
+                                       new ModelWire(tempModel, newName, p, p);
+                               });
         }
  
-       private static void changeComponentNames_AfterSerialization(Scanner sysin, DeserializedSubmodelComponent comp,
-                       Map<String, String> componentNameRemapping)
+       private static void changeWireNames_AfterSerialization(SubmodelComponentParams newComponentJSON, Map<String, String> wireNameRemapping)
         {
-               if (comp.getHighLevelStateHandler() == null || !(comp.getHighLevelStateHandler() instanceof DefaultHighLevelStateHandler))
+               for (WireParams wParams : newComponentJSON.submodel.wires)
+                       wParams.name = wireNameRemapping.get(wParams.name);
+               if ("standard".equals(newComponentJSON.highLevelStateHandlerSnippetID))
                 {
-                       System.out.println("  A non-default HighLevelStateHandler was detected. Check for changes there manually.");
-                       System.out.print("  Empty line to continue to next component, old component name to get new component name >");
-                       for (String line = sysin.nextLine(); !line.equals(""); line = sysin.nextLine())
-                               System.out.println("  " + line + "->" + componentNameRemapping.get(line) + " >");
+                       StandardHighLevelStateHandlerParams hlshParams = JsonHandler.fromJsonTree(newComponentJSON.highLevelStateHandlerParams,
+                                       StandardHighLevelStateHandlerParams.class);
+                       for (AtomicHighLevelStateHandlerParams ahlshParams : hlshParams.atomicHighLevelStates.values())
+                               if ("wireForcing".equals(ahlshParams.id))
+                               {
+                                       WireForcingAtomicHighLevelStateHandlerParams whlshParams = JsonHandler.fromJsonTree(ahlshParams.params,
+                                                       WireForcingAtomicHighLevelStateHandlerParams.class);
+                                       whlshParams.wiresToForce = whlshParams.wiresToForce.stream().map(wireNameRemapping::get).collect(Collectors.toList());
+                                       whlshParams.wiresToForceInverted = whlshParams.wiresToForceInverted.stream().map(wireNameRemapping::get)
+                                                       .collect(Collectors.toList());
+                                       ahlshParams.params = JsonHandler.toJsonTree(whlshParams);
+                               }
+                       newComponentJSON.highLevelStateHandlerParams = JsonHandler.toJsonTree(hlshParams);
                 }
         }
  
@@ -277,18 +350,24 @@ public class ReserializeAndVerifyJSONs
                 });
         }
  
-       private static ModelWire createWire(Function<String, String> componentNameRemapping, LogicModelModifiable tempModelForDefaultNames,
-                       ModelWire w)
+       private static void sortAllJSONArrays(SubmodelComponentParams newComponentJSON)
         {
-               return new ModelWire(tempModelForDefaultNames, w.name,
-                               getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin1()),
-                               getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin2()), w.getPath());
-       }
-
-       private static Pin getRemappedPin(Function<String, String> componentNameRemapping, LogicModelModifiable tempModelForDefaultNames,
-                       Pin pin)
-       {
-               return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.getName())).getPin(pin.name);
+               Comparator<String> c = ReserializeAndVerifyJSONs::compareStringsWithIntegers;
+               Arrays.sort(newComponentJSON.interfacePins, Comparator.comparing(p -> p.name, c));
+               Arrays.sort(newComponentJSON.submodel.components, Comparator.comparing(p -> p.name, c));
+               Arrays.sort(newComponentJSON.submodel.wires, Comparator.comparing(p -> p.name, c));
+               if ("standard".equals(newComponentJSON.highLevelStateHandlerSnippetID))
+               {
+                       StandardHighLevelStateHandlerParams hlshP = JsonHandler.fromJsonTree(newComponentJSON.highLevelStateHandlerParams,
+                                       StandardHighLevelStateHandlerParams.class);
+                       TreeMap<String, AtomicHighLevelStateHandlerParams> tmp1 = new TreeMap<>(c);
+                       tmp1.putAll(hlshP.atomicHighLevelStates);
+                       hlshP.atomicHighLevelStates = tmp1;
+                       TreeMap<String, SubcomponentHighLevelStateHandlerParams> tmp2 = new TreeMap<>(c);
+                       tmp2.putAll(hlshP.subcomponentHighLevelStates);
+                       hlshP.subcomponentHighLevelStates = tmp2;
+                       newComponentJSON.highLevelStateHandlerParams = JsonHandler.toJsonTree(hlshP);
+               }
         }
  
         private static int compareStringsWithIntegers(String a, String b)
@@ -305,42 +384,39 @@ public class ReserializeAndVerifyJSONs
                         }
                         if (bLoc == b.length())
                                 return 1;
-                       int aInt = 0;
-                       int aIntLen = 0;
-                       char nextCharA;
+                       int aInt = 1, bInt = 1;// 1 so a longer number is always greater (makes a difference for leading zeroes)
+                       boolean aHasNumber = false, bHasNumber = false;
+                       char nextCharA, nextCharB;
                         for (;;)
                         {
                                 nextCharA = a.charAt(aLoc++);
                                 if (nextCharA < '0' || nextCharA > '9')
                                         break;
-                               aIntLen++;
+                               aHasNumber = true;
                                 aInt = aInt * 10 + nextCharA - '0';
                                 if (aLoc == a.length())
                                         break;
                         }
-                       int bInt = 0;
-                       int bIntLen = 0;
-                       char nextCharB;
                         for (;;)
                         {
                                 nextCharB = b.charAt(bLoc++);
                                 if (nextCharB < '0' || nextCharB > '9')
                                         break;
-                               bIntLen++;
+                               bHasNumber = true;
                                 bInt = bInt * 10 + nextCharB - '0';
                                 if (bLoc == b.length())
                                         break;
                         }
-                       if (aIntLen != 0)
+                       if (aHasNumber)
                         {
-                               if (bIntLen == 0)
+                               if (!bHasNumber)
                                         return -1;
                                 int comp = Integer.compare(aInt, bInt);
                                 if (comp != 0)
                                         return comp;
                         } else
                         {
-                               if (bIntLen != 0)
+                               if (bHasNumber)
                                         return 1;
                                 int comp = Character.compare(nextCharA, nextCharB);
                                 if (comp != 0)
diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json

index 06aa591..811bcad 100644 (file)
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
@@ -76,38 +76,38 @@
      },
      {
        "location": {
-        "x": -87.66482568016058,
-        "y": 58.834004835619645
+        "x": -85.0,
+        "y": 100.0
        },
-      "name": "I_10",
-      "logicWidth": 1,
+      "name": "I_5_0",
+      "logicWidth": 6,
        "usage": "INPUT"
      },
      {
        "location": {
-        "x": -80.0,
-        "y": 40.0
+        "x": -84.26853373181032,
+        "y": 78.72500503091884
        },
-      "name": "I_11_12",
-      "logicWidth": 2,
+      "name": "I_6_9",
+      "logicWidth": 4,
        "usage": "INPUT"
      },
      {
        "location": {
-        "x": -85.0,
-        "y": 100.0
+        "x": -87.66482568016058,
+        "y": 58.834004835619645
        },
-      "name": "I_5_0",
-      "logicWidth": 6,
+      "name": "I_10",
+      "logicWidth": 1,
        "usage": "INPUT"
      },
      {
        "location": {
-        "x": -84.26853373181032,
-        "y": 78.72500503091884
+        "x": -80.0,
+        "y": 40.0
        },
-      "name": "I_6_9",
-      "logicWidth": 4,
+      "name": "I_11_12",
+      "logicWidth": 2,
        "usage": "INPUT"
      },
      {
@@ -277,7 +277,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Merger#0",
+        "name": "Splitter#0",
          "pos": {
            "x": -30.0,
            "y": 70.0
@@ -289,7 +289,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#0",
+        "name": "Splitter#1",
          "pos": {
            "x": -45.0,
            "y": 140.0
@@ -301,7 +301,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#1",
+        "name": "Splitter#2",
          "pos": {
            "x": -45.0,
            "y": 100.0
@@ -313,7 +313,7 @@
        },
        {
          "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#3",
          "pos": {
            "x": -45.0,
            "y": 70.0
@@ -349,6 +349,102 @@
          "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IC"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IC"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "IN"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IOVR"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEM"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_CEM"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEmu"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EC"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EOVR"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EOVR"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -367,7 +463,7 @@
            "pinName": "I_5_0"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "I"
          },
          "name": "unnamedWire#11",
@@ -375,11 +471,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O0"
          },
          "name": "unnamedWire#12",
@@ -387,11 +483,11 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O1"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O1"
          },
          "name": "unnamedWire#13",
@@ -399,11 +495,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O2"
          },
          "name": "unnamedWire#14",
@@ -411,11 +507,11 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O3"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O3"
          },
          "name": "unnamedWire#15",
@@ -423,11 +519,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O4"
          },
          "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O4"
          },
          "name": "unnamedWire#16",
@@ -435,11 +531,11 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
            "pinName": "O5"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O5"
          },
          "name": "unnamedWire#17",
@@ -447,11 +543,11 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O6"
          },
          "name": "unnamedWire#18",
@@ -459,11 +555,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O7"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O1"
          },
          "name": "unnamedWire#19",
@@ -471,23 +567,11 @@
        },
        {
          "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IC"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IC"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O2"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O8"
          },
          "name": "unnamedWire#20",
@@ -495,11 +579,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O9"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "O3"
          },
          "name": "unnamedWire#21",
@@ -507,11 +591,11 @@
        },
        {
          "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
            "pinName": "O0"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O11"
          },
          "name": "unnamedWire#22",
@@ -519,11 +603,11 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O12"
          },
          "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
            "pinName": "O1"
          },
          "name": "unnamedWire#23",
@@ -535,7 +619,7 @@
            "pinName": "I_6_9"
          },
          "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
            "pinName": "I"
          },
          "name": "unnamedWire#24",
@@ -543,7 +627,7 @@
        },
        {
          "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "I"
          },
          "pin2": {
@@ -559,7 +643,7 @@
            "pinName": "I_10"
          },
          "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
            "pinName": "O10"
          },
          "name": "unnamedWire#26",
@@ -571,7 +655,7 @@
            "pinName": "I_11_12"
          },
          "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
            "pinName": "I"
          },
          "name": "unnamedWire#27",
@@ -601,18 +685,6 @@
          "name": "unnamedWire#29",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -733,18 +805,6 @@
          "name": "unnamedWire#39",
          "path": []
        },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IOVR"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IOVR"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
        {
          "pin1": {
            "compName": "_submodelinterface",
@@ -768,66 +828,6 @@
          },
          "name": "unnamedWire#41",
          "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEM"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEM"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_CEmu"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEmu"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EC"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EN"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EOVR"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EOVR"
-        },
-        "name": "unnamedWire#9",
-        "path": []
        }
      ],
      "version": "0.1.1"
author	Daniel Kirschten <daniel.kirschten@gmx.de>
	Tue, 17 Sep 2019 12:25:03 +0000 (14:25 +0200)
committer	Daniel Kirschten <daniel.kirschten@gmx.de>
	Tue, 17 Sep 2019 12:25:15 +0000 (14:25 +0200)
plugins/net.mograsim.logic.model.am2900/Am2904Testbench.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json		patch \| blob \| history
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java		patch \| blob \| history
tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json		patch \| blob \| history