Replaced mux1_4_sb with mux1_4 in Am2904

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 7df1a29..868bbba 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
@@ -374,8 +374,8 @@
         "id": "NandGate",
         "name": "NandGate#10",
         "pos": {
-          "x": 455.0,
-          "y": 55.0
+          "x": 460.0,
+          "y": 10.0
         },
         "params": 1
       },
@@ -383,7 +383,7 @@
         "id": "NandGate",
         "name": "NandGate#11",
         "pos": {
-          "x": 555.0,
+          "x": 560.0,
           "y": 235.0
         },
         "params": 1
@@ -405,7 +405,7 @@
         "name": "Splitter#1",
         "pos": {
           "x": 575.0,
-          "y": 40.0
+          "y": 35.0
         },
         "params": {
           "logicWidth": 4,
@@ -417,7 +417,7 @@
         "name": "Splitter#2",
         "pos": {
           "x": 440.0,
-          "y": 90.0
+          "y": 120.0
         },
         "params": {
           "logicWidth": 2,
@@ -427,42 +427,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#3",
-        "pos": {
-          "x": 465.0,
-          "y": 100.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#4",
-        "pos": {
-          "x": 425.0,
-          "y": 150.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#5",
-        "pos": {
-          "x": 425.0,
-          "y": 190.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#6",
         "pos": {
           "x": 320.0,
           "y": 310.0
@@ -474,7 +438,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#4",
         "pos": {
           "x": 445.0,
           "y": 340.0
@@ -486,7 +450,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#5",
         "pos": {
           "x": 445.0,
           "y": 380.0
@@ -498,7 +462,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#6",
         "pos": {
           "x": 255.0,
           "y": 430.0
@@ -510,7 +474,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#7",
         "pos": {
           "x": 445.0,
           "y": 300.0
@@ -522,7 +486,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#8",
         "pos": {
           "x": 455.0,
           "y": 635.0
@@ -534,7 +498,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#9",
         "pos": {
           "x": 455.0,
           "y": 710.0
@@ -546,7 +510,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#10",
         "pos": {
           "x": 135.0,
           "y": 645.0
@@ -558,7 +522,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#11",
         "pos": {
           "x": 310.0,
           "y": 645.0
@@ -570,7 +534,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#12",
         "pos": {
           "x": 430.0,
           "y": 535.0
@@ -582,7 +546,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#13",
         "pos": {
           "x": 20.0,
           "y": 235.0
@@ -594,7 +558,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#14",
         "pos": {
           "x": 20.0,
           "y": 185.0
@@ -606,7 +570,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#15",
         "pos": {
           "x": 15.0,
           "y": 65.0
@@ -618,19 +582,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
-        "pos": {
-          "x": 520.0,
-          "y": 90.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#16",
         "pos": {
           "x": 20.0,
           "y": 165.0
@@ -645,7 +597,7 @@
         "name": "TriStateBuffer#0",
         "pos": {
           "x": 540.0,
-          "y": 70.0
+          "y": 25.0
         },
         "params": {
           "logicWidth": 4,
@@ -744,7 +696,7 @@
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 404.0,
-          "y": 114.0
+          "y": 134.0
         },
         "params": 4
       },
@@ -762,7 +714,7 @@
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 569.0,
-          "y": 54.0
+          "y": 49.0
         },
         "params": 4
       },
@@ -834,7 +786,7 @@
         "name": "WireCrossPoint#13",
         "pos": {
           "x": 449.0,
-          "y": 59.0
+          "y": 14.0
         },
         "params": 1
       },
@@ -842,8 +794,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 534.0,
-          "y": 104.0
+          "x": 544.0,
+          "y": 134.0
         },
         "params": 4
       },
@@ -995,7 +947,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#31",
         "pos": {
-          "x": 549.0,
+          "x": 554.0,
           "y": 239.0
         },
         "params": 1
@@ -1014,7 +966,7 @@
         "name": "WireCrossPoint#33",
         "pos": {
           "x": 389.0,
-          "y": 204.0
+          "y": 194.0
         },
         "params": 4
       },
@@ -1094,8 +1046,8 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 495.0,
-          "y": 60.0
+          "x": 505.0,
+          "y": 15.0
         }
       },
       {
@@ -1139,19 +1091,19 @@
         }
       },
       {
-        "id": "mux1_4_sb",
-        "name": "mux1_4_sb#0",
+        "id": "mux1_4",
+        "name": "mux1_4#0",
         "pos": {
-          "x": 480.0,
-          "y": 85.0
+          "x": 490.0,
+          "y": 115.0
         }
       },
       {
-        "id": "mux1_4_sb",
-        "name": "mux1_4_sb#1",
+        "id": "mux1_4",
+        "name": "mux1_4#1",
         "pos": {
-          "x": 440.0,
-          "y": 135.0
+          "x": 435.0,
+          "y": 145.0
         }
       },
       {
@@ -1316,7 +1268,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "name": "unnamedWire#4",
@@ -1324,7 +1276,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "pin2": {
@@ -1340,7 +1292,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
         "name": "unnamedWire#6",
@@ -1348,7 +1300,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
         "pin2": {
@@ -1364,7 +1316,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O4"
         },
         "name": "unnamedWire#8",
@@ -1372,7 +1324,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O5"
         },
         "pin2": {
@@ -1388,7 +1340,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "name": "unnamedWire#10",
@@ -1396,7 +1348,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O1"
         },
         "pin2": {
@@ -1412,7 +1364,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O2"
         },
         "name": "unnamedWire#12",
@@ -1420,7 +1372,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O3"
         },
         "pin2": {
@@ -1436,7 +1388,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "O4"
         },
         "name": "unnamedWire#14",
@@ -1444,7 +1396,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "pin2": {
@@ -1469,7 +1421,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
         "name": "unnamedWire#16",
@@ -1490,7 +1442,7 @@
           "pinName": "IOVR"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "name": "unnamedWire#17",
@@ -1511,7 +1463,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
         "name": "unnamedWire#18",
@@ -1528,7 +1480,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O2"
         },
         "pin2": {
@@ -1544,7 +1496,7 @@
           "pinName": "IZ"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "O3"
         },
         "name": "unnamedWire#20",
@@ -1582,7 +1534,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "pin2": {
@@ -1657,8 +1609,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "mux1_4#1",
+          "pinName": "I0"
         },
         "name": "unnamedWire#26",
         "path": []
@@ -1686,8 +1638,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "I"
+          "compName": "mux1_4#1",
+          "pinName": "I1"
         },
         "name": "unnamedWire#28",
         "path": []
@@ -2032,11 +1984,11 @@
         "name": "unnamedWire#49",
         "path": [
           {
-            "x": 595.0,
-            "y": 40.0
+            "x": 590.0,
+            "y": 35.0
           },
           {
-            "x": 595.0,
+            "x": 590.0,
             "y": 25.0
           }
         ]
@@ -2051,7 +2003,16 @@
           "pinName": "O2"
         },
         "name": "unnamedWire#50",
-        "path": []
+        "path": [
+          {
+            "x": 590.0,
+            "y": 50.0
+          },
+          {
+            "x": 590.0,
+            "y": 45.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2066,7 +2027,7 @@
         "path": [
           {
             "x": 595.0,
-            "y": 60.0
+            "y": 55.0
           },
           {
             "x": 595.0,
@@ -2091,7 +2052,7 @@
           },
           {
             "x": 590.0,
-            "y": 70.0
+            "y": 65.0
           }
         ]
       },
@@ -2118,10 +2079,6 @@
         },
         "name": "unnamedWire#54",
         "path": [
-          {
-            "x": 570.0,
-            "y": 50.0
-          },
           {
             "x": 415.0,
             "y": 50.0
@@ -2541,7 +2498,7 @@
         "path": [
           {
             "x": 570.0,
-            "y": 80.0
+            "y": 35.0
           }
         ]
       },
@@ -2570,7 +2527,7 @@
         "path": [
           {
             "x": 450.0,
-            "y": 70.0
+            "y": 25.0
           }
         ]
       },
@@ -2611,118 +2568,87 @@
         "path": [
           {
             "x": 550.0,
-            "y": 65.0
+            "y": 20.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "Y1"
+          "compName": "Splitter#2",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_1"
+          "compName": "mux1_4#1",
+          "pinName": "S0"
         },
         "name": "unnamedWire#85",
-        "path": []
+        "path": [
+          {
+            "x": 455.0,
+            "y": 130.0
+          },
+          {
+            "x": 455.0,
+            "y": 140.0
+          },
+          {
+            "x": 430.0,
+            "y": 140.0
+          },
+          {
+            "x": 430.0,
+            "y": 150.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_2"
+          "compName": "Splitter#2",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "Y2"
+          "compName": "mux1_4#0",
+          "pinName": "S0"
         },
         "name": "unnamedWire#86",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "Y3"
+          "compName": "mux1_4#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_3"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
         },
         "name": "unnamedWire#87",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I1_4"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "Y4"
+          "compName": "mux1_4#0",
+          "pinName": "I0"
         },
         "name": "unnamedWire#88",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O0"
+          "compName": "mux1_4#1",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y4"
+          "compName": "mux1_4#0",
+          "pinName": "I1"
         },
         "name": "unnamedWire#89",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#90",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#91",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#92",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#93",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "Am2904RegCTInstrDecode#0",
@@ -2732,7 +2658,7 @@
           "compName": "Splitter#2",
           "pinName": "I"
         },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#90",
         "path": [
           {
             "x": 190.0,
@@ -2752,234 +2678,37 @@
           },
           {
             "x": 420.0,
-            "y": 95.0
+            "y": 125.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#91",
         "path": [
           {
-            "x": 455.0,
-            "y": 100.0
-          },
-          {
-            "x": 455.0,
-            "y": 130.0
-          },
-          {
-            "x": 435.0,
-            "y": 130.0
-          },
-          {
-            "x": 435.0,
-            "y": 140.0
+            "x": 330.0,
+            "y": 165.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
         },
-        "name": "unnamedWire#96",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_1"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_2"
-        },
-        "name": "unnamedWire#98",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_3"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#99",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#0",
-          "pinName": "I0_4"
-        },
-        "name": "unnamedWire#100",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#101",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I0_1"
-        },
-        "name": "unnamedWire#102",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I0_2"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#103",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I0_3"
-        },
-        "name": "unnamedWire#104",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I0_4"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#105",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#106",
-        "path": [
-          {
-            "x": 330.0,
-            "y": 165.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#107",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I1_3"
-        },
-        "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#108",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#109",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4_sb#1",
-          "pinName": "I1_1"
-        },
-        "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#110",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
-        },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#92",
         "path": [
           {
             "x": 435.0,
@@ -3004,11 +2733,19 @@
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#93",
         "path": [
+          {
+            "x": 545.0,
+            "y": 55.0
+          },
           {
             "x": 535.0,
-            "y": 80.0
+            "y": 55.0
+          },
+          {
+            "x": 535.0,
+            "y": 35.0
           }
         ]
       },
@@ -3021,10 +2758,10 @@
           "compName": "Am2904TestLogic#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#94",
         "path": [
           {
-            "x": 535.0,
+            "x": 545.0,
             "y": 260.0
           },
           {
@@ -3054,7 +2791,7 @@
           "compName": "mux3#0",
           "pinName": "I111"
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
@@ -3066,7 +2803,7 @@
           "compName": "Am2904TestLogic#0",
           "pinName": "Y110"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#96",
         "path": []
       },
       {
@@ -3078,7 +2815,7 @@
           "compName": "mux3#0",
           "pinName": "I101"
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#97",
         "path": []
       },
       {
@@ -3090,7 +2827,7 @@
           "compName": "Am2904TestLogic#0",
           "pinName": "Y100"
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -3102,7 +2839,7 @@
           "compName": "mux3#0",
           "pinName": "I011"
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
@@ -3114,7 +2851,7 @@
           "compName": "mux3#0",
           "pinName": "I010"
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#100",
         "path": []
       },
       {
@@ -3126,7 +2863,7 @@
           "compName": "Am2904TestLogic#0",
           "pinName": "Y001"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
@@ -3138,7 +2875,7 @@
           "compName": "mux3#0",
           "pinName": "I000"
         },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#102",
         "path": []
       },
       {
@@ -3150,7 +2887,7 @@
           "compName": "TriStateBuffer#5",
           "pinName": "EN"
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#103",
         "path": [
           {
             "x": 585.0,
@@ -3167,19 +2904,19 @@
           "compName": "xor#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#104",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904RegCTInstrDecode#0",
           "pinName": "CT_MUX"
         },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#105",
         "path": [
           {
             "x": 210.0,
@@ -3189,14 +2926,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux3#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
@@ -3205,22 +2942,22 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#107",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#3",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux3#0",
           "pinName": "S2"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#108",
         "path": []
       },
       {
@@ -3232,7 +2969,7 @@
           "compName": "mux1#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#109",
         "path": [
           {
             "x": 230.0,
@@ -3249,7 +2986,7 @@
           "compName": "mux1#0",
           "pinName": "I0"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#110",
         "path": [
           {
             "x": 420.0,
@@ -3270,7 +3007,7 @@
           "compName": "Am2904RegCTInstrDecode#0",
           "pinName": "CT_INV"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#111",
         "path": [
           {
             "x": 415.0,
@@ -3295,7 +3032,7 @@
           "compName": "mux1#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#112",
         "path": [
           {
             "x": 515.0,
@@ -3324,7 +3061,7 @@
           "compName": "Am2904muSR#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#113",
         "path": [
           {
             "x": 335.0,
@@ -3341,7 +3078,7 @@
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#114",
         "path": [
           {
             "x": 390.0,
@@ -3351,26 +3088,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#4",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "WireCrossPoint#28",
           "pinName": ""
         },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#115",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "WireCrossPoint#27",
           "pinName": ""
         },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#116",
         "path": []
       },
       {
@@ -3382,7 +3119,7 @@
           "compName": "WireCrossPoint#32",
           "pinName": ""
         },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#117",
         "path": []
       },
       {
@@ -3391,10 +3128,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#118",
         "path": [
           {
             "x": 385.0,
@@ -3419,7 +3156,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#119",
         "path": [
           {
             "x": 240.0,
@@ -3439,7 +3176,7 @@
           },
           {
             "x": 485.0,
-            "y": 75.0
+            "y": 30.0
           }
         ]
       },
@@ -3449,34 +3186,34 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#16",
           "pinName": "O0"
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#120",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#16",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O12"
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#121",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#16",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904RegCTInstrDecode#0",
           "pinName": "I12-11"
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#122",
         "path": [
           {
             "x": 105.0,
@@ -3494,10 +3231,10 @@
           "pinName": "C0_MUX"
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#123",
         "path": [
           {
             "x": 250.0,
@@ -3514,7 +3251,7 @@
           "compName": "WireCrossPoint#22",
           "pinName": ""
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#124",
         "path": [
           {
             "x": 270.0,
@@ -3535,7 +3272,7 @@
           "compName": "Am2904MSR#0",
           "pinName": "mu"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#125",
         "path": [
           {
             "x": 185.0,
@@ -3553,10 +3290,10 @@
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 265.0,
@@ -3586,14 +3323,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux1#1",
           "pinName": "S0"
         },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#127",
         "path": [
           {
             "x": 270.0,
@@ -3614,7 +3351,7 @@
           "compName": "xor#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#128",
         "path": []
       },
       {
@@ -3623,10 +3360,10 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#129",
         "path": [
           {
             "x": 290.0,
@@ -3640,14 +3377,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#130",
         "path": []
       },
       {
@@ -3659,7 +3396,7 @@
           "compName": "mux1#2",
           "pinName": "S0"
         },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#131",
         "path": [
           {
             "x": 350.0,
@@ -3676,7 +3413,7 @@
           "compName": "mux1#2",
           "pinName": "I1"
         },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#132",
         "path": []
       },
       {
@@ -3688,7 +3425,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cx"
         },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#133",
         "path": [
           {
             "x": 300.0,
@@ -3717,7 +3454,7 @@
           "compName": "mux1#3",
           "pinName": "I1"
         },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#134",
         "path": []
       },
       {
@@ -3729,7 +3466,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#135",
         "path": []
       },
       {
@@ -3738,10 +3475,10 @@
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#136",
         "path": []
       },
       {
@@ -3753,7 +3490,7 @@
           "compName": "_submodelinterface",
           "pinName": "C0"
         },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#137",
         "path": [
           {
             "x": 560.0,
@@ -3774,7 +3511,7 @@
           "compName": "WireCrossPoint#36",
           "pinName": ""
         },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#138",
         "path": [
           {
             "x": 485.0,
@@ -3795,7 +3532,7 @@
           "compName": "_submodelinterface",
           "pinName": "SIOn"
         },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#139",
         "path": [
           {
             "x": 55.0,
@@ -3816,7 +3553,7 @@
           "compName": "_submodelinterface",
           "pinName": "SIO0"
         },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#140",
         "path": [
           {
             "x": 580.0,
@@ -3833,7 +3570,7 @@
           "compName": "WireCrossPoint#41",
           "pinName": ""
         },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#141",
         "path": [
           {
             "x": 435.0,
@@ -3850,7 +3587,7 @@
           "compName": "_submodelinterface",
           "pinName": "QIOn"
         },
-        "name": "unnamedWire#161",
+        "name": "unnamedWire#142",
         "path": [
           {
             "x": 435.0,
@@ -3867,7 +3604,7 @@
           "compName": "WireCrossPoint#38",
           "pinName": ""
         },
-        "name": "unnamedWire#162",
+        "name": "unnamedWire#143",
         "path": [
           {
             "x": 580.0,
@@ -3884,7 +3621,7 @@
           "compName": "WireCrossPoint#39",
           "pinName": ""
         },
-        "name": "unnamedWire#163",
+        "name": "unnamedWire#144",
         "path": []
       },
       {
@@ -3896,7 +3633,7 @@
           "compName": "WireCrossPoint#21",
           "pinName": ""
         },
-        "name": "unnamedWire#164",
+        "name": "unnamedWire#145",
         "path": []
       },
       {
@@ -3908,7 +3645,7 @@
           "compName": "mux2#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#146",
         "path": []
       },
       {
@@ -3917,10 +3654,10 @@
           "pinName": "SIO0_MUX"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#147",
         "path": [
           {
             "x": 165.0,
@@ -3942,26 +3679,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux2#0",
           "pinName": "I00"
         },
-        "name": "unnamedWire#167",
+        "name": "unnamedWire#148",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux2#0",
           "pinName": "S1"
         },
-        "name": "unnamedWire#168",
+        "name": "unnamedWire#149",
         "path": []
       },
       {
@@ -3970,10 +3707,10 @@
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
-        "name": "unnamedWire#169",
+        "name": "unnamedWire#150",
         "path": []
       },
       {
@@ -3985,7 +3722,7 @@
           "compName": "WireCrossPoint#36",
           "pinName": ""
         },
-        "name": "unnamedWire#170",
+        "name": "unnamedWire#151",
         "path": []
       },
       {
@@ -3997,19 +3734,19 @@
           "compName": "mux2#0",
           "pinName": "I10"
         },
-        "name": "unnamedWire#171",
+        "name": "unnamedWire#152",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "WireCrossPoint#22",
           "pinName": ""
         },
-        "name": "unnamedWire#172",
+        "name": "unnamedWire#153",
         "path": [
           {
             "x": 485.0,
@@ -4030,19 +3767,19 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#173",
+        "name": "unnamedWire#154",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux2#1",
           "pinName": "S0"
         },
-        "name": "unnamedWire#174",
+        "name": "unnamedWire#155",
         "path": []
       },
       {
@@ -4051,22 +3788,22 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O2"
         },
-        "name": "unnamedWire#175",
+        "name": "unnamedWire#156",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux2#1",
           "pinName": "I00"
         },
-        "name": "unnamedWire#176",
+        "name": "unnamedWire#157",
         "path": []
       },
       {
@@ -4078,7 +3815,7 @@
           "compName": "TriStateBuffer#4",
           "pinName": "IN"
         },
-        "name": "unnamedWire#177",
+        "name": "unnamedWire#158",
         "path": [
           {
             "x": 545.0,
@@ -4092,14 +3829,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904ShiftInstrDecode#0",
           "pinName": "QIO0_MUX"
         },
-        "name": "unnamedWire#178",
+        "name": "unnamedWire#159",
         "path": [
           {
             "x": 445.0,
@@ -4128,7 +3865,7 @@
           "compName": "WireCrossPoint#35",
           "pinName": ""
         },
-        "name": "unnamedWire#179",
+        "name": "unnamedWire#160",
         "path": []
       },
       {
@@ -4140,7 +3877,7 @@
           "compName": "mux2#1",
           "pinName": "I10"
         },
-        "name": "unnamedWire#180",
+        "name": "unnamedWire#161",
         "path": [
           {
             "x": 435.0,
@@ -4157,7 +3894,7 @@
           "compName": "mux2#0",
           "pinName": "I01"
         },
-        "name": "unnamedWire#181",
+        "name": "unnamedWire#162",
         "path": []
       },
       {
@@ -4169,7 +3906,7 @@
           "compName": "mux2#1",
           "pinName": "I11"
         },
-        "name": "unnamedWire#182",
+        "name": "unnamedWire#163",
         "path": [
           {
             "x": 440.0,
@@ -4179,14 +3916,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#183",
+        "name": "unnamedWire#164",
         "path": []
       },
       {
@@ -4198,7 +3935,7 @@
           "compName": "mux3#1",
           "pinName": "S0"
         },
-        "name": "unnamedWire#184",
+        "name": "unnamedWire#165",
         "path": []
       },
       {
@@ -4210,7 +3947,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#185",
+        "name": "unnamedWire#166",
         "path": []
       },
       {
@@ -4222,7 +3959,7 @@
           "compName": "mux3#1",
           "pinName": "I000"
         },
-        "name": "unnamedWire#186",
+        "name": "unnamedWire#167",
         "path": []
       },
       {
@@ -4234,7 +3971,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#187",
+        "name": "unnamedWire#168",
         "path": [
           {
             "x": 150.0,
@@ -4244,14 +3981,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904ShiftInstrDecode#0",
           "pinName": "SIOn_MUX"
         },
-        "name": "unnamedWire#188",
+        "name": "unnamedWire#169",
         "path": [
           {
             "x": 130.0,
@@ -4273,26 +4010,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux3#1",
           "pinName": "S2"
         },
-        "name": "unnamedWire#189",
+        "name": "unnamedWire#170",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux3#1",
           "pinName": "S1"
         },
-        "name": "unnamedWire#190",
+        "name": "unnamedWire#171",
         "path": []
       },
       {
@@ -4304,7 +4041,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#191",
+        "name": "unnamedWire#172",
         "path": [
           {
             "x": 105.0,
@@ -4325,7 +4062,7 @@
           "compName": "mux3#1",
           "pinName": "I011"
         },
-        "name": "unnamedWire#192",
+        "name": "unnamedWire#173",
         "path": [
           {
             "x": 110.0,
@@ -4346,7 +4083,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#193",
+        "name": "unnamedWire#174",
         "path": [
           {
             "x": 115.0,
@@ -4367,7 +4104,7 @@
           "compName": "mux3#1",
           "pinName": "I111"
         },
-        "name": "unnamedWire#194",
+        "name": "unnamedWire#175",
         "path": []
       },
       {
@@ -4379,7 +4116,7 @@
           "compName": "WireCrossPoint#26",
           "pinName": ""
         },
-        "name": "unnamedWire#195",
+        "name": "unnamedWire#176",
         "path": [
           {
             "x": 465.0,
@@ -4401,10 +4138,10 @@
           "pinName": "I110"
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#4",
           "pinName": "O1"
         },
-        "name": "unnamedWire#196",
+        "name": "unnamedWire#177",
         "path": [
           {
             "x": 125.0,
@@ -4441,7 +4178,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#197",
+        "name": "unnamedWire#178",
         "path": [
           {
             "x": 290.0,
@@ -4458,7 +4195,7 @@
           "compName": "WireCrossPoint#21",
           "pinName": ""
         },
-        "name": "unnamedWire#198",
+        "name": "unnamedWire#179",
         "path": [
           {
             "x": 295.0,
@@ -4475,7 +4212,7 @@
           "compName": "mux3#1",
           "pinName": "I101"
         },
-        "name": "unnamedWire#199",
+        "name": "unnamedWire#180",
         "path": [
           {
             "x": 120.0,
@@ -4496,7 +4233,7 @@
           "compName": "xor#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#200",
+        "name": "unnamedWire#181",
         "path": [
           {
             "x": 465.0,
@@ -4513,7 +4250,7 @@
           "compName": "mux2#2",
           "pinName": "I11"
         },
-        "name": "unnamedWire#201",
+        "name": "unnamedWire#182",
         "path": [
           {
             "x": 300.0,
@@ -4530,7 +4267,7 @@
           "compName": "Am2904ShiftInstrDecode#0",
           "pinName": "OEn"
         },
-        "name": "unnamedWire#202",
+        "name": "unnamedWire#183",
         "path": [
           {
             "x": 250.0,
@@ -4547,7 +4284,7 @@
           "compName": "WireCrossPoint#29",
           "pinName": ""
         },
-        "name": "unnamedWire#203",
+        "name": "unnamedWire#184",
         "path": [
           {
             "x": 390.0,
@@ -4572,7 +4309,7 @@
           "compName": "xor#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#204",
+        "name": "unnamedWire#185",
         "path": [
           {
             "x": 460.0,
@@ -4589,7 +4326,7 @@
           "compName": "xor#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#205",
+        "name": "unnamedWire#186",
         "path": [
           {
             "x": 460.0,
@@ -4619,10 +4356,10 @@
           "pinName": "B"
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#4",
           "pinName": "O0"
         },
-        "name": "unnamedWire#206",
+        "name": "unnamedWire#187",
         "path": [
           {
             "x": 95.0,
@@ -4659,43 +4396,43 @@
           "compName": "TriStateBuffer#1",
           "pinName": "IN"
         },
-        "name": "unnamedWire#207",
+        "name": "unnamedWire#188",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux2#2",
           "pinName": "S1"
         },
-        "name": "unnamedWire#208",
+        "name": "unnamedWire#189",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux2#2",
           "pinName": "S0"
         },
-        "name": "unnamedWire#209",
+        "name": "unnamedWire#190",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904ShiftInstrDecode#0",
           "pinName": "QIOn_MUX"
         },
-        "name": "unnamedWire#210",
+        "name": "unnamedWire#191",
         "path": [
           {
             "x": 305.0,
@@ -4709,14 +4446,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#11",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux2#2",
           "pinName": "I00"
         },
-        "name": "unnamedWire#211",
+        "name": "unnamedWire#192",
         "path": []
       },
       {
@@ -4728,7 +4465,7 @@
           "compName": "mux3#1",
           "pinName": "Y"
         },
-        "name": "unnamedWire#212",
+        "name": "unnamedWire#193",
         "path": []
       },
       {
@@ -4740,7 +4477,7 @@
           "compName": "Am2904ShiftInstrDecode#0",
           "pinName": "_SE"
         },
-        "name": "unnamedWire#213",
+        "name": "unnamedWire#194",
         "path": []
       },
       {
@@ -4752,7 +4489,7 @@
           "compName": "WireCrossPoint#29",
           "pinName": ""
         },
-        "name": "unnamedWire#214",
+        "name": "unnamedWire#195",
         "path": []
       },
       {
@@ -4764,7 +4501,7 @@
           "compName": "TriStateBuffer#4",
           "pinName": "EN"
         },
-        "name": "unnamedWire#215",
+        "name": "unnamedWire#196",
         "path": [
           {
             "x": 575.0,
@@ -4789,7 +4526,7 @@
           "compName": "Am2904muSR#0",
           "pinName": "M"
         },
-        "name": "unnamedWire#216",
+        "name": "unnamedWire#197",
         "path": []
       },
       {
@@ -4798,10 +4535,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#217",
+        "name": "unnamedWire#198",
         "path": [
           {
             "x": 405.0,
@@ -4826,7 +4563,7 @@
           "compName": "WireCrossPoint#30",
           "pinName": ""
         },
-        "name": "unnamedWire#218",
+        "name": "unnamedWire#199",
         "path": []
       },
       {
@@ -4838,7 +4575,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#219",
+        "name": "unnamedWire#200",
         "path": [
           {
             "x": 410.0,
@@ -4855,7 +4592,7 @@
           "compName": "WireCrossPoint#34",
           "pinName": ""
         },
-        "name": "unnamedWire#220",
+        "name": "unnamedWire#201",
         "path": [
           {
             "x": 440.0,
@@ -4872,7 +4609,7 @@
           "compName": "mux1#4",
           "pinName": "I0"
         },
-        "name": "unnamedWire#221",
+        "name": "unnamedWire#202",
         "path": []
       },
       {
@@ -4884,7 +4621,7 @@
           "compName": "Am2904MSR#0",
           "pinName": "COVD_V"
         },
-        "name": "unnamedWire#222",
+        "name": "unnamedWire#203",
         "path": [
           {
             "x": 530.0,
@@ -4925,7 +4662,7 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#223",
+        "name": "unnamedWire#204",
         "path": [
           {
             "x": 265.0,
@@ -4942,7 +4679,7 @@
           "compName": "WireCrossPoint#40",
           "pinName": ""
         },
-        "name": "unnamedWire#224",
+        "name": "unnamedWire#205",
         "path": [
           {
             "x": 585.0,
@@ -4956,10 +4693,10 @@
           "pinName": "MC_MUX"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
-        "name": "unnamedWire#225",
+        "name": "unnamedWire#206",
         "path": [
           {
             "x": 410.0,
@@ -4973,26 +4710,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux1#5",
           "pinName": "S0"
         },
-        "name": "unnamedWire#226",
+        "name": "unnamedWire#207",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux1#4",
           "pinName": "S0"
         },
-        "name": "unnamedWire#227",
+        "name": "unnamedWire#208",
         "path": []
       },
       {
@@ -5004,7 +4741,7 @@
           "compName": "mux2#0",
           "pinName": "I11"
         },
-        "name": "unnamedWire#228",
+        "name": "unnamedWire#209",
         "path": []
       },
       {
@@ -5016,7 +4753,7 @@
           "compName": "mux2#1",
           "pinName": "I01"
         },
-        "name": "unnamedWire#229",
+        "name": "unnamedWire#210",
         "path": [
           {
             "x": 430.0,
@@ -5033,7 +4770,7 @@
           "compName": "WireCrossPoint#37",
           "pinName": ""
         },
-        "name": "unnamedWire#230",
+        "name": "unnamedWire#211",
         "path": []
       },
       {
@@ -5045,7 +4782,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#231",
+        "name": "unnamedWire#212",
         "path": []
       },
       {
@@ -5057,7 +4794,7 @@
           "compName": "NandGate#11",
           "pinName": "A"
         },
-        "name": "unnamedWire#232",
+        "name": "unnamedWire#213",
         "path": []
       },
       {
@@ -5069,10 +4806,10 @@
           "compName": "WireCrossPoint#31",
           "pinName": ""
         },
-        "name": "unnamedWire#233",
+        "name": "unnamedWire#214",
         "path": [
           {
-            "x": 550.0,
+            "x": 555.0,
             "y": 250.0
           }
         ]
@@ -5086,23 +4823,23 @@
           "compName": "_submodelinterface",
           "pinName": "_OECT"
         },
-        "name": "unnamedWire#234",
+        "name": "unnamedWire#215",
         "path": [
           {
-            "x": 550.0,
-            "y": 215.0
+            "x": 555.0,
+            "y": 230.0
           },
           {
             "x": 565.0,
-            "y": 215.0
+            "y": 230.0
           },
           {
             "x": 565.0,
-            "y": 25.0
+            "y": 15.0
           },
           {
             "x": 550.0,
-            "y": 25.0
+            "y": 15.0
           }
         ]
       },
@@ -5115,7 +4852,7 @@
           "compName": "_submodelinterface",
           "pinName": "CT"
         },
-        "name": "unnamedWire#235",
+        "name": "unnamedWire#216",
         "path": []
       },
       {
@@ -5127,7 +4864,7 @@
           "compName": "xor#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#236",
+        "name": "unnamedWire#217",
         "path": []
       },
       {
@@ -5139,7 +4876,7 @@
           "compName": "mux1#5",
           "pinName": "I0"
         },
-        "name": "unnamedWire#237",
+        "name": "unnamedWire#218",
         "path": [
           {
             "x": 430.0,
@@ -5156,7 +4893,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#238",
+        "name": "unnamedWire#219",
         "path": []
       },
       {
@@ -5168,7 +4905,7 @@
           "compName": "_submodelinterface",
           "pinName": "QIO0"
         },
-        "name": "unnamedWire#239",
+        "name": "unnamedWire#220",
         "path": []
       },
       {
@@ -5180,7 +4917,7 @@
           "compName": "WireCrossPoint#40",
           "pinName": ""
         },
-        "name": "unnamedWire#240",
+        "name": "unnamedWire#221",
         "path": [
           {
             "x": 585.0,