Adjusted layouts of Am2900 and Am2910

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / Am2900.json

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 8b2c9cf..eadd2da 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -9,8 +9,16 @@
         "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,7 +100,7 @@
         "name": "BitDisplay#2",
         "pos": {
           "x": 280.0,
-          "y": 60.0
+          "y": 65.0
         },
         "params": 16
       },
@@ -100,11 +108,11 @@
         "id": "Clock",
         "name": "Clock#0",
         "pos": {
-          "x": 75.0,
-          "y": 365.0
+          "x": 115.0,
+          "y": 355.0
         },
         "params": {
-          "delta": 500,
+          "delta": 7000,
           "orientation": "RIGHT"
         }
       },
@@ -112,7 +120,7 @@
         "id": "FixedOutput",
         "name": "FixedOutput#0",
         "pos": {
-          "x": 540.0,
+          "x": 555.0,
           "y": 270.0
         },
         "params": {
@@ -125,8 +133,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#1",
         "pos": {
-          "x": 635.0,
-          "y": 380.0
+          "x": 645.0,
+          "y": 390.0
         },
         "params": {
           "bits": [
@@ -138,8 +146,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#2",
         "pos": {
-          "x": 365.0,
-          "y": 505.0
+          "x": 385.0,
+          "y": 510.0
         },
         "params": {
           "bits": [
@@ -164,7 +172,7 @@
         "id": "FixedOutput",
         "name": "FixedOutput#4",
         "pos": {
-          "x": 420.0,
+          "x": 430.0,
           "y": 570.0
         },
         "params": {
@@ -177,8 +185,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#5",
         "pos": {
-          "x": 475.0,
-          "y": 505.0
+          "x": 485.0,
+          "y": 510.0
         },
         "params": {
           "bits": [
@@ -190,8 +198,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#6",
         "pos": {
-          "x": 535.0,
-          "y": 370.0
+          "x": 545.0,
+          "y": 380.0
         },
         "params": {
           "bits": [
@@ -203,8 +211,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#7",
         "pos": {
-          "x": 260.0,
-          "y": 370.0
+          "x": 270.0,
+          "y": 380.0
         },
         "params": {
           "bits": [
@@ -212,24 +220,6 @@
           ]
         }
       },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#0",
-        "pos": {
-          "x": 75.0,
-          "y": 347.5
-        },
-        "params": 1
-      },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#1",
-        "pos": {
-          "x": 75.0,
-          "y": 387.5
-        },
-        "params": 1
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -279,8 +269,8 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 60.0,
-          "y": 235.0
+          "x": 125.0,
+          "y": 285.0
         },
         "params": 1
       },
@@ -288,20 +278,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": 65.0,
-          "y": 270.0
-        },
-        "params": 1
-      },
       {
         "id": "Splitter",
         "name": "Splitter#0",
@@ -835,7 +816,7 @@
         "name": "TextComponent#0",
         "pos": {
           "x": 305.0,
-          "y": 30.0
+          "y": 25.0
         },
         "params": "D bus"
       },
@@ -844,7 +825,7 @@
         "name": "TextComponent#1",
         "pos": {
           "x": 305.0,
-          "y": 60.0
+          "y": 55.0
         },
         "params": "A bus"
       },
@@ -905,30 +886,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#5",
-        "pos": {
-          "x": 185.0,
-          "y": 145.0
-        },
-        "params": {
-          "logicWidth": 16,
-          "orientation": "LEFT"
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -1275,7 +1232,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#38",
         "pos": {
-          "x": 174.0,
+          "x": 169.0,
           "y": 384.0
         },
         "params": 1
@@ -1293,7 +1250,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#40",
         "pos": {
-          "x": 144.0,
+          "x": 139.0,
           "y": 364.0
         },
         "params": 1
@@ -1302,7 +1259,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#41",
         "pos": {
-          "x": 144.0,
+          "x": 139.0,
           "y": 379.0
         },
         "params": 1
@@ -1311,8 +1268,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#42",
         "pos": {
-          "x": 364.0,
-          "y": 289.0
+          "x": 479.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1329,89 +1286,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#44",
         "pos": {
-          "x": 174.0,
-          "y": 289.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#45",
-        "pos": {
-          "x": 129.0,
-          "y": 304.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#46",
-        "pos": {
-          "x": 129.0,
-          "y": 279.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#47",
-        "pos": {
-          "x": 59.0,
-          "y": 294.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#48",
-        "pos": {
-          "x": 84.0,
-          "y": 244.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#49",
-        "pos": {
-          "x": 59.0,
-          "y": 274.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#50",
-        "pos": {
-          "x": 234.0,
-          "y": 154.0
-        },
-        "params": 16
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#51",
-        "pos": {
-          "x": 164.0,
-          "y": 154.0
-        },
-        "params": 16
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#52",
-        "pos": {
-          "x": 59.0,
-          "y": 284.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#53",
-        "pos": {
-          "x": 174.0,
-          "y": 314.0
+          "x": 364.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1439,30 +1315,6 @@
           "y": 595.0
         }
       },
-      {
-        "id": "and",
-        "name": "and#3",
-        "pos": {
-          "x": 90.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#4",
-        "pos": {
-          "x": 90.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "and#5",
-        "pos": {
-          "x": 185.0,
-          "y": 240.0
-        }
-      },
       {
         "id": "dff16",
         "name": "dff16#0",
@@ -1471,14 +1323,6 @@
           "y": 105.0
         }
       },
-      {
-        "id": "dff16",
-        "name": "dff16#1",
-        "pos": {
-          "x": 180.0,
-          "y": 65.0
-        }
-      },
       {
         "id": "dff16_invwe",
         "name": "dff16_invwe#0",
@@ -1487,30 +1331,6 @@
           "y": 165.0
         }
       },
-      {
-        "id": "dff",
-        "name": "dff#0",
-        "pos": {
-          "x": 135.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#1",
-        "pos": {
-          "x": 135.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#2",
-        "pos": {
-          "x": 135.0,
-          "y": 290.0
-        }
-      },
       {
         "id": "dlatch80",
         "name": "dlatch80#0",
@@ -1528,20 +1348,11 @@
         }
       },
       {
-        "id": "inc",
-        "name": "inc#0",
-        "pos": {
-          "x": 315.0,
-          "y": 135.0
-        },
-        "params": 16
-      },
-      {
-        "id": "mux1",
-        "name": "mux1#0",
+        "id": "inc16",
+        "name": "inc16#0",
         "pos": {
-          "x": 105.0,
-          "y": 360.0
+          "x": 335.0,
+          "y": 115.0
         }
       },
       {
@@ -1565,7 +1376,7 @@
         "name": "mux1_12#0",
         "pos": {
           "x": 365.0,
-          "y": 420.0
+          "y": 415.0
         }
       },
       {
@@ -1606,16 +1417,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,
@@ -2361,7 +2172,7 @@
         "path": [
           {
             "x": 660.0,
-            "y": 390.0
+            "y": 395.0
           }
         ]
       },
@@ -2389,12 +2200,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
           }
         ]
       },
@@ -2411,7 +2222,7 @@
         "path": [
           {
             "x": 445.0,
-            "y": 580.0
+            "y": 575.0
           }
         ]
       },
@@ -2440,7 +2251,7 @@
         "path": [
           {
             "x": 560.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -2618,7 +2429,7 @@
         "path": [
           {
             "x": 570.0,
-            "y": 280.0
+            "y": 275.0
           }
         ]
       },
@@ -3178,7 +2989,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#93",
@@ -3186,8 +2997,8 @@
       },
       {
         "pin1": {
-          "compName": "mux1#0",
-          "pinName": "Y"
+          "compName": "Clock#0",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#40",
@@ -3220,7 +3031,7 @@
         "name": "unnamedWire#96",
         "path": [
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 390.0
           }
         ]
@@ -3261,7 +3072,7 @@
         "name": "unnamedWire#99",
         "path": [
           {
-            "x": 175.0,
+            "x": 170.0,
             "y": 485.0
           },
           {
@@ -3280,7 +3091,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "name": "unnamedWire#100",
@@ -3658,12 +3469,12 @@
             "y": 325.0
           },
           {
-            "x": 55.0,
+            "x": 120.0,
             "y": 325.0
           },
           {
-            "x": 55.0,
-            "y": 250.0
+            "x": 120.0,
+            "y": 300.0
           }
         ]
       },
@@ -3715,39 +3526,59 @@
       },
       {
         "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#51",
-          "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
           }
         ]
       },
@@ -3778,7 +3609,7 @@
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -3786,16 +3617,11 @@
           "pinName": "D"
         },
         "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 130.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "A"
         },
         "pin2": {
@@ -3805,14 +3631,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": {
@@ -3821,9 +3651,17 @@
         },
         "name": "unnamedWire#130",
         "path": [
+          {
+            "x": 330.0,
+            "y": 120.0
+          },
+          {
+            "x": 330.0,
+            "y": 160.0
+          },
           {
             "x": 360.0,
-            "y": 145.0
+            "y": 160.0
           },
           {
             "x": 360.0,
@@ -3873,7 +3711,7 @@
         "path": [
           {
             "x": 285.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -3896,18 +3734,22 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "OUT"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Dmem"
         },
         "pin2": {
-          "compName": "WireCrossPoint#50",
-          "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
           }
         ]
       },
@@ -3932,7 +3774,7 @@
           },
           {
             "x": 360.0,
-            "y": 425.0
+            "y": 420.0
           }
         ]
       },
@@ -4228,7 +4070,7 @@
         "path": [
           {
             "x": 435.0,
-            "y": 450.0
+            "y": 445.0
           }
         ]
       },
@@ -4245,7 +4087,7 @@
         "path": [
           {
             "x": 350.0,
-            "y": 480.0
+            "y": 475.0
           },
           {
             "x": 350.0,
@@ -5344,8 +5186,8 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#47",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "RWmach"
         },
         "name": "unnamedWire#241",
         "path": [
@@ -5354,8 +5196,12 @@
             "y": 320.0
           },
           {
-            "x": 60.0,
+            "x": 150.0,
             "y": 320.0
+          },
+          {
+            "x": 150.0,
+            "y": 300.0
           }
         ]
       },
@@ -6754,7 +6600,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#330",
-        "path": []
+        "path": [
+          {
+            "x": 275.0,
+            "y": 35.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6795,7 +6646,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#333",
-        "path": []
+        "path": [
+          {
+            "x": 275.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6826,12 +6682,20 @@
         "name": "unnamedWire#335",
         "path": [
           {
-            "x": 55.0,
+            "x": 270.0,
             "y": 230.0
           },
           {
-            "x": 55.0,
-            "y": 240.0
+            "x": 270.0,
+            "y": 270.0
+          },
+          {
+            "x": 120.0,
+            "y": 270.0
+          },
+          {
+            "x": 120.0,
+            "y": 290.0
           }
         ]
       },
@@ -6932,21 +6796,30 @@
         "path": [
           {
             "x": 260.0,
-            "y": 440.0
+            "y": 435.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
+          "compName": "Am2900MemoryController#0",
+          "pinName": "Amem"
         },
         "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "B"
+          "compName": "Am2900MainMemory#0",
+          "pinName": "A"
         },
         "name": "unnamedWire#344",
-        "path": []
+        "path": [
+          {
+            "x": 210.0,
+            "y": 285.0
+          },
+          {
+            "x": 210.0,
+            "y": 135.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6971,11 +6844,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "name": "unnamedWire#346",
@@ -6983,7 +6856,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
@@ -7009,10 +6882,6 @@
         },
         "name": "unnamedWire#348",
         "path": [
-          {
-            "x": 480.0,
-            "y": 290.0
-          },
           {
             "x": 480.0,
             "y": 170.0
@@ -7051,251 +6920,21 @@
       {
         "pin1": {
           "compName": "Am2900MainMemory#0",
-          "pinName": "A"
+          "pinName": "RW"
         },
         "pin2": {
-          "compName": "dff16#1",
-          "pinName": "Q"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "RWmem"
         },
         "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#53",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
-        },
-        "name": "unnamedWire#353",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#53",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "name": "unnamedWire#354",
-        "path": [
-          {
-            "x": 130.0,
-            "y": 315.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff16#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#355",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 70.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#356",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#45",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#46",
-          "pinName": ""
-        },
-        "name": "unnamedWire#357",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "EN"
-        },
-        "name": "unnamedWire#358",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 245.0
-          },
-          {
-            "x": 225.0,
-            "y": 200.0
-          },
-          {
-            "x": 195.0,
-            "y": 200.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#0",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "EN"
-        },
-        "name": "unnamedWire#359",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 270.0
-          },
-          {
-            "x": 230.0,
-            "y": 170.0
-          },
-          {
-            "x": 195.0,
-            "y": 170.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#47",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
-        },
-        "name": "unnamedWire#360",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#7",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#361",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#362",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#4",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#363",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#364",
-        "path": [
-          {
-            "x": 60.0,
-            "y": 260.0
-          },
-          {
-            "x": 80.0,
-            "y": 260.0
+            "x": 215.0,
+            "y": 175.0
           },
           {
-            "x": 80.0,
-            "y": 255.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#4",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#365",
-        "path": [
-          {
-            "x": 85.0,
-            "y": 270.0
+            "x": 215.0,
+            "y": 300.0
           }
         ]
       },
@@ -7305,257 +6944,46 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "name": "unnamedWire#366",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#367",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#7",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "and#4",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#368",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#50",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
-        },
-        "name": "unnamedWire#369",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 45.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#51",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "OUT"
-        },
-        "name": "unnamedWire#370",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#51",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#371",
-        "path": [
-          {
-            "x": 165.0,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#50",
-          "pinName": ""
-        },
-        "name": "unnamedWire#372",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#52",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#49",
-          "pinName": ""
-        },
-        "name": "unnamedWire#373",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#47",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "D"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "EN"
         },
-        "name": "unnamedWire#374",
+        "name": "unnamedWire#352",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#0",
+          "compName": "Am2900MemoryController#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#375",
+        "name": "unnamedWire#353",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#376",
-        "path": [
-          {
-            "x": 130.0,
-            "y": 255.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#2",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "RW"
+          "compName": "Am2900MemoryController#0",
+          "pinName": "_C"
         },
-        "name": "unnamedWire#377",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 295.0
-          },
-          {
-            "x": 235.0,
-            "y": 210.0
-          },
-          {
-            "x": 160.0,
-            "y": 210.0
-          },
-          {
-            "x": 160.0,
-            "y": 140.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#1",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "and#5",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#378",
+        "name": "unnamedWire#354",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#39",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#5",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#379",
-        "path": [
-          {
-            "x": 180.0,
-            "y": 255.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#380",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 355.0
-          },
-          {
-            "x": 100.0,
-            "y": 365.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#1",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#381",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 395.0
-          },
-          {
-            "x": 100.0,
-            "y": 385.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Clock#0",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I0"
-        },
-        "name": "unnamedWire#382",
+        "name": "unnamedWire#355",
         "path": []
       }
     ],
@@ -7646,7 +7074,17 @@
         }
       }
     },
-    "atomicHighLevelStates": {}
+    "atomicHighLevelStates": {
+      "mpm_address": {
+        "id": "wireForcing",
+        "params": {
+          "wiresToForce": [
+            "unnamedWire#163"
+          ],
+          "wiresToForceInverted": []
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file