Replaced mux1_4_sb with mux1_4 in Am2901

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 9d21e80..2cf5fb1 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
@@ -190,18 +190,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#1",
-        "pos": {
-          "x": 735.0,
-          "y": 1235.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "UP"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#2",
         "pos": {
           "x": 670.0,
           "y": 135.0
@@ -213,7 +201,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#3",
+        "name": "Splitter#2",
         "pos": {
           "x": 365.0,
           "y": 535.0
@@ -225,7 +213,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#3",
         "pos": {
           "x": 840.0,
           "y": 790.0
@@ -237,7 +225,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#5",
+        "name": "Splitter#4",
         "pos": {
           "x": 360.0,
           "y": 450.0
@@ -249,19 +237,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#6",
-        "pos": {
-          "x": 485.0,
-          "y": 405.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#5",
         "pos": {
           "x": 110.0,
           "y": 765.0
@@ -273,7 +249,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#6",
         "pos": {
           "x": 110.0,
           "y": 800.0
@@ -285,7 +261,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#7",
         "pos": {
           "x": 110.0,
           "y": 835.0
@@ -297,7 +273,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#8",
         "pos": {
           "x": 135.0,
           "y": 1000.0
@@ -309,19 +285,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
-        "pos": {
-          "x": 485.0,
-          "y": 365.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#9",
         "pos": {
           "x": 695.0,
           "y": 215.0
@@ -333,7 +297,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#10",
         "pos": {
           "x": 640.0,
           "y": 215.0
@@ -345,9 +309,9 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#11",
         "pos": {
-          "x": 335.0,
+          "x": 330.0,
           "y": 930.0
         },
         "params": {
@@ -357,7 +321,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#12",
         "pos": {
           "x": 240.0,
           "y": 930.0
@@ -369,7 +333,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#13",
         "pos": {
           "x": 135.0,
           "y": 965.0
@@ -381,7 +345,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#14",
         "pos": {
           "x": 135.0,
           "y": 1035.0
@@ -393,7 +357,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#15",
         "pos": {
           "x": 840.0,
           "y": 760.0
@@ -405,7 +369,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#16",
         "pos": {
           "x": 695.0,
           "y": 175.0
@@ -420,7 +384,7 @@
         "name": "TriStateBuffer#0",
         "pos": {
           "x": 355.0,
-          "y": 920.0
+          "y": 950.0
         },
         "params": {
           "logicWidth": 1,
@@ -444,7 +408,7 @@
         "name": "TriStateBuffer#2",
         "pos": {
           "x": 400.0,
-          "y": 950.0
+          "y": 920.0
         },
         "params": {
           "logicWidth": 1,
@@ -730,11 +694,11 @@
         }
       },
       {
-        "id": "mux1_4_sb",
-        "name": "mux1_4_sb#0",
+        "id": "mux1_4",
+        "name": "mux1_4#0",
         "pos": {
-          "x": 500.0,
-          "y": 350.0
+          "x": 490.0,
+          "y": 360.0
         }
       },
       {
@@ -773,7 +737,7 @@
     "wires": [
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "pin2": {
@@ -785,7 +749,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O5"
         },
         "pin2": {
@@ -797,7 +761,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O4"
         },
         "pin2": {
@@ -809,7 +773,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O3"
         },
         "pin2": {
@@ -825,7 +789,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O2"
         },
         "name": "unnamedWire#4",
@@ -833,7 +797,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
         "pin2": {
@@ -849,7 +813,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "name": "unnamedWire#6",
@@ -869,34 +833,18 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "_submodelinterface",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y2"
+          "compName": "mux1_4#0",
+          "pinName": "Y"
         },
         "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
+            "x": 750.0,
+            "y": 380.0
           }
         ]
       },
@@ -1015,7 +963,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
         "name": "unnamedWire#15",
@@ -1227,7 +1175,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "I"
         },
         "pin2": {
@@ -1239,7 +1187,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "pin2": {
@@ -1251,7 +1199,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
@@ -1293,7 +1241,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "name": "unnamedWire#31",
@@ -1326,7 +1274,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O3"
         },
         "pin2": {
@@ -1342,7 +1290,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O0"
         },
         "name": "unnamedWire#34",
@@ -1359,7 +1307,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#16",
           "pinName": "O3"
         },
         "pin2": {
@@ -1371,7 +1319,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#16",
           "pinName": "O2"
         },
         "pin2": {
@@ -1383,7 +1331,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#16",
           "pinName": "O1"
         },
         "pin2": {
@@ -1399,7 +1347,7 @@
           "pinName": "QA1"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#16",
           "pinName": "O0"
         },
         "name": "unnamedWire#38",
@@ -1411,7 +1359,7 @@
           "pinName": "QB4"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O3"
         },
         "name": "unnamedWire#39",
@@ -1419,7 +1367,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O2"
         },
         "pin2": {
@@ -1435,7 +1383,7 @@
           "pinName": "QB2"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O1"
         },
         "name": "unnamedWire#41",
@@ -1443,7 +1391,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "pin2": {
@@ -1484,7 +1432,7 @@
           "pinName": "A0"
         },
         "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "O0"
         },
         "name": "unnamedWire#44",
@@ -1501,7 +1449,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "O1"
         },
         "pin2": {
@@ -1522,7 +1470,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "O2"
         },
         "pin2": {
@@ -1543,7 +1491,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "O3"
         },
         "pin2": {
@@ -1564,7 +1512,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
         "pin2": {
@@ -1605,51 +1553,53 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O3"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "YF"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_4"
+          "compName": "mux1_4#0",
+          "pinName": "S0"
         },
         "name": "unnamedWire#50",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 195.0
+          },
+          {
+            "x": 435.0,
+            "y": 365.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_3"
+          "compName": "mux1_4#0",
+          "pinName": "I0"
         },
         "name": "unnamedWire#51",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_2"
+          "compName": "mux1_4#0",
+          "pinName": "I1"
         },
         "name": "unnamedWire#52",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_1"
-        },
-        "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#53",
-        "path": []
+        "path": [
+          {
+            "x": 355.0,
+            "y": 410.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1660,7 +1610,7 @@
           "compName": "dlatch4#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#53",
         "path": [
           {
             "x": 340.0,
@@ -1678,62 +1628,62 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#54",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#55",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#56",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q4"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#57",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q3"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#58",
         "path": []
       },
       {
@@ -1742,34 +1692,34 @@
           "pinName": "Q2"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#59",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q1"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#60",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#61",
         "path": []
       },
       {
@@ -1778,22 +1728,22 @@
           "pinName": "B4"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#62",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B3"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#63",
         "path": []
       },
       {
@@ -1805,7 +1755,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#64",
         "path": [
           {
             "x": 80.0,
@@ -1819,26 +1769,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C2"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#65",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C1"
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
@@ -1847,10 +1797,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#67",
         "path": []
       },
       {
@@ -1862,7 +1812,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#68",
         "path": [
           {
             "x": 130.0,
@@ -1883,7 +1833,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#69",
         "path": [
           {
             "x": 325.0,
@@ -1893,14 +1843,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O8"
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#70",
         "path": []
       },
       {
@@ -1912,7 +1862,7 @@
           "compName": "WireCrossPoint#19",
           "pinName": ""
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#71",
         "path": [
           {
             "x": 75.0,
@@ -1926,14 +1876,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#72",
         "path": [
           {
             "x": 130.0,
@@ -1950,7 +1900,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#73",
         "path": []
       },
       {
@@ -1959,46 +1909,46 @@
           "pinName": "B2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#74",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B1"
         },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#75",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A2"
         },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#76",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C3"
         },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#77",
         "path": []
       },
       {
@@ -2010,7 +1960,7 @@
           "compName": "_submodelinterface",
           "pinName": "D"
         },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#78",
         "path": [
           {
             "x": 505.0,
@@ -2035,7 +1985,7 @@
           "compName": "dff4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#79",
         "path": []
       },
       {
@@ -2047,7 +1997,7 @@
           "compName": "dff4#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#80",
         "path": []
       },
       {
@@ -2059,7 +2009,7 @@
           "compName": "dff4#0",
           "pinName": "D3"
         },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#81",
         "path": []
       },
       {
@@ -2071,7 +2021,7 @@
           "compName": "dff4#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#82",
         "path": []
       },
       {
@@ -2083,7 +2033,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cn+4"
         },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#83",
         "path": [
           {
             "x": 615.0,
@@ -2104,7 +2054,7 @@
           "compName": "_submodelinterface",
           "pinName": "OVR"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#84",
         "path": [
           {
             "x": 610.0,
@@ -2133,7 +2083,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#85",
         "path": [
           {
             "x": 365.0,
@@ -2143,14 +2093,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#86",
         "path": []
       },
       {
@@ -2162,7 +2112,7 @@
           "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#87",
         "path": []
       },
       {
@@ -2174,7 +2124,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#88",
         "path": []
       },
       {
@@ -2186,7 +2136,7 @@
           "compName": "sel3_4#0",
           "pinName": "C4"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#89",
         "path": [
           {
             "x": 435.0,
@@ -2219,7 +2169,7 @@
           "compName": "_submodelinterface",
           "pinName": "RAMn+3"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#90",
         "path": [
           {
             "x": 455.0,
@@ -2233,86 +2183,38 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#91",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#92",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A4"
         },
-        "name": "unnamedWire#94",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_1"
-        },
-        "name": "unnamedWire#95",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#96",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_3"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#93",
         "path": []
       },
       {
@@ -2321,29 +2223,12 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "I"
         },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#94",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#100",
-        "path": [
-          {
-            "x": 355.0,
-            "y": 420.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#10",
@@ -2353,7 +2238,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
@@ -2365,7 +2250,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#96",
         "path": [
           {
             "x": 380.0,
@@ -2382,7 +2267,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#97",
         "path": [
           {
             "x": 105.0,
@@ -2396,10 +2281,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -2408,70 +2293,70 @@
           "pinName": "A4"
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#100",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#102",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#103",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#104",
         "path": []
       },
       {
@@ -2483,7 +2368,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#105",
         "path": [
           {
             "x": 100.0,
@@ -2493,26 +2378,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B4"
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#107",
         "path": []
       },
       {
@@ -2524,43 +2409,43 @@
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#108",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C3"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#109",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C2"
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#110",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C1"
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#111",
         "path": []
       },
       {
@@ -2572,7 +2457,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#112",
         "path": []
       },
       {
@@ -2581,46 +2466,46 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#113",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A3"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#114",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A4"
         },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#115",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#116",
         "path": [
           {
             "x": 105.0,
@@ -2637,7 +2522,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "F"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#117",
         "path": [
           {
             "x": 610.0,
@@ -2651,26 +2536,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "Splitter#11",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#124",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#118",
         "path": []
       },
       {
@@ -2682,7 +2555,7 @@
           "compName": "ram4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#119",
         "path": [
           {
             "x": 195.0,
@@ -2703,7 +2576,7 @@
           "compName": "ram4#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#120",
         "path": [
           {
             "x": 200.0,
@@ -2724,7 +2597,7 @@
           "compName": "ram4#0",
           "pinName": "D3"
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#121",
         "path": [
           {
             "x": 205.0,
@@ -2745,7 +2618,7 @@
           "compName": "ram4#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#122",
         "path": [
           {
             "x": 210.0,
@@ -2766,7 +2639,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#123",
         "path": []
       },
       {
@@ -2778,7 +2651,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#131"
+        "name": "unnamedWire#124"
       },
       {
         "pin1": {
@@ -2789,7 +2662,7 @@
           "compName": "ram4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#125",
         "path": [
           {
             "x": 630.0,
@@ -2810,7 +2683,7 @@
           "compName": "dff4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 450.0,
@@ -2832,82 +2705,16 @@
       },
       {
         "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "YF"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#134",
-        "path": [
-          {
-            "x": 435.0,
-            "y": 195.0
-          },
-          {
-            "x": 435.0,
-            "y": 355.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "TriStateBuffer#2",
           "pinName": "IN"
         },
-        "name": "unnamedWire#135",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#127",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#137",
-        "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
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "or4#0",
@@ -2917,7 +2724,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#128",
         "path": []
       },
       {
@@ -2929,7 +2736,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#129",
         "path": [
           {
             "x": 415.0,
@@ -2946,7 +2753,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#130",
         "path": [
           {
             "x": 415.0,
@@ -2963,7 +2770,7 @@
           "compName": "_submodelinterface",
           "pinName": "F\u003d0"
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#131",
         "path": [
           {
             "x": 445.0,
@@ -2983,39 +2790,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#142",
-        "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": "WireCrossPoint#18",
@@ -3025,7 +2799,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#132",
         "path": [
           {
             "x": 100.0,
@@ -3037,7 +2811,7 @@
           },
           {
             "x": 380.0,
-            "y": 930.0
+            "y": 960.0
           }
         ]
       },
@@ -3047,10 +2821,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#133",
         "path": []
       },
       {
@@ -3062,7 +2836,7 @@
           "compName": "sel3_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#134",
         "path": [
           {
             "x": 100.0,
@@ -3079,7 +2853,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#135",
         "path": [
           {
             "x": 100.0,
@@ -3091,31 +2865,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#147",
-        "path": [
-          {
-            "x": 550.0,
-            "y": 385.0
-          },
-          {
-            "x": 550.0,
-            "y": 525.0
-          },
-          {
-            "x": 735.0,
-            "y": 525.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#20",
@@ -3125,7 +2874,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#136",
         "path": []
       },
       {
@@ -3137,7 +2886,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#137",
         "path": [
           {
             "x": 395.0,
@@ -3158,7 +2907,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "EN"
         },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#138",
         "path": []
       },
       {
@@ -3170,7 +2919,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#139",
         "path": []
       },
       {
@@ -3182,7 +2931,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#140",
         "path": []
       },
       {
@@ -3194,7 +2943,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#141",
         "path": []
       },
       {
@@ -3206,7 +2955,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#142",
         "path": []
       },
       {
@@ -3218,7 +2967,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#143",
         "path": [
           {
             "x": 145.0,
@@ -3239,11 +2988,11 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#144",
         "path": [
           {
             "x": 425.0,
-            "y": 960.0
+            "y": 930.0
           }
         ]
       },
@@ -3256,7 +3005,7 @@
           "compName": "_submodelinterface",
           "pinName": "Qn+3"
         },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#145",
         "path": [
           {
             "x": 425.0,
@@ -3266,26 +3015,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#146",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901DestDecode#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#147",
         "path": [
           {
             "x": 835.0,
@@ -3307,14 +3056,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#16",
           "pinName": "I"
         },
         "pin2": {
           "compName": "dlatch4#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#148",
         "path": []
       }
     ],