X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2901%2FAm2901.json;h=0249fd173bf7f8c9ac0e8b340484828ea3048973;hb=2c32f5e4b0549a6b97a32cc96a36971c495ce11d;hp=16e3f8425a39099f500c34740e28e438f019efbf;hpb=05a74a7f2c9df8c93282e935d5d1a7ee0cab8e74;p=Mograsim.git

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 16e3f842..0249fd17 100644
--- 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
@@ -191,20 +191,8 @@
         "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
+          "x": 185.0,
+          "y": 730.0
         },
         "params": {
           "logicWidth": 4,
@@ -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,45 +285,9 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
-        "pos": {
-          "x": 485.0,
-          "y": 365.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#12",
-        "pos": {
-          "x": 695.0,
-          "y": 215.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#13",
-        "pos": {
-          "x": 640.0,
-          "y": 215.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#9",
         "pos": {
-          "x": 335.0,
+          "x": 330.0,
           "y": 930.0
         },
         "params": {
@@ -357,19 +297,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
-        "pos": {
-          "x": 240.0,
-          "y": 930.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#10",
         "pos": {
           "x": 135.0,
           "y": 965.0
@@ -381,7 +309,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#11",
         "pos": {
           "x": 135.0,
           "y": 1035.0
@@ -393,7 +321,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#12",
         "pos": {
           "x": 840.0,
           "y": 760.0
@@ -405,10 +333,10 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#13",
         "pos": {
-          "x": 695.0,
-          "y": 175.0
+          "x": 190.0,
+          "y": 930.0
         },
         "params": {
           "logicWidth": 4,
@@ -420,7 +348,7 @@
         "name": "TriStateBuffer#0",
         "pos": {
           "x": 355.0,
-          "y": 920.0
+          "y": 950.0
         },
         "params": {
           "logicWidth": 1,
@@ -444,7 +372,7 @@
         "name": "TriStateBuffer#2",
         "pos": {
           "x": 400.0,
-          "y": 950.0
+          "y": 920.0
         },
         "params": {
           "logicWidth": 1,
@@ -530,7 +458,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 254.0,
+          "x": 259.0,
           "y": 944.0
         },
         "params": 4
@@ -706,11 +634,11 @@
         }
       },
       {
-        "id": "dff4",
-        "name": "dff4#0",
+        "id": "dff4_we",
+        "name": "dff4_we#0",
         "pos": {
-          "x": 200.0,
-          "y": 925.0
+          "x": 220.0,
+          "y": 930.0
         }
       },
       {
@@ -718,7 +646,7 @@
         "name": "dlatch4#0",
         "pos": {
           "x": 720.0,
-          "y": 175.0
+          "y": 160.0
         }
       },
       {
@@ -733,8 +661,8 @@
         "id": "mux1_4",
         "name": "mux1_4#0",
         "pos": {
-          "x": 500.0,
-          "y": 350.0
+          "x": 490.0,
+          "y": 360.0
         }
       },
       {
@@ -773,7 +701,7 @@
     "wires": [
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
@@ -785,7 +713,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O5"
         },
         "pin2": {
@@ -797,7 +725,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O4"
         },
         "pin2": {
@@ -809,7 +737,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O3"
         },
         "pin2": {
@@ -825,7 +753,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O2"
         },
         "name": "unnamedWire#4",
@@ -833,7 +761,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
         "pin2": {
@@ -849,7 +777,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "name": "unnamedWire#6",
@@ -869,34 +797,18 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "_submodelinterface",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "mux1_4#0",
-          "pinName": "Y2"
+          "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
           }
         ]
       },
@@ -1005,7 +917,7 @@
           },
           {
             "x": 715.0,
-            "y": 210.0
+            "y": 195.0
           }
         ]
       },
@@ -1015,7 +927,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "name": "unnamedWire#15",
@@ -1044,7 +956,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff4#0",
+          "compName": "dff4_we#0",
           "pinName": "C"
         },
         "name": "unnamedWire#17",
@@ -1054,12 +966,12 @@
             "y": 900.0
           },
           {
-            "x": 195.0,
+            "x": 210.0,
             "y": 900.0
           },
           {
-            "x": 195.0,
-            "y": 970.0
+            "x": 210.0,
+            "y": 955.0
           }
         ]
       },
@@ -1227,48 +1139,57 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "A"
         },
         "pin2": {
-          "compName": "_submodelinterface",
+          "compName": "ram4#0",
           "pinName": "A"
         },
         "name": "unnamedWire#27",
-        "path": []
+        "path": [
+          {
+            "x": 650.0,
+            "y": 150.0
+          },
+          {
+            "x": 650.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O0"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
           "compName": "ram4#0",
-          "pinName": "B0"
+          "pinName": "B"
         },
         "name": "unnamedWire#28",
-        "path": []
+        "path": [
+          {
+            "x": 650.0,
+            "y": 350.0
+          },
+          {
+            "x": 650.0,
+            "y": 185.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "I"
+          "compName": "sel3_4#0",
+          "pinName": "Y4"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "Splitter#1",
+          "pinName": "O3"
         },
         "name": "unnamedWire#29",
-        "path": [
-          {
-            "x": 635.0,
-            "y": 230.0
-          },
-          {
-            "x": 635.0,
-            "y": 350.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1293,7 +1214,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "name": "unnamedWire#31",
@@ -1326,7 +1247,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O3"
         },
         "pin2": {
@@ -1342,7 +1263,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O0"
         },
         "name": "unnamedWire#34",
@@ -1359,235 +1280,132 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O3"
+          "compName": "ram4#0",
+          "pinName": "QA"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QA4"
+          "compName": "dlatch4#0",
+          "pinName": "D"
         },
         "name": "unnamedWire#35",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O2"
+          "compName": "_submodelinterface",
+          "pinName": "Cn"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QA3"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Cn"
         },
         "name": "unnamedWire#36",
-        "path": []
+        "path": [
+          {
+            "x": 55.0,
+            "y": 1050.0
+          },
+          {
+            "x": 55.0,
+            "y": 600.0
+          },
+          {
+            "x": 520.0,
+            "y": 600.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "O1"
+          "compName": "sel3_4#0",
+          "pinName": "Y1"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QA2"
+          "compName": "Splitter#1",
+          "pinName": "O0"
         },
         "name": "unnamedWire#37",
         "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA1"
+          "compName": "sel3_4#0",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "Splitter#19",
-          "pinName": "O0"
+          "compName": "Splitter#1",
+          "pinName": "O1"
         },
         "name": "unnamedWire#38",
         "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB4"
+          "compName": "Splitter#1",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O3"
+          "compName": "sel3_4#0",
+          "pinName": "Y3"
         },
         "name": "unnamedWire#39",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O2"
+          "compName": "Splitter#1",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "ram4#0",
-          "pinName": "QB3"
+          "pinName": "D"
         },
         "name": "unnamedWire#40",
-        "path": []
+        "path": [
+          {
+            "x": 200.0,
+            "y": 745.0
+          },
+          {
+            "x": 200.0,
+            "y": 290.0
+          },
+          {
+            "x": 630.0,
+            "y": 290.0
+          },
+          {
+            "x": 630.0,
+            "y": 210.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB2"
+          "compName": "dlatch4#1",
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O1"
+          "compName": "ram4#0",
+          "pinName": "QB"
         },
         "name": "unnamedWire#41",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QB1"
-        },
-        "name": "unnamedWire#42",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn"
-        },
-        "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Cn"
-        },
-        "name": "unnamedWire#43",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 1050.0
-          },
-          {
-            "x": 55.0,
-            "y": 600.0
-          },
-          {
-            "x": 520.0,
-            "y": 600.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "A0"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#44",
-        "path": [
-          {
-            "x": 650.0,
-            "y": 175.0
-          },
-          {
-            "x": 650.0,
-            "y": 165.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#45",
-        "path": [
-          {
-            "x": 645.0,
-            "y": 155.0
-          },
-          {
-            "x": 645.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#46",
         "path": [
           {
-            "x": 640.0,
-            "y": 145.0
+            "x": 255.0,
+            "y": 690.0
           },
           {
-            "x": 640.0,
-            "y": 195.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#47",
-        "path": [
-          {
-            "x": 635.0,
-            "y": 135.0
+            "x": 255.0,
+            "y": 580.0
           },
-          {
-            "x": 635.0,
-            "y": 205.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#48",
-        "path": [
           {
             "x": 710.0,
-            "y": 230.0
+            "y": 580.0
           },
           {
             "x": 710.0,
-            "y": 582.5
-          },
-          {
-            "x": 255.0,
-            "y": 582.5
-          },
-          {
-            "x": 255.0,
-            "y": 690.0
+            "y": 185.0
           }
         ]
       },
@@ -1600,56 +1418,58 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#42",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O3"
+          "compName": "Am2901DestDecode#0",
+          "pinName": "YF"
         },
         "pin2": {
           "compName": "mux1_4#0",
-          "pinName": "I0_4"
+          "pinName": "S0"
         },
-        "name": "unnamedWire#50",
-        "path": []
+        "name": "unnamedWire#43",
+        "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#0",
-          "pinName": "I0_3"
+          "pinName": "I0"
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#44",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "pin2": {
           "compName": "mux1_4#0",
-          "pinName": "I0_2"
-        },
-        "name": "unnamedWire#52",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I0_1"
+          "pinName": "I1"
         },
-        "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#53",
-        "path": []
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 355.0,
+            "y": 410.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1660,7 +1480,7 @@
           "compName": "dlatch4#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#46",
         "path": [
           {
             "x": 340.0,
@@ -1672,104 +1492,68 @@
           },
           {
             "x": 765.0,
-            "y": 190.0
+            "y": 175.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O1"
+          "compName": "dff4_we#0",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
         "pin1": {
           "compName": "Splitter#13",
-          "pinName": "O2"
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B2"
+          "compName": "dff4_we#0",
+          "pinName": "D"
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#48",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O3"
+          "compName": "sel3_4#1",
+          "pinName": "Y4"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B3"
-        },
-        "name": "unnamedWire#57",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "Q4"
-        },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#49",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O2"
+          "compName": "sel3_4#1",
+          "pinName": "Y3"
         },
         "pin2": {
-          "compName": "dff4#0",
-          "pinName": "Q3"
+          "compName": "Splitter#13",
+          "pinName": "O2"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#50",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q2"
+          "compName": "sel3_4#1",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
-        "name": "unnamedWire#60",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "Q1"
-        },
-        "name": "unnamedWire#61",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#51",
         "path": []
       },
       {
@@ -1778,22 +1562,22 @@
           "pinName": "B4"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#52",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B3"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#53",
         "path": []
       },
       {
@@ -1805,7 +1589,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#54",
         "path": [
           {
             "x": 80.0,
@@ -1819,26 +1603,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C2"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#55",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C1"
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#56",
         "path": []
       },
       {
@@ -1847,10 +1631,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#57",
         "path": []
       },
       {
@@ -1862,14 +1646,14 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#58",
         "path": [
           {
             "x": 130.0,
             "y": 1090.0
           },
           {
-            "x": 255.0,
+            "x": 260.0,
             "y": 1090.0
           }
         ]
@@ -1883,7 +1667,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#59",
         "path": [
           {
             "x": 325.0,
@@ -1893,14 +1677,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O8"
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#60",
         "path": []
       },
       {
@@ -1912,7 +1696,7 @@
           "compName": "WireCrossPoint#19",
           "pinName": ""
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#61",
         "path": [
           {
             "x": 75.0,
@@ -1926,14 +1710,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#62",
         "path": [
           {
             "x": 130.0,
@@ -1950,7 +1734,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#63",
         "path": []
       },
       {
@@ -1959,46 +1743,46 @@
           "pinName": "B2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#64",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B1"
         },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#65",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A2"
         },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C3"
         },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#67",
         "path": []
       },
       {
@@ -2010,7 +1794,7 @@
           "compName": "_submodelinterface",
           "pinName": "D"
         },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#68",
         "path": [
           {
             "x": 505.0,
@@ -2028,50 +1812,14 @@
       },
       {
         "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#80",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#81",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y3"
+          "compName": "Splitter#13",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#82",
-        "path": []
-      },
-      {
-        "pin1": {
           "compName": "sel3_4#1",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D4"
+          "pinName": "Y1"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#69",
         "path": []
       },
       {
@@ -2083,7 +1831,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cn+4"
         },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#70",
         "path": [
           {
             "x": 615.0,
@@ -2104,7 +1852,7 @@
           "compName": "_submodelinterface",
           "pinName": "OVR"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#71",
         "path": [
           {
             "x": 610.0,
@@ -2133,7 +1881,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#72",
         "path": [
           {
             "x": 365.0,
@@ -2143,14 +1891,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#73",
         "path": []
       },
       {
@@ -2162,7 +1910,7 @@
           "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#74",
         "path": []
       },
       {
@@ -2174,7 +1922,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#75",
         "path": []
       },
       {
@@ -2186,7 +1934,7 @@
           "compName": "sel3_4#0",
           "pinName": "C4"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#76",
         "path": [
           {
             "x": 435.0,
@@ -2219,7 +1967,7 @@
           "compName": "_submodelinterface",
           "pinName": "RAMn+3"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#77",
         "path": [
           {
             "x": 455.0,
@@ -2233,86 +1981,38 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#78",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#79",
         "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#0",
-          "pinName": "I1_1"
-        },
-        "name": "unnamedWire#95",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#96",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#80",
         "path": []
       },
       {
@@ -2321,29 +2021,12 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#4",
           "pinName": "I"
         },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#81",
         "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 +2036,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#82",
         "path": []
       },
       {
@@ -2365,7 +2048,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#83",
         "path": [
           {
             "x": 380.0,
@@ -2382,7 +2065,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#84",
         "path": [
           {
             "x": 105.0,
@@ -2396,10 +2079,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#85",
         "path": []
       },
       {
@@ -2408,70 +2091,70 @@
           "pinName": "A4"
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#86",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#87",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#88",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#89",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#90",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#91",
         "path": []
       },
       {
@@ -2483,7 +2166,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#92",
         "path": [
           {
             "x": 100.0,
@@ -2493,26 +2176,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B4"
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#93",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#94",
         "path": []
       },
       {
@@ -2524,43 +2207,43 @@
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C3"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#96",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C2"
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#97",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C1"
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -2572,7 +2255,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
@@ -2581,46 +2264,46 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#100",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A3"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A4"
         },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#102",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#103",
         "path": [
           {
             "x": 105.0,
@@ -2637,7 +2320,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "F"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#104",
         "path": [
           {
             "x": 610.0,
@@ -2651,112 +2334,16 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#124",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#105",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#126",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 730.0
-          },
-          {
-            "x": 195.0,
-            "y": 265.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#127",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 740.0
-          },
-          {
-            "x": 200.0,
-            "y": 275.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 750.0
-          },
-          {
-            "x": 205.0,
-            "y": 285.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#129",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 760.0
-          },
-          {
-            "x": 210.0,
-            "y": 295.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "Am2901DestDecode#0",
@@ -2766,7 +2353,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
@@ -2778,7 +2365,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#131"
+        "name": "unnamedWire#107"
       },
       {
         "pin1": {
@@ -2789,7 +2376,7 @@
           "compName": "ram4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#108",
         "path": [
           {
             "x": 630.0,
@@ -2797,7 +2384,7 @@
           },
           {
             "x": 630.0,
-            "y": 255.0
+            "y": 200.0
           }
         ]
       },
@@ -2807,10 +2394,10 @@
           "pinName": "QWE"
         },
         "pin2": {
-          "compName": "dff4#0",
+          "compName": "dff4_we#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#109",
         "path": [
           {
             "x": 450.0,
@@ -2821,93 +2408,27 @@
             "y": 245.0
           },
           {
-            "x": 190.0,
+            "x": 215.0,
             "y": 245.0
           },
           {
-            "x": 190.0,
-            "y": 980.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Am2901DestDecode#0",
-          "pinName": "YF"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#134",
-        "path": [
-          {
-            "x": 435.0,
-            "y": 195.0
-          },
-          {
-            "x": 435.0,
-            "y": 355.0
+            "x": 215.0,
+            "y": 935.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#9",
           "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#110",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "mux1_4#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 +2438,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#111",
         "path": []
       },
       {
@@ -2929,7 +2450,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#112",
         "path": [
           {
             "x": 415.0,
@@ -2946,7 +2467,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#113",
         "path": [
           {
             "x": 415.0,
@@ -2963,7 +2484,7 @@
           "compName": "_submodelinterface",
           "pinName": "F\u003d0"
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#114",
         "path": [
           {
             "x": 445.0,
@@ -2983,39 +2504,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "mux1_4#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 +2513,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#115",
         "path": [
           {
             "x": 100.0,
@@ -3037,7 +2525,7 @@
           },
           {
             "x": 380.0,
-            "y": 930.0
+            "y": 960.0
           }
         ]
       },
@@ -3047,10 +2535,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#116",
         "path": []
       },
       {
@@ -3062,7 +2550,7 @@
           "compName": "sel3_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#117",
         "path": [
           {
             "x": 100.0,
@@ -3079,7 +2567,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#118",
         "path": [
           {
             "x": 100.0,
@@ -3091,31 +2579,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "mux1_4#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 +2588,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#119",
         "path": []
       },
       {
@@ -3137,7 +2600,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#120",
         "path": [
           {
             "x": 395.0,
@@ -3158,7 +2621,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "EN"
         },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#121",
         "path": []
       },
       {
@@ -3170,7 +2633,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#122",
         "path": []
       },
       {
@@ -3182,7 +2645,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#123",
         "path": []
       },
       {
@@ -3194,7 +2657,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#124",
         "path": []
       },
       {
@@ -3206,7 +2669,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#125",
         "path": []
       },
       {
@@ -3218,7 +2681,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 145.0,
@@ -3239,11 +2702,11 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#127",
         "path": [
           {
             "x": 425.0,
-            "y": 960.0
+            "y": 930.0
           }
         ]
       },
@@ -3256,7 +2719,7 @@
           "compName": "_submodelinterface",
           "pinName": "Qn+3"
         },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#128",
         "path": [
           {
             "x": 425.0,
@@ -3266,26 +2729,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#129",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901DestDecode#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#130",
         "path": [
           {
             "x": 835.0,
@@ -3304,18 +2767,6 @@
             "y": 175.0
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#19",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#160",
-        "path": []
       }
     ],
     "version": "0.1.1"
@@ -3335,7 +2786,7 @@
       "qreg": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff4#0"
+          "delegateTarget": "dff4_we#0"
         }
       },
       "regs": {