X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=4e171ed75ea52cf96cafc323ede452c1bb9683d1;hb=989cf7da1ea37c4174bea281ae56ead12cb725be;hp=8534163cf31e932e513554ff20777cb6ef0e03c5;hpb=1234597eaff5990ecc51d90856786702cc33f52e;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index 8534163c..4e171ed7 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -5,12 +5,28 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
+      {
+        "id": "Am2900MPROM",
+        "name": "Am2900MPROM#0",
+        "pos": {
+          "x": 255.0,
+          "y": 385.0
+        }
+      },
       {
         "id": "Am2900MainMemory",
         "name": "Am2900MainMemory#0",
         "pos": {
-          "x": 35.0,
-          "y": 70.0
+          "x": 80.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "Am2900MemoryController",
+        "name": "Am2900MemoryController#0",
+        "pos": {
+          "x": 155.0,
+          "y": 275.0
         }
       },
       {
@@ -92,48 +108,48 @@
         "name": "BitDisplay#2",
         "pos": {
           "x": 280.0,
-          "y": 60.0
+          "y": 65.0
         },
         "params": 16
       },
+      {
+        "id": "Clock",
+        "name": "Clock#0",
+        "pos": {
+          "x": 115.0,
+          "y": 355.0
+        },
+        "params": {
+          "delta": 7000,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#0",
         "pos": {
-          "x": 540.0,
+          "x": 555.0,
           "y": 270.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#1",
         "pos": {
-          "x": 635.0,
-          "y": 380.0
+          "x": 645.0,
+          "y": 390.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#2",
         "pos": {
-          "x": 365.0,
-          "y": 505.0
+          "x": 385.0,
+          "y": 510.0
         },
-        "params": {
-          "bits": [
-            "ONE"
-          ]
-        }
+        "params": "1"
       },
       {
         "id": "FixedOutput",
@@ -142,72 +158,34 @@
           "x": 455.0,
           "y": 560.0
         },
-        "params": {
-          "bits": [
-            "ONE"
-          ]
-        }
+        "params": "1"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#4",
         "pos": {
-          "x": 420.0,
+          "x": 430.0,
           "y": 570.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#5",
         "pos": {
-          "x": 475.0,
-          "y": 505.0
+          "x": 485.0,
+          "y": 510.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#6",
         "pos": {
-          "x": 535.0,
-          "y": 370.0
-        },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
-      },
-      {
-        "id": "FixedOutput",
-        "name": "FixedOutput#7",
-        "pos": {
-          "x": 260.0,
-          "y": 370.0
-        },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
-      },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#0",
-        "pos": {
-          "x": 120.0,
-          "y": 355.0
+          "x": 545.0,
+          "y": 380.0
         },
-        "params": 1
+        "params": "0"
       },
       {
         "id": "NandGate",
@@ -258,8 +236,8 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 100.0,
-          "y": 235.0
+          "x": 125.0,
+          "y": 285.0
         },
         "params": 1
       },
@@ -267,20 +245,11 @@
         "id": "NandGate",
         "name": "NandGate#6",
         "pos": {
-          "x": 150.0,
+          "x": 145.0,
           "y": 375.0
         },
         "params": 1
       },
-      {
-        "id": "NandGate",
-        "name": "NandGate#7",
-        "pos": {
-          "x": 105.0,
-          "y": 275.0
-        },
-        "params": 1
-      },
       {
         "id": "Splitter",
         "name": "Splitter#0",
@@ -320,30 +289,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#3",
-        "pos": {
-          "x": 205.0,
-          "y": 390.0
-        },
-        "params": {
-          "logicWidth": 8,
-          "orientation": "DOWN"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#4",
-        "pos": {
-          "x": 205.0,
-          "y": 405.0
-        },
-        "params": {
-          "logicWidth": 12,
-          "orientation": "UP"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#5",
         "pos": {
           "x": 575.0,
           "y": 115.0
@@ -355,7 +300,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#6",
+        "name": "Splitter#4",
         "pos": {
           "x": 575.0,
           "y": 195.0
@@ -367,7 +312,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#5",
         "pos": {
           "x": 575.0,
           "y": 235.0
@@ -379,7 +324,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#6",
         "pos": {
           "x": 675.0,
           "y": 150.0
@@ -391,7 +336,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#7",
         "pos": {
           "x": 675.0,
           "y": 245.0
@@ -403,7 +348,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#8",
         "pos": {
           "x": 345.0,
           "y": 830.0
@@ -415,7 +360,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#9",
         "pos": {
           "x": 405.0,
           "y": 815.0
@@ -427,7 +372,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#10",
         "pos": {
           "x": 525.0,
           "y": 815.0
@@ -439,7 +384,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#11",
         "pos": {
           "x": 660.0,
           "y": 755.0
@@ -451,7 +396,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#12",
         "pos": {
           "x": 575.0,
           "y": 815.0
@@ -463,7 +408,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#13",
         "pos": {
           "x": 695.0,
           "y": 815.0
@@ -475,7 +420,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#14",
         "pos": {
           "x": 655.0,
           "y": 815.0
@@ -487,7 +432,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#15",
         "pos": {
           "x": 730.0,
           "y": 770.0
@@ -499,7 +444,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#16",
         "pos": {
           "x": 690.0,
           "y": 770.0
@@ -511,7 +456,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#17",
         "pos": {
           "x": 660.0,
           "y": 770.0
@@ -523,7 +468,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#18",
         "pos": {
           "x": 925.0,
           "y": 815.0
@@ -535,7 +480,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#21",
+        "name": "Splitter#19",
         "pos": {
           "x": 895.0,
           "y": 815.0
@@ -547,7 +492,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#22",
+        "name": "Splitter#20",
         "pos": {
           "x": 865.0,
           "y": 815.0
@@ -559,7 +504,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#23",
+        "name": "Splitter#21",
         "pos": {
           "x": 835.0,
           "y": 815.0
@@ -571,7 +516,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#24",
+        "name": "Splitter#22",
         "pos": {
           "x": 795.0,
           "y": 815.0
@@ -583,7 +528,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#25",
+        "name": "Splitter#23",
         "pos": {
           "x": 745.0,
           "y": 815.0
@@ -595,7 +540,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#26",
+        "name": "Splitter#24",
         "pos": {
           "x": 895.0,
           "y": 800.0
@@ -607,7 +552,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#27",
+        "name": "Splitter#25",
         "pos": {
           "x": 835.0,
           "y": 800.0
@@ -619,7 +564,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#28",
+        "name": "Splitter#26",
         "pos": {
           "x": 865.0,
           "y": 800.0
@@ -631,7 +576,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#29",
+        "name": "Splitter#27",
         "pos": {
           "x": 835.0,
           "y": 780.0
@@ -643,7 +588,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#30",
+        "name": "Splitter#28",
         "pos": {
           "x": 895.0,
           "y": 330.0
@@ -655,7 +600,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#31",
+        "name": "Splitter#29",
         "pos": {
           "x": 895.0,
           "y": 580.0
@@ -667,7 +612,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#32",
+        "name": "Splitter#30",
         "pos": {
           "x": 895.0,
           "y": 565.0
@@ -679,7 +624,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#33",
+        "name": "Splitter#31",
         "pos": {
           "x": 935.0,
           "y": 565.0
@@ -691,7 +636,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#34",
+        "name": "Splitter#32",
         "pos": {
           "x": 975.0,
           "y": 565.0
@@ -703,7 +648,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#35",
+        "name": "Splitter#33",
         "pos": {
           "x": 1015.0,
           "y": 565.0
@@ -715,7 +660,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#36",
+        "name": "Splitter#34",
         "pos": {
           "x": 895.0,
           "y": 345.0
@@ -727,7 +672,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#37",
+        "name": "Splitter#35",
         "pos": {
           "x": 935.0,
           "y": 345.0
@@ -739,7 +684,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#38",
+        "name": "Splitter#36",
         "pos": {
           "x": 975.0,
           "y": 345.0
@@ -751,7 +696,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#39",
+        "name": "Splitter#37",
         "pos": {
           "x": 1015.0,
           "y": 345.0
@@ -763,7 +708,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#40",
+        "name": "Splitter#38",
         "pos": {
           "x": 310.0,
           "y": 235.0
@@ -775,7 +720,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#41",
+        "name": "Splitter#39",
         "pos": {
           "x": 620.0,
           "y": 200.0
@@ -787,7 +732,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#42",
+        "name": "Splitter#40",
         "pos": {
           "x": 365.0,
           "y": 815.0
@@ -799,7 +744,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#43",
+        "name": "Splitter#41",
         "pos": {
           "x": 620.0,
           "y": 295.0
@@ -814,7 +759,7 @@
         "name": "TextComponent#0",
         "pos": {
           "x": 305.0,
-          "y": 30.0
+          "y": 25.0
         },
         "params": "D bus"
       },
@@ -823,7 +768,7 @@
         "name": "TextComponent#1",
         "pos": {
           "x": 305.0,
-          "y": 60.0
+          "y": 55.0
         },
         "params": "A bus"
       },
@@ -836,15 +781,6 @@
         },
         "params": "MPM addr"
       },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#3",
-        "pos": {
-          "x": 110.0,
-          "y": 355.0
-        },
-        "params": "c"
-      },
       {
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
@@ -893,30 +829,6 @@
           "orientation": "RIGHT_ALT"
         }
       },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#4",
-        "pos": {
-          "x": 185.0,
-          "y": 175.0
-        },
-        "params": {
-          "logicWidth": 16,
-          "orientation": "RIGHT_ALT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#6",
-        "pos": {
-          "x": 185.0,
-          "y": 145.0
-        },
-        "params": {
-          "logicWidth": 16,
-          "orientation": "LEFT"
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -1218,8 +1130,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#33",
         "pos": {
-          "x": 284.0,
-          "y": 399.0
+          "x": 339.0,
+          "y": 229.0
         },
         "params": 1
       },
@@ -1227,8 +1139,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#34",
         "pos": {
-          "x": 294.0,
-          "y": 399.0
+          "x": 824.0,
+          "y": 699.0
         },
         "params": 1
       },
@@ -1236,8 +1148,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#35",
         "pos": {
-          "x": 304.0,
-          "y": 399.0
+          "x": 169.0,
+          "y": 384.0
         },
         "params": 1
       },
@@ -1245,8 +1157,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#36",
         "pos": {
-          "x": 339.0,
-          "y": 229.0
+          "x": 179.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1254,8 +1166,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#37",
         "pos": {
-          "x": 824.0,
-          "y": 699.0
+          "x": 139.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1263,8 +1175,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#38",
         "pos": {
-          "x": 174.0,
-          "y": 384.0
+          "x": 139.0,
+          "y": 379.0
         },
         "params": 1
       },
@@ -1272,7 +1184,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#39",
         "pos": {
-          "x": 179.0,
+          "x": 479.0,
           "y": 364.0
         },
         "params": 1
@@ -1281,215 +1193,59 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#40",
         "pos": {
-          "x": 144.0,
-          "y": 364.0
+          "x": 239.0,
+          "y": 564.0
         },
-        "params": 1
+        "params": 12
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#41",
         "pos": {
-          "x": 144.0,
-          "y": 379.0
+          "x": 364.0,
+          "y": 364.0
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#42",
+        "id": "and",
+        "name": "and#0",
         "pos": {
-          "x": 364.0,
-          "y": 264.0
-        },
-        "params": 1
+          "x": 860.0,
+          "y": 590.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#43",
+        "id": "and",
+        "name": "and#1",
         "pos": {
-          "x": 239.0,
-          "y": 564.0
-        },
-        "params": 12
+          "x": 860.0,
+          "y": 610.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#44",
+        "id": "and",
+        "name": "and#2",
         "pos": {
-          "x": 174.0,
-          "y": 264.0
-        },
-        "params": 1
+          "x": 905.0,
+          "y": 595.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#45",
+        "id": "dff16",
+        "name": "dff16#0",
         "pos": {
-          "x": 174.0,
-          "y": 254.0
-        },
-        "params": 1
+          "x": 370.0,
+          "y": 105.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#47",
+        "id": "dff16_invwe",
+        "name": "dff16_invwe#0",
         "pos": {
-          "x": 99.0,
-          "y": 299.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#48",
-        "pos": {
-          "x": 174.0,
-          "y": 284.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#49",
-        "pos": {
-          "x": 124.0,
-          "y": 244.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#50",
-        "pos": {
-          "x": 99.0,
-          "y": 279.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#51",
-        "pos": {
-          "x": 234.0,
-          "y": 154.0
-        },
-        "params": 16
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#52",
-        "pos": {
-          "x": 164.0,
-          "y": 154.0
-        },
-        "params": 16
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#53",
-        "pos": {
-          "x": 99.0,
-          "y": 289.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#54",
-        "pos": {
-          "x": 174.0,
-          "y": 309.0
-        },
-        "params": 1
-      },
-      {
-        "id": "and",
-        "name": "and#0",
-        "pos": {
-          "x": 860.0,
-          "y": 590.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#1",
-        "pos": {
-          "x": 860.0,
-          "y": 610.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#2",
-        "pos": {
-          "x": 905.0,
-          "y": 595.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#3",
-        "pos": {
-          "x": 130.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#4",
-        "pos": {
-          "x": 130.0,
-          "y": 270.0
-        }
-      },
-      {
-        "id": "dff16",
-        "name": "dff16#0",
-        "pos": {
-          "x": 370.0,
-          "y": 105.0
-        }
-      },
-      {
-        "id": "dff16",
-        "name": "dff16#1",
-        "pos": {
-          "x": 180.0,
-          "y": 65.0
-        }
-      },
-      {
-        "id": "dff16_invwe",
-        "name": "dff16_invwe#0",
-        "pos": {
-          "x": 490.0,
-          "y": 165.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#0",
-        "pos": {
-          "x": 180.0,
-          "y": 270.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#1",
-        "pos": {
-          "x": 180.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#2",
-        "pos": {
-          "x": 180.0,
-          "y": 295.0
-        }
+          "x": 490.0,
+          "y": 165.0
+        }
       },
       {
         "id": "dlatch80",
@@ -1508,25 +1264,24 @@
         }
       },
       {
-        "id": "inc",
-        "name": "inc#0",
+        "id": "inc16",
+        "name": "inc16#0",
         "pos": {
-          "x": 315.0,
-          "y": 135.0
-        },
-        "params": 16
+          "x": 335.0,
+          "y": 115.0
+        }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#0",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#0",
         "pos": {
           "x": 635.0,
           "y": 145.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#1",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#1",
         "pos": {
           "x": 635.0,
           "y": 240.0
@@ -1537,7 +1292,7 @@
         "name": "mux1_12#0",
         "pos": {
           "x": 365.0,
-          "y": 420.0
+          "y": 415.0
         }
       },
       {
@@ -1578,16 +1333,16 @@
             "y": 355.0
           },
           {
-            "x": 470.0,
+            "x": 490.0,
             "y": 355.0
           },
           {
-            "x": 470.0,
-            "y": 505.0
+            "x": 490.0,
+            "y": 500.0
           },
           {
             "x": 400.0,
-            "y": 505.0
+            "y": 500.0
           },
           {
             "x": 400.0,
@@ -2164,7 +1919,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -2333,7 +2088,7 @@
         "path": [
           {
             "x": 660.0,
-            "y": 390.0
+            "y": 395.0
           }
         ]
       },
@@ -2361,12 +2116,12 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 480.0,
+            "x": 470.0,
             "y": 540.0
           },
           {
-            "x": 480.0,
-            "y": 570.0
+            "x": 470.0,
+            "y": 565.0
           }
         ]
       },
@@ -2383,7 +2138,7 @@
         "path": [
           {
             "x": 445.0,
-            "y": 580.0
+            "y": 575.0
           }
         ]
       },
@@ -2412,7 +2167,7 @@
         "path": [
           {
             "x": 560.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -2487,7 +2242,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O7"
         },
         "name": "unnamedWire#46",
@@ -2495,7 +2250,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O6"
         },
         "pin2": {
@@ -2511,7 +2266,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O5"
         },
         "name": "unnamedWire#48",
@@ -2519,7 +2274,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O4"
         },
         "pin2": {
@@ -2535,7 +2290,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O3"
         },
         "name": "unnamedWire#50",
@@ -2547,7 +2302,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O2"
         },
         "name": "unnamedWire#51",
@@ -2555,7 +2310,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
         "pin2": {
@@ -2571,7 +2326,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "name": "unnamedWire#53",
@@ -2590,7 +2345,7 @@
         "path": [
           {
             "x": 570.0,
-            "y": 280.0
+            "y": 275.0
           }
         ]
       },
@@ -2600,7 +2355,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#4",
           "pinName": "O3"
         },
         "name": "unnamedWire#55",
@@ -2617,7 +2372,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O3"
         },
         "name": "unnamedWire#56",
@@ -2625,7 +2380,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
         "pin2": {
@@ -2641,7 +2396,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "name": "unnamedWire#58",
@@ -2649,7 +2404,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "O0"
         },
         "pin2": {
@@ -2661,7 +2416,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#4",
           "pinName": "O0"
         },
         "pin2": {
@@ -2677,7 +2432,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#4",
           "pinName": "O1"
         },
         "name": "unnamedWire#61",
@@ -2685,7 +2440,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#4",
           "pinName": "O2"
         },
         "pin2": {
@@ -2701,7 +2456,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#63",
@@ -2709,7 +2464,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -2725,7 +2480,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#65",
@@ -2737,7 +2492,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#66",
@@ -2749,7 +2504,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#67",
@@ -2757,7 +2512,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -2773,7 +2528,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#69",
@@ -2785,7 +2540,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#70",
@@ -2793,7 +2548,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
         "pin2": {
@@ -2814,7 +2569,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#4",
           "pinName": "I"
         },
         "pin2": {
@@ -2835,11 +2590,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
         "name": "unnamedWire#73",
@@ -2847,11 +2602,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#74",
@@ -2859,11 +2614,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "name": "unnamedWire#75",
@@ -2871,11 +2626,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#76",
@@ -2883,11 +2638,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O3"
         },
         "name": "unnamedWire#77",
@@ -2895,11 +2650,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#78",
@@ -2907,11 +2662,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O1"
         },
         "name": "unnamedWire#79",
@@ -2919,11 +2674,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#80",
@@ -3150,7 +2905,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "name": "unnamedWire#93",
@@ -3158,11 +2913,11 @@
       },
       {
         "pin1": {
-          "compName": "ManualSwitch#0",
+          "compName": "Clock#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "name": "unnamedWire#94",
@@ -3170,11 +2925,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "name": "unnamedWire#95",
@@ -3182,7 +2937,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -3192,18 +2947,18 @@
         "name": "unnamedWire#96",
         "path": [
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 390.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "name": "unnamedWire#97",
@@ -3215,7 +2970,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "name": "unnamedWire#98",
@@ -3223,7 +2978,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "pin2": {
@@ -3233,7 +2988,7 @@
         "name": "unnamedWire#99",
         "path": [
           {
-            "x": 175.0,
+            "x": 170.0,
             "y": 485.0
           },
           {
@@ -3248,11 +3003,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "name": "unnamedWire#100",
@@ -3281,7 +3036,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
@@ -3343,7 +3098,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#38",
           "pinName": "O2"
         },
         "pin2": {
@@ -3414,11 +3169,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#38",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "name": "unnamedWire#109",
@@ -3472,7 +3227,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
         "pin2": {
@@ -3497,7 +3252,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
         "name": "unnamedWire#114",
@@ -3566,7 +3321,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O37"
         },
         "name": "unnamedWire#119",
@@ -3612,7 +3367,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "pin2": {
@@ -3630,12 +3385,12 @@
             "y": 325.0
           },
           {
-            "x": 95.0,
+            "x": 120.0,
             "y": 325.0
           },
           {
-            "x": 95.0,
-            "y": 250.0
+            "x": 120.0,
+            "y": 300.0
           }
         ]
       },
@@ -3687,45 +3442,65 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Dmach"
         },
         "pin2": {
-          "compName": "dff16#1",
-          "pinName": "D"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
         },
         "name": "unnamedWire#125",
         "path": [
           {
-            "x": 170.0,
-            "y": 60.0
+            "x": 145.0,
+            "y": 280.0
           },
           {
-            "x": 170.0,
-            "y": 90.0
+            "x": 145.0,
+            "y": 260.0
+          },
+          {
+            "x": 225.0,
+            "y": 260.0
+          },
+          {
+            "x": 225.0,
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "D"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Amach"
         },
         "name": "unnamedWire#126",
         "path": [
           {
-            "x": 165.0,
-            "y": 120.0
-          }
+            "x": 230.0,
+            "y": 60.0
+          },
+          {
+            "x": 230.0,
+            "y": 265.0
+          },
+          {
+            "x": 150.0,
+            "y": 265.0
+          },
+          {
+            "x": 150.0,
+            "y": 285.0
+          }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#38",
           "pinName": "O3"
         },
         "pin2": {
@@ -3750,7 +3525,7 @@
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -3758,16 +3533,11 @@
           "pinName": "D"
         },
         "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 130.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "A"
         },
         "pin2": {
@@ -3777,14 +3547,18 @@
         "name": "unnamedWire#129",
         "path": [
           {
-            "x": 335.0,
+            "x": 315.0,
+            "y": 130.0
+          },
+          {
+            "x": 315.0,
             "y": 160.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -3794,9 +3568,17 @@
         "name": "unnamedWire#130",
         "path": [
           {
-            "x": 360.0,
+            "x": 330.0,
             "y": 145.0
           },
+          {
+            "x": 330.0,
+            "y": 160.0
+          },
+          {
+            "x": 360.0,
+            "y": 160.0
+          },
           {
             "x": 360.0,
             "y": 175.0
@@ -3834,20 +3616,15 @@
       },
       {
         "pin1": {
-          "compName": "FixedOutput#7",
-          "pinName": "out"
+          "compName": "Am2900MPROM#0",
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "mux1_12#0",
+          "pinName": "I0"
         },
         "name": "unnamedWire#133",
-        "path": [
-          {
-            "x": 285.0,
-            "y": 380.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -3868,18 +3645,22 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "OUT"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Dmem"
         },
         "pin2": {
-          "compName": "WireCrossPoint#51",
-          "pinName": ""
+          "compName": "Am2900MainMemory#0",
+          "pinName": "D"
         },
         "name": "unnamedWire#135",
         "path": [
           {
-            "x": 235.0,
-            "y": 185.0
+            "x": 205.0,
+            "y": 280.0
+          },
+          {
+            "x": 205.0,
+            "y": 155.0
           }
         ]
       },
@@ -3904,7 +3685,7 @@
           },
           {
             "x": 360.0,
-            "y": 425.0
+            "y": 420.0
           }
         ]
       },
@@ -3926,7 +3707,7 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
         "name": "unnamedWire#138",
@@ -3947,7 +3728,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O22"
         },
         "pin2": {
@@ -3972,11 +3753,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O21"
         },
         "name": "unnamedWire#140",
@@ -3984,11 +3765,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O20"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "name": "unnamedWire#141",
@@ -3996,11 +3777,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O19"
         },
         "name": "unnamedWire#142",
@@ -4008,11 +3789,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O18"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "name": "unnamedWire#143",
@@ -4020,7 +3801,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
@@ -4045,11 +3826,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O17"
         },
         "name": "unnamedWire#145",
@@ -4057,11 +3838,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O16"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O10"
         },
         "name": "unnamedWire#146",
@@ -4069,11 +3850,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O15"
         },
         "name": "unnamedWire#147",
@@ -4081,11 +3862,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O8"
         },
         "name": "unnamedWire#148",
@@ -4093,11 +3874,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O13"
         },
         "name": "unnamedWire#149",
@@ -4105,11 +3886,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O6"
         },
         "name": "unnamedWire#150",
@@ -4117,11 +3898,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O11"
         },
         "name": "unnamedWire#151",
@@ -4129,11 +3910,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O4"
         },
         "name": "unnamedWire#152",
@@ -4141,11 +3922,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O9"
         },
         "name": "unnamedWire#153",
@@ -4153,11 +3934,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O2"
         },
         "name": "unnamedWire#154",
@@ -4165,11 +3946,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O7"
         },
         "name": "unnamedWire#155",
@@ -4177,11 +3958,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "name": "unnamedWire#156",
@@ -4200,7 +3981,7 @@
         "path": [
           {
             "x": 435.0,
-            "y": 450.0
+            "y": 445.0
           }
         ]
       },
@@ -4210,14 +3991,14 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
         "name": "unnamedWire#158",
         "path": [
           {
             "x": 350.0,
-            "y": 480.0
+            "y": 475.0
           },
           {
             "x": 350.0,
@@ -4255,11 +4036,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#40",
           "pinName": "O3"
         },
         "name": "unnamedWire#161",
@@ -4267,11 +4048,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#38",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#40",
           "pinName": "I"
         },
         "name": "unnamedWire#162",
@@ -4292,7 +4073,7 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "name": "unnamedWire#163",
@@ -4309,7 +4090,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O29"
         },
         "pin2": {
@@ -4338,7 +4119,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O30"
         },
         "pin2": {
@@ -4367,11 +4148,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O23"
         },
         "name": "unnamedWire#166",
@@ -4379,11 +4160,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O25"
         },
         "name": "unnamedWire#167",
@@ -4391,11 +4172,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O24"
         },
         "name": "unnamedWire#168",
@@ -4403,11 +4184,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O26"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O3"
         },
         "name": "unnamedWire#169",
@@ -4415,11 +4196,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O27"
         },
         "name": "unnamedWire#170",
@@ -4427,11 +4208,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O28"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O5"
         },
         "name": "unnamedWire#171",
@@ -4439,11 +4220,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O31"
         },
         "name": "unnamedWire#172",
@@ -4451,11 +4232,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O32"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#14",
           "pinName": "O1"
         },
         "name": "unnamedWire#173",
@@ -4463,11 +4244,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#14",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O33"
         },
         "name": "unnamedWire#174",
@@ -4475,11 +4256,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O34"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#14",
           "pinName": "O3"
         },
         "name": "unnamedWire#175",
@@ -4487,11 +4268,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O35"
         },
         "name": "unnamedWire#176",
@@ -4499,11 +4280,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O36"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "name": "unnamedWire#177",
@@ -4511,11 +4292,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "name": "unnamedWire#178",
@@ -4532,11 +4313,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#16",
           "pinName": "I"
         },
         "name": "unnamedWire#179",
@@ -4553,11 +4334,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#17",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "name": "unnamedWire#180",
@@ -4574,11 +4355,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O0"
         },
         "name": "unnamedWire#181",
@@ -4586,11 +4367,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "name": "unnamedWire#182",
@@ -4598,11 +4379,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O2"
         },
         "name": "unnamedWire#183",
@@ -4610,11 +4391,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "name": "unnamedWire#184",
@@ -4622,11 +4403,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O4"
         },
         "name": "unnamedWire#185",
@@ -4634,11 +4415,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#15",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O5"
         },
         "name": "unnamedWire#186",
@@ -4646,11 +4427,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#16",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O6"
         },
         "name": "unnamedWire#187",
@@ -4658,11 +4439,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#16",
           "pinName": "O1"
         },
         "name": "unnamedWire#188",
@@ -4670,11 +4451,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#16",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O8"
         },
         "name": "unnamedWire#189",
@@ -4682,11 +4463,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#16",
           "pinName": "O3"
         },
         "name": "unnamedWire#190",
@@ -4694,11 +4475,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#17",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O11"
         },
         "name": "unnamedWire#191",
@@ -4706,11 +4487,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#17",
           "pinName": "O1"
         },
         "name": "unnamedWire#192",
@@ -4718,11 +4499,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O73"
         },
         "name": "unnamedWire#193",
@@ -4730,11 +4511,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O72"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O14"
         },
         "name": "unnamedWire#194",
@@ -4742,11 +4523,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O71"
         },
         "name": "unnamedWire#195",
@@ -4754,11 +4535,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O70"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O12"
         },
         "name": "unnamedWire#196",
@@ -4766,11 +4547,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O69"
         },
         "name": "unnamedWire#197",
@@ -4778,11 +4559,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O68"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O10"
         },
         "name": "unnamedWire#198",
@@ -4790,11 +4571,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O67"
         },
         "name": "unnamedWire#199",
@@ -4802,11 +4583,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O66"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O8"
         },
         "name": "unnamedWire#200",
@@ -4814,11 +4595,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O65"
         },
         "name": "unnamedWire#201",
@@ -4826,11 +4607,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O64"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O6"
         },
         "name": "unnamedWire#202",
@@ -4838,11 +4619,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O63"
         },
         "name": "unnamedWire#203",
@@ -4850,11 +4631,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O62"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O4"
         },
         "name": "unnamedWire#204",
@@ -4862,11 +4643,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O61"
         },
         "name": "unnamedWire#205",
@@ -4874,11 +4655,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O60"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O2"
         },
         "name": "unnamedWire#206",
@@ -4886,11 +4667,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O59"
         },
         "name": "unnamedWire#207",
@@ -4898,11 +4679,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O58"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "O0"
         },
         "name": "unnamedWire#208",
@@ -4910,11 +4691,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#19",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O57"
         },
         "name": "unnamedWire#209",
@@ -4922,11 +4703,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O56"
         },
         "pin2": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#19",
           "pinName": "O1"
         },
         "name": "unnamedWire#210",
@@ -4934,11 +4715,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#19",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O55"
         },
         "name": "unnamedWire#211",
@@ -4946,11 +4727,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O54"
         },
         "pin2": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#20",
           "pinName": "O2"
         },
         "name": "unnamedWire#212",
@@ -4958,11 +4739,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#20",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O53"
         },
         "name": "unnamedWire#213",
@@ -4970,11 +4751,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O52"
         },
         "pin2": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#20",
           "pinName": "O0"
         },
         "name": "unnamedWire#214",
@@ -4982,11 +4763,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#21",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O51"
         },
         "name": "unnamedWire#215",
@@ -4994,11 +4775,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O50"
         },
         "pin2": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#21",
           "pinName": "O1"
         },
         "name": "unnamedWire#216",
@@ -5006,11 +4787,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#21",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O49"
         },
         "name": "unnamedWire#217",
@@ -5018,11 +4799,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#22",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O48"
         },
         "name": "unnamedWire#218",
@@ -5030,11 +4811,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O47"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#22",
           "pinName": "O2"
         },
         "name": "unnamedWire#219",
@@ -5042,11 +4823,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#22",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O46"
         },
         "name": "unnamedWire#220",
@@ -5054,11 +4835,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O45"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#22",
           "pinName": "O0"
         },
         "name": "unnamedWire#221",
@@ -5066,11 +4847,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#23",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O40"
         },
         "name": "unnamedWire#222",
@@ -5078,11 +4859,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O41"
         },
         "pin2": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#23",
           "pinName": "O1"
         },
         "name": "unnamedWire#223",
@@ -5090,11 +4871,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#23",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O42"
         },
         "name": "unnamedWire#224",
@@ -5102,11 +4883,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O43"
         },
         "pin2": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#23",
           "pinName": "O3"
         },
         "name": "unnamedWire#225",
@@ -5118,7 +4899,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O10"
         },
         "name": "unnamedWire#226",
@@ -5131,11 +4912,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#25",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#21",
           "pinName": "I"
         },
         "name": "unnamedWire#227",
@@ -5143,11 +4924,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#26",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#20",
           "pinName": "I"
         },
         "name": "unnamedWire#228",
@@ -5155,11 +4936,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#24",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#19",
           "pinName": "I"
         },
         "name": "unnamedWire#229",
@@ -5167,11 +4948,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#24",
           "pinName": "O0"
         },
         "name": "unnamedWire#230",
@@ -5179,11 +4960,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#24",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O1"
         },
         "name": "unnamedWire#231",
@@ -5191,11 +4972,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#24",
           "pinName": "O2"
         },
         "name": "unnamedWire#232",
@@ -5203,11 +4984,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#26",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O3"
         },
         "name": "unnamedWire#233",
@@ -5215,11 +4996,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#26",
           "pinName": "O1"
         },
         "name": "unnamedWire#234",
@@ -5227,11 +5008,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#26",
           "pinName": "O2"
         },
         "name": "unnamedWire#235",
@@ -5239,11 +5020,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#25",
           "pinName": "O0"
         },
         "name": "unnamedWire#236",
@@ -5251,7 +5032,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#25",
           "pinName": "O1"
         },
         "pin2": {
@@ -5263,11 +5044,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#25",
           "pinName": "O2"
         },
         "name": "unnamedWire#238",
@@ -5279,7 +5060,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "O7"
         },
         "name": "unnamedWire#239",
@@ -5287,7 +5068,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
         "pin2": {
@@ -5312,12 +5093,12 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#47",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "RWmach"
         },
         "name": "unnamedWire#241",
         "path": [
@@ -5326,19 +5107,23 @@
             "y": 320.0
           },
           {
-            "x": 100.0,
+            "x": 150.0,
             "y": 320.0
+          },
+          {
+            "x": 150.0,
+            "y": 300.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "Am2900MPROM#0",
+          "pinName": "A"
         },
         "name": "unnamedWire#242",
         "path": [
@@ -5348,21 +5133,25 @@
           },
           {
             "x": 590.0,
-            "y": 335.0
+            "y": 290.0
           },
           {
-            "x": 240.0,
-            "y": 335.0
+            "x": 290.0,
+            "y": 290.0
+          },
+          {
+            "x": 290.0,
+            "y": 415.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#34",
           "pinName": "O3"
         },
         "name": "unnamedWire#243",
@@ -5370,11 +5159,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#34",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O14"
         },
         "name": "unnamedWire#244",
@@ -5382,11 +5171,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#34",
           "pinName": "O1"
         },
         "name": "unnamedWire#245",
@@ -5394,11 +5183,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#34",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O12"
         },
         "name": "unnamedWire#246",
@@ -5406,11 +5195,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#35",
           "pinName": "O3"
         },
         "name": "unnamedWire#247",
@@ -5418,11 +5207,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#35",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O10"
         },
         "name": "unnamedWire#248",
@@ -5430,11 +5219,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#35",
           "pinName": "O1"
         },
         "name": "unnamedWire#249",
@@ -5442,11 +5231,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#35",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O8"
         },
         "name": "unnamedWire#250",
@@ -5454,11 +5243,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#36",
           "pinName": "O3"
         },
         "name": "unnamedWire#251",
@@ -5466,11 +5255,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#36",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O6"
         },
         "name": "unnamedWire#252",
@@ -5478,11 +5267,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#36",
           "pinName": "O1"
         },
         "name": "unnamedWire#253",
@@ -5490,11 +5279,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#36",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O4"
         },
         "name": "unnamedWire#254",
@@ -5502,11 +5291,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#37",
           "pinName": "O3"
         },
         "name": "unnamedWire#255",
@@ -5514,11 +5303,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#37",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O2"
         },
         "name": "unnamedWire#256",
@@ -5526,11 +5315,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#37",
           "pinName": "O1"
         },
         "name": "unnamedWire#257",
@@ -5538,11 +5327,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#37",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "O0"
         },
         "name": "unnamedWire#258",
@@ -5550,11 +5339,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#30",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O15"
         },
         "name": "unnamedWire#259",
@@ -5562,11 +5351,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#30",
           "pinName": "O2"
         },
         "name": "unnamedWire#260",
@@ -5574,11 +5363,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#30",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O13"
         },
         "name": "unnamedWire#261",
@@ -5586,11 +5375,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#30",
           "pinName": "O0"
         },
         "name": "unnamedWire#262",
@@ -5598,11 +5387,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#31",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O11"
         },
         "name": "unnamedWire#263",
@@ -5610,11 +5399,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#31",
           "pinName": "O2"
         },
         "name": "unnamedWire#264",
@@ -5622,11 +5411,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#31",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O9"
         },
         "name": "unnamedWire#265",
@@ -5634,11 +5423,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#31",
           "pinName": "O0"
         },
         "name": "unnamedWire#266",
@@ -5646,11 +5435,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#32",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O7"
         },
         "name": "unnamedWire#267",
@@ -5658,11 +5447,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#32",
           "pinName": "O2"
         },
         "name": "unnamedWire#268",
@@ -5670,11 +5459,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#32",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O5"
         },
         "name": "unnamedWire#269",
@@ -5682,11 +5471,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#32",
           "pinName": "O0"
         },
         "name": "unnamedWire#270",
@@ -5694,11 +5483,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#33",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O3"
         },
         "name": "unnamedWire#271",
@@ -5706,11 +5495,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#33",
           "pinName": "O2"
         },
         "name": "unnamedWire#272",
@@ -5718,11 +5507,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#33",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O1"
         },
         "name": "unnamedWire#273",
@@ -5730,11 +5519,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#33",
           "pinName": "O0"
         },
         "name": "unnamedWire#274",
@@ -5746,7 +5535,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#28",
           "pinName": "I"
         },
         "name": "unnamedWire#275",
@@ -5763,7 +5552,7 @@
           "pinName": "S"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O74"
         },
         "name": "unnamedWire#276",
@@ -5792,7 +5581,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#18",
           "pinName": "I"
         },
         "pin2": {
@@ -5825,7 +5614,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#29",
           "pinName": "I"
         },
         "pin2": {
@@ -5918,18 +5707,6 @@
         "name": "unnamedWire#283",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
-        },
-        "name": "unnamedWire#284",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#19",
@@ -5939,19 +5716,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#285",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
-        },
-        "name": "unnamedWire#286",
+        "name": "unnamedWire#284",
         "path": []
       },
       {
@@ -5963,7 +5728,7 @@
           "compName": "WireCrossPoint#22",
           "pinName": ""
         },
-        "name": "unnamedWire#287",
+        "name": "unnamedWire#285",
         "path": [
           {
             "x": 450.0,
@@ -5980,7 +5745,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#288",
+        "name": "unnamedWire#286",
         "path": [
           {
             "x": 455.0,
@@ -5997,7 +5762,7 @@
           "compName": "dff16_invwe#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#289",
+        "name": "unnamedWire#287",
         "path": [
           {
             "x": 475.0,
@@ -6007,26 +5772,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#38",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "WireCrossPoint#12",
           "pinName": ""
         },
-        "name": "unnamedWire#290",
+        "name": "unnamedWire#288",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "dff16_invwe#0",
           "pinName": "_WE"
         },
-        "name": "unnamedWire#291",
+        "name": "unnamedWire#289",
         "path": [
           {
             "x": 355.0,
@@ -6044,235 +5809,146 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#292",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 400.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#293",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#294",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#295",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#40",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O4"
         },
-        "name": "unnamedWire#296",
+        "name": "unnamedWire#290",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#40",
           "pinName": "O1"
         },
-        "name": "unnamedWire#297",
+        "name": "unnamedWire#291",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#40",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
-        "name": "unnamedWire#298",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O7"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O11"
-        },
-        "name": "unnamedWire#299",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#300",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O5"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O9"
-        },
-        "name": "unnamedWire#301",
+        "name": "unnamedWire#292",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#39",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_1"
         },
-        "name": "unnamedWire#302",
+        "name": "unnamedWire#293",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#39",
           "pinName": "O2"
         },
-        "name": "unnamedWire#303",
+        "name": "unnamedWire#294",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#39",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_3"
         },
-        "name": "unnamedWire#304",
+        "name": "unnamedWire#295",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#39",
           "pinName": "O0"
         },
-        "name": "unnamedWire#305",
+        "name": "unnamedWire#296",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#41",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_1"
         },
-        "name": "unnamedWire#306",
+        "name": "unnamedWire#297",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#41",
           "pinName": "O2"
         },
-        "name": "unnamedWire#307",
+        "name": "unnamedWire#298",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#41",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_3"
         },
-        "name": "unnamedWire#308",
+        "name": "unnamedWire#299",
         "path": []
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#41",
           "pinName": "O0"
         },
-        "name": "unnamedWire#309",
+        "name": "unnamedWire#300",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#39",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#22",
           "pinName": "I"
         },
-        "name": "unnamedWire#310",
+        "name": "unnamedWire#301",
         "path": [
           {
             "x": 600.0,
@@ -6298,14 +5974,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#23",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#41",
           "pinName": "I"
         },
-        "name": "unnamedWire#311",
+        "name": "unnamedWire#302",
         "path": [
           {
             "x": 760.0,
@@ -6339,14 +6015,14 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O44"
         },
-        "name": "unnamedWire#312",
+        "name": "unnamedWire#303",
         "path": [
           {
             "x": 605.0,
@@ -6380,14 +6056,14 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O39"
         },
-        "name": "unnamedWire#313",
+        "name": "unnamedWire#304",
         "path": [
           {
             "x": 615.0,
@@ -6425,10 +6101,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#27",
           "pinName": "I"
         },
-        "name": "unnamedWire#314",
+        "name": "unnamedWire#305",
         "path": [
           {
             "x": 820.0,
@@ -6449,7 +6125,7 @@
           "compName": "WireCrossPoint#27",
           "pinName": ""
         },
-        "name": "unnamedWire#315",
+        "name": "unnamedWire#306",
         "path": []
       },
       {
@@ -6461,7 +6137,7 @@
           "compName": "WireCrossPoint#28",
           "pinName": ""
         },
-        "name": "unnamedWire#316",
+        "name": "unnamedWire#307",
         "path": []
       },
       {
@@ -6473,7 +6149,7 @@
           "compName": "Am2901#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#317",
+        "name": "unnamedWire#308",
         "path": [
           {
             "x": 820.0,
@@ -6490,7 +6166,7 @@
           "compName": "Am2901#1",
           "pinName": "I"
         },
-        "name": "unnamedWire#318",
+        "name": "unnamedWire#309",
         "path": [
           {
             "x": 945.0,
@@ -6507,7 +6183,7 @@
           "compName": "Am2901#2",
           "pinName": "I"
         },
-        "name": "unnamedWire#319",
+        "name": "unnamedWire#310",
         "path": [
           {
             "x": 1070.0,
@@ -6524,7 +6200,7 @@
           "compName": "Am2901#3",
           "pinName": "I"
         },
-        "name": "unnamedWire#320",
+        "name": "unnamedWire#311",
         "path": [
           {
             "x": 1205.0,
@@ -6538,14 +6214,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#30",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#3",
           "pinName": "Y"
         },
-        "name": "unnamedWire#321",
+        "name": "unnamedWire#312",
         "path": [
           {
             "x": 910.0,
@@ -6559,14 +6235,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#31",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#2",
           "pinName": "Y"
         },
-        "name": "unnamedWire#322",
+        "name": "unnamedWire#313",
         "path": [
           {
             "x": 950.0,
@@ -6580,14 +6256,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#32",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#1",
           "pinName": "Y"
         },
-        "name": "unnamedWire#323",
+        "name": "unnamedWire#314",
         "path": [
           {
             "x": 990.0,
@@ -6605,10 +6281,10 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#33",
           "pinName": "I"
         },
-        "name": "unnamedWire#324",
+        "name": "unnamedWire#315",
         "path": [
           {
             "x": 800.0,
@@ -6626,10 +6302,10 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#37",
           "pinName": "I"
         },
-        "name": "unnamedWire#325",
+        "name": "unnamedWire#316",
         "path": [
           {
             "x": 785.0,
@@ -6643,14 +6319,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#36",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#1",
           "pinName": "D"
         },
-        "name": "unnamedWire#326",
+        "name": "unnamedWire#317",
         "path": [
           {
             "x": 990.0,
@@ -6664,14 +6340,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#35",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#2",
           "pinName": "D"
         },
-        "name": "unnamedWire#327",
+        "name": "unnamedWire#318",
         "path": [
           {
             "x": 950.0,
@@ -6685,14 +6361,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#34",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901#3",
           "pinName": "D"
         },
-        "name": "unnamedWire#328",
+        "name": "unnamedWire#319",
         "path": [
           {
             "x": 910.0,
@@ -6713,7 +6389,7 @@
           "compName": "WireCrossPoint#29",
           "pinName": ""
         },
-        "name": "unnamedWire#329",
+        "name": "unnamedWire#320",
         "path": []
       },
       {
@@ -6725,20 +6401,13 @@
           "compName": "BitDisplay#1",
           "pinName": ""
         },
-        "name": "unnamedWire#330",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O4"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O8"
-        },
-        "name": "unnamedWire#331",
-        "path": []
+        "name": "unnamedWire#321",
+        "path": [
+          {
+            "x": 275.0,
+            "y": 35.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6749,7 +6418,7 @@
           "compName": "mux1_16#0",
           "pinName": "I0"
         },
-        "name": "unnamedWire#332",
+        "name": "unnamedWire#322",
         "path": [
           {
             "x": 250.0,
@@ -6766,19 +6435,24 @@
           "compName": "BitDisplay#2",
           "pinName": ""
         },
-        "name": "unnamedWire#333",
-        "path": []
+        "name": "unnamedWire#323",
+        "path": [
+          {
+            "x": 275.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#334",
+        "name": "unnamedWire#324",
         "path": [
           {
             "x": 340.0,
@@ -6788,47 +6462,43 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#5",
           "pinName": "A"
         },
-        "name": "unnamedWire#335",
+        "name": "unnamedWire#325",
         "path": [
           {
-            "x": 95.0,
+            "x": 270.0,
             "y": 230.0
           },
           {
-            "x": 95.0,
-            "y": 240.0
+            "x": 270.0,
+            "y": 270.0
+          },
+          {
+            "x": 120.0,
+            "y": 270.0
+          },
+          {
+            "x": 120.0,
+            "y": 290.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#32",
           "pinName": ""
         },
-        "name": "unnamedWire#336",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#337",
+        "name": "unnamedWire#326",
         "path": []
       },
       {
@@ -6840,7 +6510,7 @@
           "compName": "WireCrossPoint#30",
           "pinName": ""
         },
-        "name": "unnamedWire#338",
+        "name": "unnamedWire#327",
         "path": []
       },
       {
@@ -6852,84 +6522,40 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#339",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O6"
-        },
-        "name": "unnamedWire#340",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O5"
-        },
-        "name": "unnamedWire#341",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O4"
-        },
-        "name": "unnamedWire#342",
+        "name": "unnamedWire#328",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Amem"
         },
         "pin2": {
-          "compName": "mux1_12#0",
-          "pinName": "I0"
+          "compName": "Am2900MainMemory#0",
+          "pinName": "A"
         },
-        "name": "unnamedWire#343",
+        "name": "unnamedWire#329",
         "path": [
           {
-            "x": 260.0,
-            "y": 440.0
+            "x": 210.0,
+            "y": 285.0
+          },
+          {
+            "x": 210.0,
+            "y": 135.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#53",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#344",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#8",
           "pinName": "O38"
         },
         "pin2": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
-        "name": "unnamedWire#345",
+        "name": "unnamedWire#330",
         "path": [
           {
             "x": 725.0,
@@ -6943,26 +6569,26 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#54",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#346",
+        "name": "unnamedWire#331",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "pin2": {
           "compName": "dff16#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#347",
+        "name": "unnamedWire#332",
         "path": [
           {
             "x": 365.0,
@@ -6972,19 +6598,15 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "pin2": {
           "compName": "dff16_invwe#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#348",
+        "name": "unnamedWire#333",
         "path": [
-          {
-            "x": 480.0,
-            "y": 265.0
-          },
           {
             "x": 480.0,
             "y": 170.0
@@ -6993,14 +6615,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "pin2": {
           "compName": "Am2910#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#349",
+        "name": "unnamedWire#334",
         "path": [
           {
             "x": 440.0,
@@ -7010,259 +6632,34 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "pin2": {
           "compName": "BitDisplay#0",
           "pinName": ""
         },
-        "name": "unnamedWire#350",
+        "name": "unnamedWire#335",
         "path": []
       },
       {
         "pin1": {
           "compName": "Am2900MainMemory#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "dff16#1",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#351",
-        "path": [
-          {
-            "x": 170.0,
-            "y": 100.0
-          },
-          {
-            "x": 170.0,
-            "y": 125.0
-          },
-          {
-            "x": 230.0,
-            "y": 125.0
-          },
-          {
-            "x": 230.0,
-            "y": 90.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#42",
-          "pinName": ""
-        },
-        "name": "unnamedWire#352",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "name": "unnamedWire#353",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#0",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#354",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
-        },
-        "name": "unnamedWire#355",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#356",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff16#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#357",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 70.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#1",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "EN"
-        },
-        "name": "unnamedWire#358",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 245.0
-          },
-          {
-            "x": 220.0,
-            "y": 200.0
-          },
-          {
-            "x": 195.0,
-            "y": 200.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#0",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#6",
-          "pinName": "EN"
-        },
-        "name": "unnamedWire#359",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 275.0
-          },
-          {
-            "x": 225.0,
-            "y": 170.0
-          },
-          {
-            "x": 195.0,
-            "y": 170.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#47",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#53",
-          "pinName": ""
-        },
-        "name": "unnamedWire#360",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#50",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#361",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#50",
-          "pinName": ""
+          "pinName": "RW"
         },
         "pin2": {
-          "compName": "and#3",
-          "pinName": "B"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "RWmem"
         },
-        "name": "unnamedWire#362",
+        "name": "unnamedWire#336",
         "path": [
           {
-            "x": 100.0,
-            "y": 265.0
-          },
-          {
-            "x": 120.0,
-            "y": 265.0
+            "x": 215.0,
+            "y": 175.0
           },
           {
-            "x": 120.0,
-            "y": 255.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#7",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "and#4",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#363",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#364",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#4",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#365",
-        "path": [
-          {
-            "x": 125.0,
-            "y": 275.0
+            "x": 215.0,
+            "y": 300.0
           }
         ]
       },
@@ -7272,170 +6669,47 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "name": "unnamedWire#366",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#367",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#4",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#368",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#51",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
-        },
-        "name": "unnamedWire#369",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 45.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#6",
-          "pinName": "OUT"
-        },
-        "name": "unnamedWire#370",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#371",
-        "path": [
-          {
-            "x": 165.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "TriStateBuffer#6",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#51",
-          "pinName": ""
-        },
-        "name": "unnamedWire#372",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#53",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#50",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "EN"
         },
-        "name": "unnamedWire#373",
+        "name": "unnamedWire#337",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#47",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#2",
-          "pinName": "D"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "C"
         },
-        "name": "unnamedWire#374",
+        "name": "unnamedWire#338",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#54",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#2",
-          "pinName": "C"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "_C"
         },
-        "name": "unnamedWire#375",
+        "name": "unnamedWire#339",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#54",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
-        "name": "unnamedWire#376",
+        "name": "unnamedWire#340",
         "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dff#2",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "RW"
-        },
-        "name": "unnamedWire#377",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 300.0
-          },
-          {
-            "x": 230.0,
-            "y": 210.0
-          },
-          {
-            "x": 160.0,
-            "y": 210.0
-          },
-          {
-            "x": 160.0,
-            "y": 140.0
-          }
-        ]
       }
     ],
     "version": "0.1.1"
@@ -7500,6 +6774,12 @@
           "delegateTarget": "Am2900MicroInstructionMemory#0"
         }
       },
+      "mprom": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "Am2900MPROM#0"
+        }
+      },
       "muir_1": {
         "id": "delegating",
         "params": {
@@ -7525,7 +6805,17 @@
         }
       }
     },
-    "atomicHighLevelStates": {}
+    "atomicHighLevelStates": {
+      "mpm_address": {
+        "id": "wireForcing",
+        "params": {
+          "wiresToForce": [
+            "unnamedWire#163"
+          ],
+          "wiresToForceInverted": []
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file