GUIWires now have names

author Daniel Kirschten <daniel.kirschten@gmx.de>

Mon, 15 Jul 2019 16:35:42 +0000 (18:35 +0200)

committer Daniel Kirschten <daniel.kirschten@gmx.de>

Mon, 15 Jul 2019 16:39:33 +0000 (18:39 +0200)
author Daniel Kirschten <daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 16:35:42 +0000 (18:35 +0200)
committer Daniel Kirschten <daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 16:39:33 +0000 (18:39 +0200)
diff --git a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json

index 1e846c4..f644070 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@ -40,110 +40,115 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 40.0,
            "y": 12.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 7.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 64.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 34.0,
            "y": 16.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_S"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "_Q"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_R"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Q"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
              "x": 35.0,
-            "y": 37.5
+            "y": 17.5
            },
            {
              "x": 35.0,
-            "y": 27.5
+            "y": 7.5
+          },
+          {
+            "x": 65.0,
+            "y": 7.5
+          },
+          {
+            "x": 65.0,
+            "y": 12.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "_R"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "GUINandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "pinName": "B"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 65.0,
-            "y": 22.5
+            "x": 35.0,
+            "y": 37.5
+          },
+          {
+            "x": 35.0,
+            "y": 27.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "_S"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
@@ -155,6 +160,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 65.0,
@@ -176,37 +182,39 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
          "path": [
-          {
-            "x": 35.0,
-            "y": 17.5
-          },
-          {
-            "x": 35.0,
-            "y": 7.5
-          },
            {
              "x": 65.0,
-            "y": 7.5
-          },
-          {
-            "x": 65.0,
-            "y": 12.5
+            "y": 22.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Q"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIand.json b/net.mograsim.logic.model.am2900/components/GUIand.json

index c19d8f9..bb69f11 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIand.json
+++ b/net.mograsim.logic.model.am2900/components/GUIand.json
@@ -32,30 +32,30 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 50.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 20.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 44.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        }
      ],
@@ -63,33 +63,35 @@ mograsim version: 0.1.3
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "A"
+          "pinName": "B"
          },
          "pin2": {
            "compName": "GUINandGate#0",
-          "pinName": "A"
-        }
+          "pinName": "B"
+        },
+        "name": "unnamedWire#1"
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B"
+          "pinName": "A"
          },
          "pin2": {
            "compName": "GUINandGate#0",
-          "pinName": "B"
-        }
+          "pinName": "A"
+        },
+        "name": "unnamedWire#0"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y"
          },
-        "path": []
+        "name": "unnamedWire#5"
        },
        {
          "pin1": {
@@ -98,12 +100,13 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#1",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
              "x": 45.0,
-            "y": 20.0
+            "y": 30.0
            }
          ]
        },
@@ -114,24 +117,27 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#1",
-          "pinName": "B"
+          "pinName": "A"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
              "x": 45.0,
-            "y": 30.0
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        }
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIand41.json b/net.mograsim.logic.model.am2900/components/GUIand41.json

index 98ebfa1..dae4dfd 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIand41.json
+++ b/net.mograsim.logic.model.am2900/components/GUIand41.json
@@ -80,135 +80,124 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 24.0,
            "y": 71.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 24.0,
            "y": 46.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 24.0,
            "y": 96.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 30.0,
            "y": 7.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#2",
          "pos": {
            "x": 30.0,
            "y": 57.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#2"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#1",
          "pos": {
            "x": 30.0,
            "y": 32.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#1"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#3",
          "pos": {
            "x": 30.0,
            "y": 82.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#3"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "GUIand#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "GUIand#1",
-          "pinName": "A"
+          "pinName": "Y4"
          },
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "GUIand#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#2",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#3",
-          "pinName": "A"
+          "compName": "GUIand#1",
+          "pinName": "B"
          },
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 25.0,
-            "y": 112.5
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#3",
+          "compName": "GUIand#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
@@ -220,39 +209,43 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUIand#2",
-          "pinName": "B"
+          "compName": "GUIand#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#1",
+          "compName": "GUIand#3",
            "pinName": "B"
          },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
@@ -264,6 +257,7 @@ mograsim version: 0.1.3
            "compName": "GUIand#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 25.0,
@@ -273,13 +267,31 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B"
          },
          "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 112.5
+          }
+        ]
+      },
+      {
+        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "pinName": "A4"
          },
+        "pin2": {
+          "compName": "GUIand#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
          "path": []
        },
        {
@@ -291,28 +303,31 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Y2"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#2",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "GUIand#2",
+          "pinName": "A"
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#3",
+          "compName": "GUIand#0",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "pinName": "Y1"
          },
+        "name": "unnamedWire#11",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIandor414.json b/net.mograsim.logic.model.am2900/components/GUIandor414.json

index 3042690..939965a 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIandor414.json
+++ b/net.mograsim.logic.model.am2900/components/GUIandor414.json
@@ -112,133 +112,159 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUIor_4",
+        "name": "GUIor_4#0",
          "pos": {
            "x": 35.0,
            "y": 37.5
-        },
-        "id": "GUIor_4",
-        "name": "GUIor_4#0"
+        }
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#0",
          "pos": {
            "x": 15.0,
            "y": 137.5
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#0"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "GUIor_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
          },
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 10.0,
-            "y": 112.5
+            "x": 80.0,
+            "y": 52.5
            },
            {
-            "x": 10.0,
-            "y": 142.5
+            "x": 80.0,
+            "y": 37.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "GUIor_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A2"
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
          },
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 5.0,
-            "y": 137.5
+            "x": 75.0,
+            "y": 42.5
            },
            {
-            "x": 5.0,
-            "y": 152.5
+            "x": 75.0,
+            "y": 12.5
            }
          ]
        },
        {
          "pin1": {
+          "compName": "GUIor_4#0",
+          "pinName": "Y4"
+        },
+        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "A3"
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 72.5
+          },
+          {
+            "x": 80.0,
+            "y": 87.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIor_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
          },
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "GUIand41#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A4"
+          "compName": "GUIor_4#0",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 5.0,
-            "y": 187.5
+            "x": 70.0,
+            "y": 142.5
            },
            {
-            "x": 5.0,
-            "y": 172.5
+            "x": 70.0,
+            "y": 120.0
+          },
+          {
+            "x": 30.0,
+            "y": 120.0
+          },
+          {
+            "x": 30.0,
+            "y": 82.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B"
+          "pinName": "C4"
          },
          "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "B"
+          "compName": "GUIor_4#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 10.0,
-            "y": 212.5
+            "x": 5.0,
+            "y": 87.5
            },
            {
-            "x": 10.0,
-            "y": 182.5
+            "x": 5.0,
+            "y": 72.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C1"
+          "pinName": "C3"
          },
          "pin2": {
            "compName": "GUIor_4#0",
-          "pinName": "A1"
+          "pinName": "A3"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 12.5
-          },
-          {
-            "x": 10.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
@@ -249,6 +275,7 @@ mograsim version: 0.1.3
            "compName": "GUIor_4#0",
            "pinName": "A2"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
              "x": 5.0,
@@ -263,59 +290,63 @@ mograsim version: 0.1.3
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C3"
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUIor_4#0",
-          "pinName": "A3"
+          "compName": "GUIand41#0",
+          "pinName": "A2"
          },
-        "path": []
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 137.5
+          },
+          {
+            "x": 5.0,
+            "y": 152.5
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C4"
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUIor_4#0",
-          "pinName": "A4"
+          "compName": "GUIand41#0",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#0",
          "path": [
            {
-            "x": 5.0,
-            "y": 87.5
+            "x": 10.0,
+            "y": 112.5
            },
            {
-            "x": 5.0,
-            "y": 72.5
+            "x": 10.0,
+            "y": 142.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "C1"
          },
          "pin2": {
            "compName": "GUIor_4#0",
-          "pinName": "B1"
+          "pinName": "A1"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 70.0,
-            "y": 142.5
-          },
-          {
-            "x": 70.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 120.0
+            "x": 10.0,
+            "y": 12.5
            },
            {
-            "x": 30.0,
-            "y": 82.5
+            "x": 10.0,
+            "y": 42.5
            }
          ]
        },
@@ -328,6 +359,7 @@ mograsim version: 0.1.3
            "compName": "GUIor_4#0",
            "pinName": "B2"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 65.0,
@@ -349,29 +381,43 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "GUIor_4#0",
-          "pinName": "B3"
+          "compName": "GUIand41#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 60.0,
-            "y": 162.5
+            "x": 10.0,
+            "y": 212.5
            },
            {
-            "x": 60.0,
-            "y": 130.0
-          },
+            "x": 10.0,
+            "y": 182.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "GUIand41#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#3",
+        "path": [
            {
-            "x": 20.0,
-            "y": 130.0
+            "x": 5.0,
+            "y": 187.5
            },
            {
-            "x": 20.0,
-            "y": 102.5
+            "x": 5.0,
+            "y": 172.5
            }
          ]
        },
@@ -384,6 +430,7 @@ mograsim version: 0.1.3
            "compName": "GUIor_4#0",
            "pinName": "B4"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 55.0,
@@ -405,72 +452,42 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIor_4#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y1"
-        },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 42.5
-          },
-          {
-            "x": 75.0,
-            "y": 12.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUIor_4#0",
-          "pinName": "Y2"
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "GUIand41#0",
+          "pinName": "A3"
          },
-        "path": [
-          {
-            "x": 80.0,
-            "y": 52.5
-          },
-          {
-            "x": 80.0,
-            "y": 37.5
-          }
-        ]
+        "name": "unnamedWire#2",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIor_4#0",
+          "compName": "GUIand41#0",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "GUIor_4#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "pinName": "B3"
          },
+        "name": "unnamedWire#11",
          "path": [
            {
-            "x": 80.0,
-            "y": 72.5
+            "x": 60.0,
+            "y": 162.5
            },
            {
-            "x": 80.0,
-            "y": 87.5
+            "x": 60.0,
+            "y": 130.0
+          },
+          {
+            "x": 20.0,
+            "y": 130.0
+          },
+          {
+            "x": 20.0,
+            "y": 102.5
            }
          ]
        }
diff --git a/net.mograsim.logic.model.am2900/components/GUIdemux2.json b/net.mograsim.logic.model.am2900/components/GUIdemux2.json

index 29440a2..383337a 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIdemux2.json
+++ b/net.mograsim.logic.model.am2900/components/GUIdemux2.json
@@ -56,215 +56,242 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 10.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 40.0,
            "y": 2.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#2",
          "pos": {
            "x": 40.0,
            "y": 52.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#2"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#1",
          "pos": {
            "x": 40.0,
            "y": 27.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#1"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#3",
          "pos": {
            "x": 40.0,
            "y": 77.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#3"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 6.5,
            "y": 16.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 6.5,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 4.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 36.5,
            "y": 61.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 31.5,
            "y": 66.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 4.0,
            "y": 41.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 34.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 31.5,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIand#1",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 37.5,
+            "y": 32.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 17.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUIand#2",
            "pinName": "A"
          },
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 7.5,
-            "y": 7.5
+            "x": 32.5,
+            "y": 57.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUIand#1",
+          "pinName": "B"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 5.0,
-            "y": 32.5
+            "x": 35.0,
+            "y": 42.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIand#3",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#18",
+        "path": [
+          {
+            "x": 37.5,
+            "y": 82.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUIand#2",
+          "pinName": "B"
          },
+        "name": "unnamedWire#17",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUIand#3",
            "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#19",
+        "path": [
+          {
+            "x": 32.5,
+            "y": 92.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -272,10 +299,20 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 67.5
+          },
+          {
+            "x": 32.5,
+            "y": 67.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -286,6 +323,7 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#2",
            "pinName": ""
          },
+        "name": "unnamedWire#8",
          "path": [
            {
              "x": 7.5,
@@ -299,204 +337,190 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 67.5
-          },
-          {
-            "x": 32.5,
-            "y": 67.5
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "S1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 32.5,
-            "y": 7.5
-          }
-        ]
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 35.0,
-            "y": 17.5
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 37.5,
-            "y": 32.5
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUIand#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#1",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y01"
          },
-        "path": [
-          {
-            "x": 35.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#21"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 32.5,
-            "y": 57.5
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#2",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y00"
          },
-        "path": []
+        "name": "unnamedWire#20"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#3",
+          "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 37.5,
-            "y": 82.5
+            "x": 5.0,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#3",
-          "pinName": "B"
+          "compName": "GUIand#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 32.5,
-            "y": 92.5
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
+          "compName": "GUIand#3",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y00"
-        }
+          "pinName": "Y11"
+        },
+        "name": "unnamedWire#23"
        },
        {
          "pin1": {
-          "compName": "GUIand#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y01"
-        }
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 7.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIand#2",
+          "compName": "GUINandGate#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y10"
-        }
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#3",
+          "compName": "GUIand#2",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y11"
-        }
+          "pinName": "Y10"
+        },
+        "name": "unnamedWire#22"
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIdff.json b/net.mograsim.logic.model.am2900/components/GUIdff.json

index 80794ee..9d29afb 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIdff.json
+++ b/net.mograsim.logic.model.am2900/components/GUIdff.json
@@ -40,162 +40,145 @@ mograsim version: 0.1.3
      "innerScale": 0.2,
      "subComps": [
        {
+        "id": "GUI_rsLatch",
+        "name": "GUI_rsLatch#0",
          "pos": {
            "x": 40.0,
            "y": 10.0
-        },
-        "id": "GUI_rsLatch",
-        "name": "GUI_rsLatch#0"
+        }
        },
        {
+        "id": "GUInand3",
+        "name": "GUInand3#0",
          "pos": {
            "x": 40.0,
            "y": 40.0
-        },
-        "id": "GUInand3",
-        "name": "GUInand3#0"
+        }
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 120.0,
            "y": 60.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUI_rsLatch",
+        "name": "GUI_rsLatch#1",
          "pos": {
            "x": 120.0,
            "y": 30.0
-        },
-        "id": "GUI_rsLatch",
-        "name": "GUI_rsLatch#1"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 19.0,
            "y": 64.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 9.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 99.0,
            "y": 44.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 99.0,
            "y": 34.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
+          "compName": "GUI_rsLatch#1",
+          "pinName": "_Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "_Q"
          },
-        "path": []
+        "name": "unnamedWire#14"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUI_rsLatch#1",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "_R"
+          "compName": "_submodelinterface",
+          "pinName": "Q"
          },
-        "path": []
+        "name": "unnamedWire#13"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 55.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUI_rsLatch#1",
+          "pinName": "_S"
          },
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUInand3#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 145.0,
-            "y": 70.0
-          },
-          {
-            "x": 145.0,
-            "y": 85.0
+            "x": 30.0,
+            "y": 35.0
            },
            {
-            "x": 20.0,
-            "y": 85.0
+            "x": 30.0,
+            "y": 45.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUI_rsLatch#0",
+          "pinName": "_Q"
          },
          "pin2": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "_S"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 20.0,
-            "y": 15.0
+            "x": 100.0,
+            "y": 25.0
            }
          ]
        },
@@ -208,75 +191,97 @@ mograsim version: 0.1.3
            "compName": "GUInand3#0",
            "pinName": "C"
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
            "compName": "GUI_rsLatch#0",
-          "pinName": "_Q"
+          "pinName": "_R"
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 100.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "A"
+          "compName": "GUI_rsLatch#0",
+          "pinName": "_S"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 30.0,
-            "y": 35.0
-          },
-          {
-            "x": 30.0,
-            "y": 45.0
+            "x": 20.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUInand3#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUI_rsLatch#1",
-          "pinName": "_S"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUInand3#0",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 145.0,
+            "y": 70.0
+          },
+          {
+            "x": 145.0,
+            "y": 85.0
+          },
+          {
+            "x": 20.0,
+            "y": 85.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D"
          },
          "pin2": {
-          "compName": "GUI_rsLatch#1",
-          "pinName": "_R"
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#3",
          "path": []
        },
        {
@@ -288,6 +293,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 100.0,
@@ -297,23 +303,32 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUI_rsLatch#1",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        }
+          "compName": "GUInand3#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 55.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUI_rsLatch#1",
-          "pinName": "_Q"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Q"
-        }
+          "compName": "GUI_rsLatch#1",
+          "pinName": "_R"
+        },
+        "name": "unnamedWire#11",
+        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch.json b/net.mograsim.logic.model.am2900/components/GUIdlatch.json

index d83cc99..4280559 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIdlatch.json
+++ b/net.mograsim.logic.model.am2900/components/GUIdlatch.json
@@ -40,115 +40,130 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 15.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUI_rsLatch",
+        "name": "GUI_rsLatch#0",
          "pos": {
            "x": 45.0,
            "y": 7.5
-        },
-        "id": "GUI_rsLatch",
-        "name": "GUI_rsLatch#0"
+        }
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 34.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
+          "compName": "GUI_rsLatch#0",
+          "pinName": "_Q"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        }
+          "compName": "_submodelinterface",
+          "pinName": "_Q"
+        },
+        "name": "unnamedWire#9"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "E"
+          "compName": "GUI_rsLatch#0",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Q"
          },
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUI_rsLatch#0",
+          "pinName": "_R"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 5.0,
-            "y": 17.5
+            "x": 40.0,
+            "y": 37.5
+          },
+          {
+            "x": 40.0,
+            "y": 22.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "GUI_rsLatch#0",
+          "pinName": "_S"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "E"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
+        "name": "unnamedWire#1",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#0"
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -158,6 +173,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 35.0,
@@ -175,55 +191,49 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "_S"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "_R"
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 40.0,
-            "y": 37.5
-          },
-          {
-            "x": 40.0,
-            "y": 22.5
+            "x": 5.0,
+            "y": 42.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUI_rsLatch#0",
-          "pinName": "_Q"
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Q"
-        }
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 17.5
+          }
+        ]
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json

index c42e6d0..47965d7 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
@@ -80,135 +80,124 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 14.0,
            "y": 71.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 14.0,
            "y": 46.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 14.0,
            "y": 96.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUIdlatch",
+        "name": "GUIdlatch#1",
          "pos": {
            "x": 30.0,
            "y": 32.5
-        },
-        "id": "GUIdlatch",
-        "name": "GUIdlatch#1"
+        }
        },
        {
+        "id": "GUIdlatch",
+        "name": "GUIdlatch#0",
          "pos": {
            "x": 30.0,
            "y": 7.5
-        },
-        "id": "GUIdlatch",
-        "name": "GUIdlatch#0"
+        }
        },
        {
+        "id": "GUIdlatch",
+        "name": "GUIdlatch#3",
          "pos": {
            "x": 30.0,
            "y": 82.5
-        },
-        "id": "GUIdlatch",
-        "name": "GUIdlatch#3"
+        }
        },
        {
+        "id": "GUIdlatch",
+        "name": "GUIdlatch#2",
          "pos": {
            "x": 30.0,
            "y": 57.5
-        },
-        "id": "GUIdlatch",
-        "name": "GUIdlatch#2"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 112.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUIdlatch#3",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "GUIdlatch#3",
-          "pinName": "E"
+          "compName": "_submodelinterface",
+          "pinName": "Q4"
          },
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUIdlatch#2",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Q3"
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D3"
          },
          "pin2": {
            "compName": "GUIdlatch#2",
-          "pinName": "E"
+          "pinName": "D"
          },
+        "name": "unnamedWire#9",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIdlatch#1",
+          "pinName": "D"
          },
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
          "pin2": {
-          "compName": "GUIdlatch#1",
-          "pinName": "E"
+          "compName": "GUIdlatch#0",
+          "pinName": "D"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
@@ -220,6 +209,7 @@ mograsim version: 0.1.3
            "compName": "GUIdlatch#0",
            "pinName": "E"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
              "x": 15.0,
@@ -229,35 +219,43 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch#0",
-          "pinName": "D"
+          "compName": "GUIdlatch#3",
+          "pinName": "E"
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "D2"
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "GUIdlatch#1",
-          "pinName": "D"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 112.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch#2",
-          "pinName": "D"
+          "compName": "GUIdlatch#1",
+          "pinName": "E"
          },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
@@ -269,17 +267,31 @@ mograsim version: 0.1.3
            "compName": "GUIdlatch#3",
            "pinName": "D"
          },
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch#0",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIdlatch#2",
+          "pinName": "E"
          },
+        "name": "unnamedWire#3",
          "path": []
        },
        {
@@ -291,28 +303,31 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Q2"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch#2",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch#3",
+          "compName": "GUIdlatch#0",
            "pinName": "Q"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "pinName": "Q1"
          },
+        "name": "unnamedWire#11",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIfulladder.json b/net.mograsim.logic.model.am2900/components/GUIfulladder.json

index c523394..3a41f55 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIfulladder.json
+++ b/net.mograsim.logic.model.am2900/components/GUIfulladder.json
@@ -48,82 +48,93 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 57.5,
            "y": 40.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUIhalfadder",
+        "name": "GUIhalfadder#0",
          "pos": {
            "x": 5.0,
            "y": 40.0
-        },
-        "id": "GUIhalfadder",
-        "name": "GUIhalfadder#0"
+        }
        },
        {
+        "id": "GUIhalfadder",
+        "name": "GUIhalfadder#1",
          "pos": {
            "x": 45.0,
            "y": 7.5
-        },
-        "id": "GUIhalfadder",
-        "name": "GUIhalfadder#1"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIhalfadder#1",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "Z"
          },
-        "path": []
+        "name": "unnamedWire#7"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "GUIhalfadder#1",
+          "pinName": "_Z"
          },
          "pin2": {
-          "compName": "GUIhalfadder#0",
+          "compName": "GUINandGate#0",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 82.5,
+            "y": 22.5
+          },
+          {
+            "x": 82.5,
+            "y": 35.0
+          },
+          {
+            "x": 52.5,
+            "y": 35.0
+          },
+          {
+            "x": 52.5,
+            "y": 45.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C"
+          "pinName": "B"
          },
          "pin2": {
            "compName": "GUIhalfadder#0",
-          "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUIhalfadder#0",
-          "pinName": "Y"
+          "pinName": "A"
          },
-        "pin2": {
-          "compName": "GUIhalfadder#1",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#1"
        },
        {
          "pin1": {
-          "compName": "GUIhalfadder#0",
-          "pinName": "_Z"
+          "compName": "_submodelinterface",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUIhalfadder#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
@@ -135,45 +146,42 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Y"
          },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIhalfadder#1",
+          "compName": "GUIhalfadder#0",
            "pinName": "_Z"
          },
          "pin2": {
            "compName": "GUINandGate#0",
-          "pinName": "A"
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 82.5,
-            "y": 22.5
-          },
-          {
-            "x": 82.5,
-            "y": 35.0
-          },
-          {
-            "x": 52.5,
-            "y": 35.0
-          },
-          {
-            "x": 52.5,
-            "y": 45.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUIhalfadder#0",
            "pinName": "Y"
          },
          "pin2": {
+          "compName": "GUIhalfadder#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#3"
+      },
+      {
+        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Z"
-        }
+          "pinName": "C"
+        },
+        "pin2": {
+          "compName": "GUIhalfadder#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#2"
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json

index dd070ea..1c9144f 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
+++ b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
@@ -40,140 +40,166 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 40.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 65.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 4.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 40.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 34.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 32.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUINandGate#1",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 5.0,
-            "y": 7.5
+            "x": 35.0,
+            "y": 17.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "_Z"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 5.0,
-            "y": 20.0
+            "x": 80.0,
+            "y": 25.0
+          },
+          {
+            "x": 80.0,
+            "y": 37.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
              "x": 5.0,
-            "y": 42.5
+            "y": 7.5
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#1",
@@ -183,6 +209,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 5.0,
@@ -192,84 +219,80 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Z"
+          "compName": "GUINandGate#3",
+          "pinName": "A"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
-            "x": 80.0,
-            "y": 25.0
+            "x": 62.5,
+            "y": 12.5
            },
            {
-            "x": 80.0,
-            "y": 37.5
+            "x": 62.5,
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 35.0,
-            "y": 17.5
+            "x": 5.0,
+            "y": 42.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 35.0,
-            "y": 32.5
-          }
-        ]
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#3",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 62.5,
-            "y": 12.5
-          },
-          {
-            "x": 62.5,
-            "y": 7.5
+            "x": 5.0,
+            "y": 20.0
            }
          ]
        },
@@ -282,6 +305,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#3",
            "pinName": "B"
          },
+        "name": "unnamedWire#11",
          "path": [
            {
              "x": 62.5,
@@ -292,17 +316,6 @@ mograsim version: 0.1.3
              "y": 17.5
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUImux1.json b/net.mograsim.logic.model.am2900/components/GUImux1.json

index 60b22cd..6d4ba96 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUImux1.json
+++ b/net.mograsim.logic.model.am2900/components/GUImux1.json
@@ -40,92 +40,93 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 35.0,
            "y": 22.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 7.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 60.0,
            "y": 30.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 4.0,
            "y": 21.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 35.0,
            "y": 47.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#9"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#3",
            "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#8"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "B"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
@@ -134,88 +135,98 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 52.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#1",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0"
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I0"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 52.5
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y"
          },
-        "path": []
+        "name": "unnamedWire#10"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#1",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#4"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#0",
            "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        }
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUImux1_4.json b/net.mograsim.logic.model.am2900/components/GUImux1_4.json

index 7689ec7..014f4eb 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUImux1_4.json
+++ b/net.mograsim.logic.model.am2900/components/GUImux1_4.json
@@ -112,348 +112,367 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUImux1",
+        "name": "GUImux1#3",
          "pos": {
            "x": 30.0,
            "y": 112.5
-        },
-        "id": "GUImux1",
-        "name": "GUImux1#3"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 24.0,
            "y": 46.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 24.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "GUImux1",
+        "name": "GUImux1#0",
          "pos": {
            "x": 30.0,
            "y": 7.5
-        },
-        "id": "GUImux1",
-        "name": "GUImux1#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 24.0,
            "y": 81.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUImux1",
+        "name": "GUImux1#2",
          "pos": {
            "x": 30.0,
            "y": 77.5
-        },
-        "id": "GUImux1",
-        "name": "GUImux1#2"
+        }
        },
        {
+        "id": "GUImux1",
+        "name": "GUImux1#1",
          "pos": {
            "x": 30.0,
            "y": 42.5
-        },
-        "id": "GUImux1",
-        "name": "GUImux1#1"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
+          "compName": "GUImux1#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
          },
-        "path": []
+        "name": "unnamedWire#14"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1_3"
          },
          "pin2": {
-          "compName": "GUImux1#0",
-          "pinName": "S0"
+          "compName": "GUImux1#2",
+          "pinName": "I1"
          },
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 187.5
+          },
+          {
+            "x": 20.0,
+            "y": 102.5
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_1"
+          "pinName": "I0_4"
          },
          "pin2": {
-          "compName": "GUImux1#0",
+          "compName": "GUImux1#3",
            "pinName": "I0"
          },
+        "name": "unnamedWire#16",
          "path": [
            {
              "x": 5.0,
-            "y": 37.5
+            "y": 112.5
            },
            {
              "x": 5.0,
-            "y": 22.5
+            "y": 127.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1_1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1#0",
-          "pinName": "I1"
+          "compName": "GUImux1#3",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 10.0,
-            "y": 137.5
-          },
-          {
-            "x": 10.0,
-            "y": 32.5
+            "x": 25.0,
+            "y": 117.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUImux1#0",
+          "compName": "GUImux1#3",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "pinName": "Y4"
          },
-        "path": []
+        "name": "unnamedWire#18"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1_4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUImux1#3",
+          "pinName": "I1"
          },
-        "path": []
+        "name": "unnamedWire#17",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 212.5
+          },
+          {
+            "x": 25.0,
+            "y": 137.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUImux1#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUImux1#1",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
          },
-        "path": []
+        "name": "unnamedWire#9"
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_2"
+          "pinName": "I1_2"
          },
          "pin2": {
            "compName": "GUImux1#1",
-          "pinName": "I0"
+          "pinName": "I1"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 5.0,
-            "y": 62.5
+            "x": 15.0,
+            "y": 162.5
            },
            {
-            "x": 5.0,
-            "y": 57.5
+            "x": 15.0,
+            "y": 67.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_2"
+          "pinName": "I0_2"
          },
          "pin2": {
            "compName": "GUImux1#1",
-          "pinName": "I1"
+          "pinName": "I0"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 15.0,
-            "y": 162.5
+            "x": 5.0,
+            "y": 62.5
            },
            {
-            "x": 15.0,
-            "y": 67.5
+            "x": 5.0,
+            "y": 57.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUImux1#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        }
+          "compName": "GUImux1#1",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#6",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUImux1#0",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "S0"
          },
          "pin2": {
-          "compName": "GUImux1#2",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0_3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1#2",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 87.5
-          },
-          {
-            "x": 5.0,
-            "y": 92.5
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1_3"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1#2",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 187.5
-          },
-          {
-            "x": 20.0,
-            "y": 102.5
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUImux1#2",
+          "compName": "GUImux1#0",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y3"
-        }
+          "pinName": "Y1"
+        },
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1_1"
          },
          "pin2": {
-          "compName": "GUImux1#3",
-          "pinName": "S0"
+          "compName": "GUImux1#0",
+          "pinName": "I1"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 25.0,
-            "y": 117.5
+            "x": 10.0,
+            "y": 137.5
+          },
+          {
+            "x": 10.0,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I0_4"
+          "pinName": "I0_3"
          },
          "pin2": {
-          "compName": "GUImux1#3",
+          "compName": "GUImux1#2",
            "pinName": "I0"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 5.0,
-            "y": 112.5
+            "y": 87.5
            },
            {
              "x": 5.0,
-            "y": 127.5
+            "y": 92.5
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "I1_4"
+          "pinName": "I0_1"
          },
          "pin2": {
-          "compName": "GUImux1#3",
-          "pinName": "I1"
+          "compName": "GUImux1#0",
+          "pinName": "I0"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 25.0,
-            "y": 212.5
+            "x": 5.0,
+            "y": 37.5
            },
            {
-            "x": 25.0,
-            "y": 137.5
+            "x": 5.0,
+            "y": 22.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUImux1#3",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
-        }
+          "compName": "GUImux1#2",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#11",
+        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUInand3.json b/net.mograsim.logic.model.am2900/components/GUInand3.json

index f9fbb80..9385c33 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUInand3.json
+++ b/net.mograsim.logic.model.am2900/components/GUInand3.json
@@ -40,52 +40,75 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 35.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 62.5,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 31.5,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
+        },
+        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "A"
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        }
+          "compName": "GUINandGate#2",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 62.5
+          },
+          {
+            "x": 60.0,
+            "y": 17.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -95,32 +118,38 @@ mograsim version: 0.1.3
          "pin2": {
            "compName": "GUINandGate#0",
            "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#1"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#0"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#2",
            "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 32.5,
-            "y": 20.0
+            "x": 57.5,
+            "y": 25.0
+          },
+          {
+            "x": 57.5,
+            "y": 7.5
            }
          ]
        },
@@ -133,6 +162,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#1",
            "pinName": "B"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
              "x": 32.5,
@@ -142,53 +172,31 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 57.5,
-            "y": 25.0
-          },
-          {
-            "x": 57.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
-        },
-        "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 60.0,
-            "y": 62.5
-          },
-          {
-            "x": 60.0,
-            "y": 17.5
+            "x": 32.5,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUInot4.json b/net.mograsim.logic.model.am2900/components/GUInot4.json

index 98f4cbe..93b0592 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUInot4.json
+++ b/net.mograsim.logic.model.am2900/components/GUInot4.json
@@ -72,122 +72,131 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 30.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 30.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 30.0,
            "y": 77.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 14.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 30.0,
            "y": 52.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 14.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 14.0,
            "y": 86.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 14.0,
            "y": 61.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
          },
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
          },
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 42.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -196,28 +205,30 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#0",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
              "x": 15.0,
-            "y": 7.5
+            "y": 17.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#3",
            "pinName": "A"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 15.0,
-            "y": 32.5
+            "y": 82.5
            }
          ]
        },
@@ -230,6 +241,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#2",
            "pinName": "A"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
              "x": 15.0,
@@ -239,35 +251,27 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 82.5
-          }
-        ]
+        "name": "unnamedWire#1",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 17.5
-          }
-        ]
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
@@ -276,12 +280,13 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#1",
-          "pinName": "B"
+          "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 15.0,
-            "y": 42.5
+            "y": 32.5
            }
          ]
        },
@@ -294,6 +299,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 15.0,
@@ -303,63 +309,73 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "GUINandGate#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
              "x": 15.0,
-            "y": 92.5
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A4"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
+        "name": "unnamedWire#3",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "pinName": "Y1"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 92.5
+          }
+        ]
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIor4.json b/net.mograsim.logic.model.am2900/components/GUIor4.json

index 47755a3..82f2a95 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIor4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIor4.json
@@ -48,265 +48,299 @@ mograsim version: 0.1.3
      "innerScale": 0.2,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 20.0,
            "y": 65.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 20.0,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 20.0,
            "y": 165.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 20.0,
            "y": 115.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 14.0,
            "y": 74.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 14.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 14.0,
            "y": 174.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 14.0,
            "y": 124.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 104.0,
            "y": 149.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 104.0,
            "y": 49.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
          "pos": {
            "x": 140.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 50.0,
            "y": 140.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 50.0,
            "y": 40.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 110.0,
            "y": 140.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 110.0,
            "y": 40.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#5",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#14"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#13"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "GUINandGate#4",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUINandGate#5",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#15"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#6",
            "pinName": "A"
          },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 15.0,
-            "y": 20.0
+            "x": 105.0,
+            "y": 45.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "GUINandGate#5",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#17",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUINandGate#6",
+          "pinName": "B"
          },
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 15.0,
-            "y": 70.0
+            "x": 105.0,
+            "y": 55.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#7",
+          "pinName": "B"
          },
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 15.0,
-            "y": 120.0
+            "x": 105.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#7",
            "pinName": "A"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 15.0,
-            "y": 170.0
+            "x": 105.0,
+            "y": 145.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#8",
            "pinName": "B"
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 30.0
-          }
-        ]
+        "name": "unnamedWire#23"
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#6",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "GUINandGate#8",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#22"
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#8",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#24"
        },
        {
          "pin1": {
@@ -317,6 +351,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#1",
            "pinName": "B"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
              "x": 15.0,
@@ -326,17 +361,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
              "x": 15.0,
-            "y": 130.0
+            "y": 30.0
            }
          ]
        },
@@ -347,170 +383,159 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#3",
-          "pinName": "B"
+          "pinName": "A"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 15.0,
-            "y": 180.0
+            "y": 170.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
            "compName": "GUINandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "GUINandGate#5",
            "pinName": "A"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
          },
-        "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 120.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#5",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 105.0,
-            "y": 45.0
+            "x": 15.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
-            "x": 105.0,
-            "y": 55.0
+            "x": 15.0,
+            "y": 130.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 105.0,
-            "y": 145.0
+            "x": 15.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A4"
          },
          "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "B"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 105.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#0",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#4",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#12"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#7",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
-          "pinName": "B"
-        }
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#8",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        }
+          "compName": "GUINandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 180.0
+          }
+        ]
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/GUIor_4.json b/net.mograsim.logic.model.am2900/components/GUIor_4.json

index 0e88690..0f51017 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIor_4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIor_4.json
@@ -104,336 +104,201 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 15.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 15.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 15.0,
            "y": 77.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 15.0,
            "y": 52.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
          "pos": {
            "x": 65.0,
            "y": 77.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#10",
          "pos": {
            "x": 65.0,
            "y": 52.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 6.5,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 6.5,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 6.5,
            "y": 86.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 6.5,
            "y": 61.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 6.5,
            "y": 136.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 6.5,
            "y": 111.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
          "pos": {
            "x": 65.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 6.5,
            "y": 186.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
          "pos": {
            "x": 65.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 6.5,
            "y": 161.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 15.0,
            "y": 127.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 15.0,
            "y": 102.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 15.0,
            "y": 177.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 15.0,
            "y": 152.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
            "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 17.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#3",
            "pinName": "A"
          },
+        "name": "unnamedWire#14",
          "path": [
            {
              "x": 7.5,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 42.5
+            "y": 82.5
            }
          ]
        },
@@ -444,44 +309,42 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#2",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#13",
          "path": [
            {
              "x": 7.5,
-            "y": 57.5
+            "y": 67.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#11",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
          },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 67.5
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#4",
            "pinName": "A"
          },
+        "name": "unnamedWire#16",
          "path": [
            {
              "x": 7.5,
-            "y": 82.5
+            "y": 107.5
            }
          ]
        },
@@ -494,6 +357,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#3",
            "pinName": "B"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
              "x": 7.5,
@@ -503,17 +367,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#5",
            "pinName": "A"
          },
+        "name": "unnamedWire#18",
          "path": [
            {
              "x": 7.5,
-            "y": 107.5
+            "y": 132.5
            }
          ]
        },
@@ -526,6 +391,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#4",
            "pinName": "B"
          },
+        "name": "unnamedWire#17",
          "path": [
            {
              "x": 7.5,
@@ -540,28 +406,30 @@ mograsim version: 0.1.3
          },
          "pin2": {
            "compName": "GUINandGate#5",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#19",
          "path": [
            {
              "x": 7.5,
-            "y": 132.5
+            "y": 142.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#6",
            "pinName": "B"
          },
+        "name": "unnamedWire#21",
          "path": [
            {
              "x": 7.5,
-            "y": 142.5
+            "y": 167.5
            }
          ]
        },
@@ -574,6 +442,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#6",
            "pinName": "A"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
              "x": 7.5,
@@ -583,17 +452,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#7",
            "pinName": "B"
          },
+        "name": "unnamedWire#23",
          "path": [
            {
              "x": 7.5,
-            "y": 167.5
+            "y": 192.5
            }
          ]
        },
@@ -606,6 +476,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#7",
            "pinName": "A"
          },
+        "name": "unnamedWire#22",
          "path": [
            {
              "x": 7.5,
@@ -615,17 +486,22 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#8",
            "pinName": "B"
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 7.5,
-            "y": 192.5
+            "x": 45.0,
+            "y": 112.5
+          },
+          {
+            "x": 45.0,
+            "y": 17.5
            }
          ]
        },
@@ -638,6 +514,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#8",
            "pinName": "A"
          },
+        "name": "unnamedWire#24",
          "path": [
            {
              "x": 40.0,
@@ -651,21 +528,22 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#5",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#9",
            "pinName": "B"
          },
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 45.0,
-            "y": 112.5
+            "x": 50.0,
+            "y": 137.5
            },
            {
-            "x": 45.0,
-            "y": 17.5
+            "x": 50.0,
+            "y": 42.5
            }
          ]
        },
@@ -678,6 +556,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#9",
            "pinName": "A"
          },
+        "name": "unnamedWire#26",
          "path": [
            {
              "x": 40.0,
@@ -691,21 +570,22 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#6",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#10",
            "pinName": "B"
          },
+        "name": "unnamedWire#29",
          "path": [
            {
-            "x": 50.0,
-            "y": 137.5
+            "x": 55.0,
+            "y": 162.5
            },
            {
-            "x": 50.0,
-            "y": 42.5
+            "x": 55.0,
+            "y": 67.5
            }
          ]
        },
@@ -718,6 +598,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#10",
            "pinName": "A"
          },
+        "name": "unnamedWire#28",
          "path": [
            {
              "x": 40.0,
@@ -731,24 +612,86 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 55.0,
-            "y": 162.5
-          },
+            "x": 7.5,
+            "y": 17.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#8",
+        "path": [
            {
-            "x": 55.0,
-            "y": 67.5
+            "x": 7.5,
+            "y": 7.5
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "GUINandGate#3",
@@ -758,6 +701,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#11",
            "pinName": "A"
          },
+        "name": "unnamedWire#30",
          "path": [
            {
              "x": 40.0,
@@ -769,6 +713,59 @@ mograsim version: 0.1.3
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#8",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
+        },
+        "name": "unnamedWire#32",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "GUINandGate#7",
@@ -778,6 +775,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#11",
            "pinName": "B"
          },
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 60.0,
@@ -791,25 +789,32 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#8",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A4"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
+        "name": "unnamedWire#3",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#9",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#12",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 57.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -820,17 +825,48 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Y3"
          },
+        "name": "unnamedWire#34",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#11",
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 42.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#9",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "pinName": "Y2"
          },
+        "name": "unnamedWire#33",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIram2.json b/net.mograsim.logic.model.am2900/components/GUIram2.json

index a3e9e76..56b12a6 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIram2.json
+++ b/net.mograsim.logic.model.am2900/components/GUIram2.json
@@ -144,1127 +144,1106 @@ mograsim version: 0.1.3
      "innerScale": 0.1,
      "subComps": [
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 44.0,
            "y": 649.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 39.0,
            "y": 639.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#16",
          "pos": {
            "x": 129.0,
            "y": 329.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 49.0,
            "y": 659.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#18",
          "pos": {
            "x": 119.0,
            "y": 349.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#17",
          "pos": {
            "x": 124.0,
            "y": 339.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#19",
          "pos": {
            "x": 114.0,
            "y": 359.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 104.0,
            "y": 164.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 109.0,
            "y": 154.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 94.0,
            "y": 184.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 99.0,
            "y": 174.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 39.0,
            "y": 649.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 34.0,
            "y": 549.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 49.0,
            "y": 809.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 44.0,
            "y": 749.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 39.0,
            "y": 489.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 34.0,
            "y": 479.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 44.0,
            "y": 499.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 34.0,
            "y": 629.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 49.0,
            "y": 509.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#5",
          "pos": {
            "x": 135.0,
            "y": 735.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#5"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#3",
          "pos": {
            "x": 135.0,
            "y": 435.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#3"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#4",
          "pos": {
            "x": 135.0,
            "y": 585.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#4"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#1",
          "pos": {
            "x": 235.0,
            "y": 635.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#1"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#2",
          "pos": {
            "x": 235.0,
            "y": 785.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#2"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#0",
          "pos": {
            "x": 235.0,
            "y": 485.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#0"
+        }
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#1",
          "pos": {
            "x": 55.0,
            "y": 475.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#1"
+        }
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#0",
          "pos": {
            "x": 55.0,
            "y": 325.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#0"
+        }
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#3",
          "pos": {
            "x": 55.0,
            "y": 775.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#3"
+        }
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#2",
          "pos": {
            "x": 55.0,
            "y": 625.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#2"
+        }
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#2",
          "pos": {
            "x": 135.0,
            "y": 325.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#2"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#30",
          "pos": {
            "x": 119.0,
            "y": 799.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#30",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#31",
          "pos": {
            "x": 114.0,
            "y": 809.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#31",
          "params": 1
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#0",
          "pos": {
            "x": 130.0,
            "y": 150.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#0"
+        }
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#1",
          "pos": {
            "x": 235.0,
            "y": 375.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#1"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#25",
          "pos": {
            "x": 124.0,
            "y": 639.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#25",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#24",
          "pos": {
            "x": 129.0,
            "y": 629.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#24",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#27",
          "pos": {
            "x": 114.0,
            "y": 659.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#27",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#26",
          "pos": {
            "x": 119.0,
            "y": 649.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#26",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#29",
          "pos": {
            "x": 124.0,
            "y": 789.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#29",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#28",
          "pos": {
            "x": 129.0,
            "y": 779.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#28",
          "params": 1
        },
        {
+        "id": "GUIdemux2",
+        "name": "GUIdemux2#1",
          "pos": {
            "x": 55.0,
            "y": 150.0
-        },
-        "id": "GUIdemux2",
-        "name": "GUIdemux2#1"
+        }
        },
        {
+        "id": "GUIdemux2",
+        "name": "GUIdemux2#0",
          "pos": {
            "x": 55.0,
            "y": 45.0
-        },
-        "id": "GUIdemux2",
-        "name": "GUIdemux2#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#21",
          "pos": {
            "x": 124.0,
            "y": 489.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#20",
          "pos": {
            "x": 129.0,
            "y": 479.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#23",
          "pos": {
            "x": 114.0,
            "y": 509.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#22",
          "pos": {
            "x": 119.0,
            "y": 499.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#0",
-          "pinName": "S0"
+          "compName": "GUIdlatch4#2",
+          "pinName": "D3"
          },
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#0",
-          "pinName": "S1"
+          "compName": "GUIdlatch4#2",
+          "pinName": "D2"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 60.0
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#1",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 250.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#38",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#1",
-          "pinName": "S1"
+          "compName": "GUIdlatch4#2",
+          "pinName": "D4"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 350.0
-          },
-          {
-            "x": 10.0,
-            "y": 165.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y00"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
+        "name": "unnamedWire#39",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y01"
+          "compName": "GUIandor414#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y10"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y11"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A2"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "WE"
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "B"
+          "compName": "GUIandor414#2",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#110",
          "path": [
            {
-            "x": 5.0,
-            "y": 450.0
+            "x": 285.0,
+            "y": 650.0
            },
            {
-            "x": 5.0,
-            "y": 300.0
+            "x": 285.0,
+            "y": 740.0
            },
            {
-            "x": 125.0,
-            "y": 300.0
+            "x": 225.0,
+            "y": 740.0
            },
            {
-            "x": 125.0,
-            "y": 195.0
+            "x": 225.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y1"
+          "compName": "GUIandor414#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "C"
+          "compName": "GUIandor414#2",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 185.0,
-            "y": 155.0
+            "x": 280.0,
+            "y": 660.0
            },
            {
-            "x": 185.0,
-            "y": 250.0
+            "x": 280.0,
+            "y": 735.0
            },
            {
-            "x": 30.0,
-            "y": 250.0
+            "x": 220.0,
+            "y": 735.0
            },
            {
-            "x": 30.0,
-            "y": 370.0
+            "x": 220.0,
+            "y": 810.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
+          "compName": "GUIandor414#2",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "C"
+          "compName": "_submodelinterface",
+          "pinName": "QA2"
          },
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 180.0,
-            "y": 165.0
-          },
-          {
-            "x": 180.0,
-            "y": 245.0
-          },
-          {
-            "x": 25.0,
-            "y": 245.0
+            "x": 305.0,
+            "y": 800.0
            },
            {
-            "x": 25.0,
-            "y": 520.0
+            "x": 305.0,
+            "y": 150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
+          "compName": "GUIandor414#2",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "C"
+          "compName": "_submodelinterface",
+          "pinName": "QA3"
          },
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 175.0,
-            "y": 175.0
-          },
-          {
-            "x": 175.0,
-            "y": 240.0
-          },
-          {
-            "x": 20.0,
-            "y": 240.0
+            "x": 310.0,
+            "y": 810.0
            },
            {
-            "x": 20.0,
-            "y": 670.0
+            "x": 310.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
+          "compName": "GUIandor414#1",
            "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "C"
+          "compName": "GUIandor414#2",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 170.0,
-            "y": 185.0
+            "x": 275.0,
+            "y": 670.0
            },
            {
-            "x": 170.0,
-            "y": 235.0
+            "x": 275.0,
+            "y": 730.0
            },
            {
-            "x": 15.0,
-            "y": 235.0
+            "x": 215.0,
+            "y": 730.0
            },
            {
-            "x": 15.0,
+            "x": 215.0,
              "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "GUIandor414#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "pinName": "QA1"
          },
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 50.0,
-            "y": 850.0
+            "x": 300.0,
+            "y": 790.0
+          },
+          {
+            "x": 300.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "GUIand41#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D1"
+          "compName": "GUIandor414#3",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#118",
          "path": [
            {
-            "x": 35.0,
-            "y": 330.0
+            "x": 185.0,
+            "y": 340.0
+          },
+          {
+            "x": 185.0,
+            "y": 425.0
+          },
+          {
+            "x": 125.0,
+            "y": 425.0
+          },
+          {
+            "x": 125.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUIand41#2",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D2"
+          "compName": "GUIandor414#3",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#119",
          "path": [
            {
-            "x": 40.0,
-            "y": 340.0
+            "x": 180.0,
+            "y": 350.0
+          },
+          {
+            "x": 180.0,
+            "y": 420.0
+          },
+          {
+            "x": 120.0,
+            "y": 420.0
+          },
+          {
+            "x": 120.0,
+            "y": 460.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D3"
+          "compName": "GUIdlatch4#3",
+          "pinName": "D1"
          },
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 45.0,
-            "y": 350.0
+            "x": 35.0,
+            "y": 780.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "GUIandor414#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D4"
+          "compName": "_submodelinterface",
+          "pinName": "QA4"
          },
+        "name": "unnamedWire#116",
          "path": [
            {
-            "x": 50.0,
-            "y": 360.0
+            "x": 315.0,
+            "y": 820.0
+          },
+          {
+            "x": 315.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D2"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUIand41#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "GUIandor414#3",
+          "pinName": "C1"
          },
-        "path": []
+        "name": "unnamedWire#117",
+        "path": [
+          {
+            "x": 190.0,
+            "y": 330.0
+          },
+          {
+            "x": 190.0,
+            "y": 430.0
+          },
+          {
+            "x": 130.0,
+            "y": 430.0
+          },
+          {
+            "x": 130.0,
+            "y": 440.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "GUIdlatch4#3",
+          "pinName": "D3"
          },
-        "path": []
+        "name": "unnamedWire#43",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 800.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUIdlatch4#3",
+          "pinName": "D2"
          },
-        "path": []
+        "name": "unnamedWire#42",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "GUIdlatch4#0",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
+        "name": "unnamedWire#45",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "D1"
+          "compName": "GUIdlatch4#3",
+          "pinName": "D4"
          },
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "GUIdlatch4#0",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "D2"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "D3"
-        },
+        "name": "unnamedWire#47",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "GUIdlatch4#0",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "GUIdlatch4#1",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#20",
            "pinName": ""
          },
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUIdlatch4#0",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUIandor414#5",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#100",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "GUIand41#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "D1"
+          "compName": "GUIandor414#0",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#103",
          "path": [
            {
-            "x": 35.0,
-            "y": 780.0
+            "x": 280.0,
+            "y": 400.0
+          },
+          {
+            "x": 280.0,
+            "y": 435.0
+          },
+          {
+            "x": 220.0,
+            "y": 435.0
+          },
+          {
+            "x": 220.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUIand41#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "D2"
+          "compName": "GUIandor414#0",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#104",
          "path": [
            {
-            "x": 40.0,
-            "y": 790.0
+            "x": 275.0,
+            "y": 410.0
+          },
+          {
+            "x": 275.0,
+            "y": 430.0
+          },
+          {
+            "x": 215.0,
+            "y": 430.0
+          },
+          {
+            "x": 215.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUIand41#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "D3"
+          "compName": "GUIandor414#0",
+          "pinName": "C1"
          },
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 45.0,
-            "y": 800.0
+            "x": 290.0,
+            "y": 380.0
+          },
+          {
+            "x": 290.0,
+            "y": 445.0
+          },
+          {
+            "x": 230.0,
+            "y": 445.0
+          },
+          {
+            "x": 230.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "D4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q1"
+          "compName": "GUIand41#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "GUIandor414#0",
+          "pinName": "C2"
          },
-        "path": []
+        "name": "unnamedWire#102",
+        "path": [
+          {
+            "x": 285.0,
+            "y": 390.0
+          },
+          {
+            "x": 285.0,
+            "y": 440.0
+          },
+          {
+            "x": 225.0,
+            "y": 440.0
+          },
+          {
+            "x": 225.0,
+            "y": 500.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#0",
+          "compName": "GUIdlatch4#1",
            "pinName": "Q2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q3"
+          "compName": "GUIandor414#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "GUIandor414#1",
+          "pinName": "C3"
          },
-        "path": []
+        "name": "unnamedWire#107",
+        "path": [
+          {
+            "x": 280.0,
+            "y": 510.0
+          },
+          {
+            "x": 280.0,
+            "y": 585.0
+          },
+          {
+            "x": 220.0,
+            "y": 585.0
+          },
+          {
+            "x": 220.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q4"
+          "compName": "GUIandor414#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "GUIandor414#1",
+          "pinName": "C4"
          },
-        "path": []
+        "name": "unnamedWire#108",
+        "path": [
+          {
+            "x": 275.0,
+            "y": 520.0
+          },
+          {
+            "x": 275.0,
+            "y": 580.0
+          },
+          {
+            "x": 215.0,
+            "y": 580.0
+          },
+          {
+            "x": 215.0,
+            "y": 670.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "GUIdlatch4#1",
-          "pinName": "Q1"
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q2"
+          "compName": "GUIandor414#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIandor414#1",
+          "pinName": "C1"
          },
-        "path": []
+        "name": "unnamedWire#105",
+        "path": [
+          {
+            "x": 290.0,
+            "y": 490.0
+          },
+          {
+            "x": 290.0,
+            "y": 595.0
+          },
+          {
+            "x": 230.0,
+            "y": 595.0
+          },
+          {
+            "x": 230.0,
+            "y": 640.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -1275,29 +1254,37 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#22",
            "pinName": ""
          },
+        "name": "unnamedWire#51",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdlatch4#2",
-          "pinName": "Q1"
+          "compName": "GUIandor414#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "GUIandor414#1",
+          "pinName": "C2"
          },
-        "path": []
+        "name": "unnamedWire#106",
+        "path": [
+          {
+            "x": 285.0,
+            "y": 500.0
+          },
+          {
+            "x": 285.0,
+            "y": 590.0
+          },
+          {
+            "x": 225.0,
+            "y": 590.0
+          },
+          {
+            "x": 225.0,
+            "y": 650.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -1308,17 +1295,19 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#25",
            "pinName": ""
          },
+        "name": "unnamedWire#54",
          "path": []
        },
        {
          "pin1": {
            "compName": "GUIdlatch4#2",
-          "pinName": "Q3"
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
+        "name": "unnamedWire#53",
          "path": []
        },
        {
@@ -1330,369 +1319,438 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#27",
            "pinName": ""
          },
+        "name": "unnamedWire#56",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "Q1"
+          "compName": "GUIandor414#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "GUIandor414#2",
+          "pinName": "C1"
          },
-        "path": []
+        "name": "unnamedWire#109",
+        "path": [
+          {
+            "x": 290.0,
+            "y": 640.0
+          },
+          {
+            "x": 290.0,
+            "y": 745.0
+          },
+          {
+            "x": 230.0,
+            "y": 745.0
+          },
+          {
+            "x": 230.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "Q2"
+          "compName": "GUIdlatch4#2",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#26",
            "pinName": ""
          },
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "Q3"
+          "compName": "GUIand41#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "GUIdlatch4#1",
+          "pinName": "C"
          },
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 180.0,
+            "y": 165.0
+          },
+          {
+            "x": 180.0,
+            "y": 245.0
+          },
+          {
+            "x": 25.0,
+            "y": 245.0
+          },
+          {
+            "x": 25.0,
+            "y": 520.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#3",
-          "pinName": "Q4"
+          "compName": "GUIand41#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "GUIdlatch4#0",
+          "pinName": "C"
          },
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 185.0,
+            "y": 155.0
+          },
+          {
+            "x": 185.0,
+            "y": 250.0
+          },
+          {
+            "x": 30.0,
+            "y": 250.0
+          },
+          {
+            "x": 30.0,
+            "y": 370.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y00"
+          "compName": "GUIand41#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "B"
+          "compName": "GUIdlatch4#3",
+          "pinName": "C"
          },
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 210.0,
-            "y": 50.0
+            "x": 170.0,
+            "y": 185.0
            },
            {
-            "x": 210.0,
-            "y": 420.0
+            "x": 170.0,
+            "y": 235.0
+          },
+          {
+            "x": 15.0,
+            "y": 235.0
+          },
+          {
+            "x": 15.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y01"
+          "compName": "GUIand41#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "B"
+          "compName": "GUIdlatch4#2",
+          "pinName": "C"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 205.0,
-            "y": 60.0
+            "x": 175.0,
+            "y": 175.0
            },
            {
-            "x": 205.0,
-            "y": 570.0
+            "x": 175.0,
+            "y": 240.0
+          },
+          {
+            "x": 20.0,
+            "y": 240.0
+          },
+          {
+            "x": 20.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y10"
+          "compName": "_submodelinterface",
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "B"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#18",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#17",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "name": "unnamedWire#19",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIdlatch4#0",
+          "pinName": "D1"
+        },
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 200.0,
-            "y": 70.0
-          },
-          {
-            "x": 200.0,
-            "y": 720.0
+            "x": 35.0,
+            "y": 330.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y11"
+          "compName": "_submodelinterface",
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 195.0,
-            "y": 80.0
-          },
-          {
-            "x": 195.0,
-            "y": 870.0
+            "x": 50.0,
+            "y": 850.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#2",
-          "pinName": "B"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D3"
          },
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 110.0,
-            "y": 370.0
+            "x": 45.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "B"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D2"
          },
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 105.0,
-            "y": 520.0
+            "x": 40.0,
+            "y": 340.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "B"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D1"
          },
-        "path": [
-          {
-            "x": 100.0,
-            "y": 670.0
-          }
-        ]
+        "name": "unnamedWire#25",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "B"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D4"
          },
+        "name": "unnamedWire#24",
          "path": [
            {
-            "x": 95.0,
-            "y": 820.0
+            "x": 50.0,
+            "y": 360.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A1"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D3"
          },
-        "path": [
-          {
-            "x": 130.0,
-            "y": 380.0
-          }
-        ]
+        "name": "unnamedWire#27",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A2"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D2"
          },
-        "path": [
-          {
-            "x": 125.0,
-            "y": 390.0
-          }
-        ]
+        "name": "unnamedWire#26",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 120.0,
-            "y": 400.0
-          }
-        ]
+        "name": "unnamedWire#29",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A4"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D4"
          },
-        "path": [
-          {
-            "x": 115.0,
-            "y": 410.0
-          }
-        ]
+        "name": "unnamedWire#28",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 130.0,
-            "y": 530.0
-          }
-        ]
+        "name": "unnamedWire#30",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 125.0,
-            "y": 540.0
-          }
-        ]
+        "name": "unnamedWire#32",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 120.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A4"
+          "compName": "GUIdlatch4#2",
+          "pinName": "D1"
          },
-        "path": [
-          {
-            "x": 115.0,
-            "y": 560.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 130.0,
-            "y": 680.0
-          }
-        ]
+        "name": "unnamedWire#33",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#26",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIandor414#1",
-          "pinName": "A2"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#79",
          "path": [
            {
-            "x": 125.0,
-            "y": 690.0
+            "x": 120.0,
+            "y": 700.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#28",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "A3"
+          "compName": "GUIandor414#2",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#81",
          "path": [
            {
-            "x": 120.0,
-            "y": 700.0
+            "x": 130.0,
+            "y": 830.0
            }
          ]
        },
@@ -1705,6 +1763,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#1",
            "pinName": "A4"
          },
+        "name": "unnamedWire#80",
          "path": [
            {
              "x": 115.0,
@@ -1714,17 +1773,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIandor414#2",
-          "pinName": "A1"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#83",
          "path": [
            {
-            "x": 130.0,
-            "y": 830.0
+            "x": 120.0,
+            "y": 850.0
            }
          ]
        },
@@ -1737,6 +1797,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#2",
            "pinName": "A2"
          },
+        "name": "unnamedWire#82",
          "path": [
            {
              "x": 125.0,
@@ -1746,19 +1807,15 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "A3"
+          "compName": "GUIand41#2",
+          "pinName": "A1"
          },
-        "path": [
-          {
-            "x": 120.0,
-            "y": 850.0
-          }
-        ]
+        "name": "unnamedWire#85",
+        "path": []
        },
        {
          "pin1": {
@@ -1769,6 +1826,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#2",
            "pinName": "A4"
          },
+        "name": "unnamedWire#84",
          "path": [
            {
              "x": 115.0,
@@ -1778,13 +1836,14 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIand41#2",
-          "pinName": "A1"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#87",
          "path": []
        },
        {
@@ -1796,72 +1855,160 @@ mograsim version: 0.1.3
            "compName": "GUIand41#2",
            "pinName": "A2"
          },
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIandor414#3",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#89",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIand41#2",
-          "pinName": "A3"
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#88",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIand41#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIand41#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdemux2#1",
+          "pinName": "Y11"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdemux2#1",
+          "pinName": "Y10"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIandor414#3",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#90",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#2",
+          "compName": "GUIandor414#3",
            "pinName": "A4"
          },
+        "name": "unnamedWire#92",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIandor414#3",
-          "pinName": "A1"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#91",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A2"
+          "compName": "GUIdemux2#0",
+          "pinName": "S1"
          },
-        "path": []
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 150.0
+          },
+          {
+            "x": 10.0,
+            "y": 60.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A3"
+          "compName": "GUIandor414#4",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#94",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A0"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A4"
+          "compName": "GUIdemux2#0",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
@@ -1873,17 +2020,19 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#4",
            "pinName": "A1"
          },
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIandor414#4",
-          "pinName": "A2"
+          "pinName": "A4"
          },
+        "name": "unnamedWire#96",
          "path": []
        },
        {
@@ -1895,28 +2044,31 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#4",
            "pinName": "A3"
          },
+        "name": "unnamedWire#95",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "GUIdemux2#1",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A1"
+          "compName": "GUIand41#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#10",
          "path": []
        },
        {
@@ -1928,527 +2080,487 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#5",
            "pinName": "A2"
          },
+        "name": "unnamedWire#98",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "GUIdemux2#1",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#28",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIandor414#5",
-          "pinName": "A4"
+          "pinName": "A1"
          },
+        "name": "unnamedWire#97",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "C1"
+          "compName": "GUIdemux2#1",
+          "pinName": "S1"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 290.0,
-            "y": 380.0
-          },
-          {
-            "x": 290.0,
-            "y": 445.0
-          },
-          {
-            "x": 230.0,
-            "y": 445.0
+            "x": 10.0,
+            "y": 350.0
            },
            {
-            "x": 230.0,
-            "y": 490.0
+            "x": 10.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "WE"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "C2"
+          "compName": "GUIand41#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 285.0,
-            "y": 390.0
+            "x": 5.0,
+            "y": 450.0
            },
            {
-            "x": 285.0,
-            "y": 440.0
+            "x": 5.0,
+            "y": 300.0
            },
            {
-            "x": 225.0,
-            "y": 440.0
+            "x": 125.0,
+            "y": 300.0
            },
            {
-            "x": 225.0,
-            "y": 500.0
+            "x": 125.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "B0"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "C3"
+          "compName": "GUIdemux2#1",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 280.0,
-            "y": 400.0
-          },
-          {
-            "x": 280.0,
-            "y": 435.0
-          },
-          {
-            "x": 220.0,
-            "y": 435.0
+            "x": 5.0,
+            "y": 250.0
            },
            {
-            "x": 220.0,
-            "y": 510.0
+            "x": 5.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "C4"
+          "compName": "GUIand41#0",
+          "pinName": "A4"
          },
-        "path": [
-          {
-            "x": 275.0,
-            "y": 410.0
-          },
-          {
-            "x": 275.0,
-            "y": 430.0
-          },
-          {
-            "x": 215.0,
-            "y": 430.0
-          },
-          {
-            "x": 215.0,
-            "y": 520.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "C1"
+          "compName": "GUIandor414#5",
+          "pinName": "A3"
          },
-        "path": [
-          {
-            "x": 290.0,
-            "y": 490.0
-          },
-          {
-            "x": 290.0,
-            "y": 595.0
-          },
-          {
-            "x": 230.0,
-            "y": 595.0
-          },
-          {
-            "x": 230.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#99",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
-          "pinName": "Y2"
+          "compName": "GUIdlatch4#3",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
+        },
+        "name": "unnamedWire#58",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdlatch4#3",
+          "pinName": "Q1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
+        },
+        "name": "unnamedWire#57",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdlatch4#3",
+          "pinName": "Q3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
+        },
+        "name": "unnamedWire#59",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#5",
+          "pinName": "Y4"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QB4"
          },
+        "name": "unnamedWire#132",
          "path": [
            {
-            "x": 285.0,
-            "y": 500.0
+            "x": 175.0,
+            "y": 770.0
            },
            {
-            "x": 285.0,
-            "y": 590.0
+            "x": 175.0,
+            "y": 895.0
            },
            {
-            "x": 225.0,
-            "y": 590.0
+            "x": 340.0,
+            "y": 895.0
            },
            {
-            "x": 225.0,
-            "y": 650.0
+            "x": 340.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
-          "pinName": "Y3"
+          "compName": "GUIandor414#5",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "C3"
+          "compName": "_submodelinterface",
+          "pinName": "QB2"
          },
+        "name": "unnamedWire#130",
          "path": [
            {
-            "x": 280.0,
-            "y": 510.0
+            "x": 185.0,
+            "y": 750.0
            },
            {
-            "x": 280.0,
-            "y": 585.0
+            "x": 185.0,
+            "y": 885.0
            },
            {
-            "x": 220.0,
-            "y": 585.0
+            "x": 330.0,
+            "y": 885.0
            },
            {
-            "x": 220.0,
-            "y": 660.0
+            "x": 330.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
-          "pinName": "Y4"
+          "compName": "GUIandor414#5",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "C4"
+          "compName": "_submodelinterface",
+          "pinName": "QB3"
          },
+        "name": "unnamedWire#131",
          "path": [
            {
-            "x": 275.0,
-            "y": 520.0
+            "x": 180.0,
+            "y": 760.0
            },
            {
-            "x": 275.0,
-            "y": 580.0
+            "x": 180.0,
+            "y": 890.0
            },
            {
-            "x": 215.0,
-            "y": 580.0
+            "x": 335.0,
+            "y": 890.0
            },
            {
-            "x": 215.0,
-            "y": 670.0
+            "x": 335.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y1"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C1"
+          "compName": "GUIand41#1",
+          "pinName": "B"
          },
+        "name": "unnamedWire#61",
          "path": [
            {
-            "x": 290.0,
-            "y": 640.0
-          },
-          {
-            "x": 290.0,
-            "y": 745.0
-          },
-          {
-            "x": 230.0,
-            "y": 745.0
+            "x": 210.0,
+            "y": 50.0
            },
            {
-            "x": 230.0,
-            "y": 790.0
+            "x": 210.0,
+            "y": 420.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y2"
+          "compName": "GUIdlatch4#3",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
+        },
+        "name": "unnamedWire#60",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdemux2#0",
+          "pinName": "Y10"
          },
+        "pin2": {
+          "compName": "GUIandor414#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#63",
          "path": [
            {
-            "x": 285.0,
-            "y": 650.0
-          },
-          {
-            "x": 285.0,
-            "y": 740.0
-          },
-          {
-            "x": 225.0,
-            "y": 740.0
+            "x": 200.0,
+            "y": 70.0
            },
            {
-            "x": 225.0,
-            "y": 800.0
+            "x": 200.0,
+            "y": 720.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y3"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C3"
+          "compName": "GUIandor414#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#62",
          "path": [
            {
-            "x": 280.0,
-            "y": 660.0
-          },
-          {
-            "x": 280.0,
-            "y": 735.0
-          },
-          {
-            "x": 220.0,
-            "y": 735.0
+            "x": 205.0,
+            "y": 60.0
            },
            {
-            "x": 220.0,
-            "y": 810.0
+            "x": 205.0,
+            "y": 570.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C4"
+          "compName": "GUIand41#2",
+          "pinName": "B"
          },
+        "name": "unnamedWire#65",
          "path": [
            {
-            "x": 275.0,
-            "y": 670.0
-          },
-          {
-            "x": 275.0,
-            "y": 730.0
-          },
-          {
-            "x": 215.0,
-            "y": 730.0
-          },
-          {
-            "x": 215.0,
-            "y": 820.0
+            "x": 110.0,
+            "y": 370.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y1"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA1"
+          "compName": "GUIandor414#2",
+          "pinName": "B"
          },
+        "name": "unnamedWire#64",
          "path": [
            {
-            "x": 300.0,
-            "y": 790.0
+            "x": 195.0,
+            "y": 80.0
            },
            {
-            "x": 300.0,
-            "y": 50.0
+            "x": 195.0,
+            "y": 870.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
+          "compName": "GUIandor414#4",
+          "pinName": "B"
          },
+        "name": "unnamedWire#67",
          "path": [
            {
-            "x": 305.0,
-            "y": 800.0
-          },
-          {
-            "x": 305.0,
-            "y": 150.0
+            "x": 100.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
+          "compName": "GUIandor414#3",
+          "pinName": "B"
          },
+        "name": "unnamedWire#66",
          "path": [
            {
-            "x": 310.0,
-            "y": 810.0
-          },
-          {
-            "x": 310.0,
-            "y": 250.0
+            "x": 105.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
+          "compName": "GUIand41#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#69",
          "path": [
            {
-            "x": 315.0,
-            "y": 820.0
-          },
-          {
-            "x": 315.0,
-            "y": 350.0
+            "x": 130.0,
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "C1"
+          "compName": "GUIandor414#5",
+          "pinName": "B"
          },
+        "name": "unnamedWire#68",
          "path": [
            {
-            "x": 190.0,
-            "y": 330.0
-          },
-          {
-            "x": 190.0,
-            "y": 430.0
-          },
-          {
-            "x": 130.0,
-            "y": 430.0
-          },
-          {
-            "x": 130.0,
-            "y": 440.0
+            "x": 95.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
-          "pinName": "Y2"
+          "compName": "GUIandor414#3",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "C2"
+          "compName": "GUIandor414#4",
+          "pinName": "C1"
          },
+        "name": "unnamedWire#121",
          "path": [
            {
-            "x": 185.0,
-            "y": 340.0
+            "x": 190.0,
+            "y": 440.0
            },
            {
-            "x": 185.0,
-            "y": 425.0
+            "x": 190.0,
+            "y": 580.0
            },
            {
-            "x": 125.0,
-            "y": 425.0
+            "x": 130.0,
+            "y": 580.0
            },
            {
-            "x": 125.0,
-            "y": 450.0
+            "x": 130.0,
+            "y": 590.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
-          "pinName": "Y3"
+          "compName": "GUIandor414#3",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "C3"
+          "compName": "GUIandor414#4",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#122",
          "path": [
            {
-            "x": 180.0,
-            "y": 350.0
+            "x": 185.0,
+            "y": 450.0
            },
            {
-            "x": 180.0,
-            "y": 420.0
+            "x": 185.0,
+            "y": 575.0
            },
            {
-            "x": 120.0,
-            "y": 420.0
+            "x": 125.0,
+            "y": 575.0
            },
            {
-            "x": 120.0,
-            "y": 460.0
+            "x": 125.0,
+            "y": 600.0
            }
          ]
        },
@@ -2461,6 +2573,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#3",
            "pinName": "C4"
          },
+        "name": "unnamedWire#120",
          "path": [
            {
              "x": 175.0,
@@ -2482,57 +2595,76 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#4",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#5",
            "pinName": "C1"
          },
+        "name": "unnamedWire#125",
          "path": [
            {
              "x": 190.0,
-            "y": 440.0
+            "y": 590.0
            },
            {
              "x": 190.0,
-            "y": 580.0
+            "y": 730.0
            },
            {
              "x": 130.0,
-            "y": 580.0
+            "y": 730.0
            },
            {
              "x": 130.0,
-            "y": 590.0
+            "y": 740.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#4",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#5",
            "pinName": "C2"
          },
+        "name": "unnamedWire#126",
          "path": [
            {
              "x": 185.0,
-            "y": 450.0
+            "y": 600.0
            },
            {
              "x": 185.0,
-            "y": 575.0
+            "y": 725.0
            },
            {
              "x": 125.0,
-            "y": 575.0
+            "y": 725.0
            },
            {
              "x": 125.0,
-            "y": 600.0
+            "y": 750.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIand41#1",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#70",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 390.0
            }
          ]
        },
@@ -2545,6 +2677,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#4",
            "pinName": "C3"
          },
+        "name": "unnamedWire#123",
          "path": [
            {
              "x": 180.0,
@@ -2573,6 +2706,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#4",
            "pinName": "C4"
          },
+        "name": "unnamedWire#124",
          "path": [
            {
              "x": 175.0,
@@ -2594,57 +2728,81 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
+          "compName": "GUIand41#1",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 410.0
+          }
+        ]
+      },
+      {
+        "pin1": {
            "compName": "GUIandor414#5",
-          "pinName": "C1"
+          "pinName": "Y1"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QB1"
          },
+        "name": "unnamedWire#129",
          "path": [
            {
              "x": 190.0,
-            "y": 590.0
+            "y": 740.0
            },
            {
              "x": 190.0,
-            "y": 730.0
+            "y": 880.0
            },
            {
-            "x": 130.0,
-            "y": 730.0
+            "x": 325.0,
+            "y": 880.0
            },
            {
-            "x": 130.0,
-            "y": 740.0
+            "x": 325.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "C2"
+          "compName": "GUIand41#1",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#71",
          "path": [
            {
-            "x": 185.0,
-            "y": 600.0
-          },
-          {
-            "x": 185.0,
-            "y": 725.0
-          },
-          {
-            "x": 125.0,
-            "y": 725.0
-          },
+            "x": 120.0,
+            "y": 400.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIandor414#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#74",
+        "path": [
            {
              "x": 125.0,
-            "y": 750.0
+            "y": 540.0
            }
          ]
        },
@@ -2657,6 +2815,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#5",
            "pinName": "C3"
          },
+        "name": "unnamedWire#127",
          "path": [
            {
              "x": 180.0,
@@ -2676,6 +2835,23 @@ mograsim version: 0.1.3
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIandor414#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#73",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 530.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "GUIandor414#4",
@@ -2685,6 +2861,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#5",
            "pinName": "C4"
          },
+        "name": "unnamedWire#128",
          "path": [
            {
              "x": 175.0,
@@ -2706,113 +2883,69 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
+          "compName": "GUIandor414#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#76",
          "path": [
            {
-            "x": 190.0,
-            "y": 740.0
-          },
-          {
-            "x": 190.0,
-            "y": 880.0
-          },
-          {
-            "x": 325.0,
-            "y": 880.0
-          },
-          {
-            "x": 325.0,
-            "y": 450.0
+            "x": 115.0,
+            "y": 560.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
+          "compName": "GUIandor414#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#75",
          "path": [
            {
-            "x": 185.0,
-            "y": 750.0
-          },
-          {
-            "x": 185.0,
-            "y": 885.0
-          },
-          {
-            "x": 330.0,
-            "y": 885.0
-          },
-          {
-            "x": 330.0,
+            "x": 120.0,
              "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
+          "compName": "GUIandor414#1",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 180.0,
-            "y": 760.0
-          },
-          {
-            "x": 180.0,
-            "y": 890.0
-          },
-          {
-            "x": 335.0,
-            "y": 890.0
-          },
-          {
-            "x": 335.0,
-            "y": 650.0
+            "x": 125.0,
+            "y": 690.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB4"
+          "compName": "GUIandor414#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#77",
          "path": [
            {
-            "x": 175.0,
-            "y": 770.0
-          },
-          {
-            "x": 175.0,
-            "y": 895.0
-          },
-          {
-            "x": 340.0,
-            "y": 895.0
-          },
-          {
-            "x": 340.0,
-            "y": 750.0
+            "x": 130.0,
+            "y": 680.0
            }
          ]
        }
diff --git a/net.mograsim.logic.model.am2900/components/GUIram4.json b/net.mograsim.logic.model.am2900/components/GUIram4.json

index d6d7ea8..28dd20d 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIram4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIram4.json
@@ -176,1081 +176,1106 @@ mograsim version: 0.1.3
      "innerScale": 0.1,
      "subComps": [
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 69.0,
            "y": 854.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 64.0,
            "y": 844.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#16",
          "pos": {
            "x": 39.0,
            "y": 484.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 74.0,
            "y": 864.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#18",
          "pos": {
            "x": 49.0,
            "y": 504.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#17",
          "pos": {
            "x": 44.0,
            "y": 494.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#19",
          "pos": {
            "x": 54.0,
            "y": 514.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
          "params": 1
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#2",
          "pos": {
            "x": 155.0,
            "y": 325.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#2"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 224.0,
            "y": 164.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 229.0,
            "y": 154.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 214.0,
            "y": 184.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 219.0,
            "y": 174.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 64.0,
            "y": 544.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 59.0,
            "y": 534.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 74.0,
            "y": 564.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 69.0,
            "y": 554.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 64.0,
            "y": 694.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 59.0,
            "y": 684.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 69.0,
            "y": 704.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#0",
          "pos": {
            "x": 235.0,
            "y": 150.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 59.0,
            "y": 834.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "GUIand41",
+        "name": "GUIand41#1",
          "pos": {
            "x": 250.0,
            "y": 375.0
-        },
-        "id": "GUIand41",
-        "name": "GUIand41#1"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 74.0,
            "y": 714.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#5",
          "pos": {
            "x": 155.0,
            "y": 735.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#5"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#25",
          "pos": {
            "x": 44.0,
            "y": 349.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#25",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#24",
          "pos": {
            "x": 39.0,
            "y": 334.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#24",
          "params": 1
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#3",
          "pos": {
            "x": 155.0,
            "y": 435.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#3"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#27",
          "pos": {
            "x": 54.0,
            "y": 749.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#27",
          "params": 1
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#4",
          "pos": {
            "x": 155.0,
            "y": 585.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#4"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#26",
          "pos": {
            "x": 49.0,
            "y": 649.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#26",
          "params": 1
        },
        {
+        "id": "GUIram2",
+        "name": "GUIram2#3",
          "pos": {
            "x": 80.0,
            "y": 780.0
-        },
-        "id": "GUIram2",
-        "name": "GUIram2#3"
+        }
        },
        {
+        "id": "GUIram2",
+        "name": "GUIram2#2",
          "pos": {
            "x": 80.0,
            "y": 630.0
-        },
-        "id": "GUIram2",
-        "name": "GUIram2#2"
+        }
        },
        {
+        "id": "GUIdemux2",
+        "name": "GUIdemux2#1",
          "pos": {
            "x": 55.0,
            "y": 150.0
-        },
-        "id": "GUIdemux2",
-        "name": "GUIdemux2#1"
+        }
        },
        {
+        "id": "GUIram2",
+        "name": "GUIram2#1",
          "pos": {
            "x": 80.0,
            "y": 480.0
-        },
-        "id": "GUIram2",
-        "name": "GUIram2#1"
+        }
        },
        {
+        "id": "GUIram2",
+        "name": "GUIram2#0",
          "pos": {
            "x": 80.0,
            "y": 330.0
-        },
-        "id": "GUIram2",
-        "name": "GUIram2#0"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#1",
          "pos": {
            "x": 250.0,
            "y": 635.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#1"
+        }
        },
        {
+        "id": "GUIdemux2",
+        "name": "GUIdemux2#0",
          "pos": {
            "x": 55.0,
            "y": 45.0
-        },
-        "id": "GUIdemux2",
-        "name": "GUIdemux2#0"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#2",
          "pos": {
            "x": 250.0,
            "y": 785.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#2"
+        }
        },
        {
+        "id": "GUIandor414",
+        "name": "GUIandor414#0",
          "pos": {
            "x": 250.0,
            "y": 485.0
-        },
-        "id": "GUIandor414",
-        "name": "GUIandor414#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#21",
          "pos": {
            "x": 44.0,
            "y": 644.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#20",
          "pos": {
            "x": 39.0,
            "y": 634.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#23",
          "pos": {
            "x": 54.0,
            "y": 664.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#22",
          "pos": {
            "x": 49.0,
            "y": 654.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#0",
-          "pinName": "S0"
+          "compName": "GUIram2#2",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#0",
-          "pinName": "S1"
+          "compName": "GUIram2#2",
+          "pinName": "B0"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 60.0
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#1",
-          "pinName": "S0"
+          "compName": "GUIram2#3",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#38",
          "path": [
            {
-            "x": 5.0,
-            "y": 450.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
+            "x": 45.0,
+            "y": 795.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdemux2#1",
-          "pinName": "S1"
+          "compName": "GUIram2#3",
+          "pinName": "A0"
          },
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 10.0,
-            "y": 550.0
-          },
-          {
-            "x": 10.0,
-            "y": 165.0
+            "x": 40.0,
+            "y": 785.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y00"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIram2#3",
+          "pinName": "B0"
          },
-        "path": []
+        "name": "unnamedWire#39",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 805.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y01"
+          "compName": "GUIram2#3",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIandor414#5",
+          "pinName": "A2"
          },
-        "path": []
+        "name": "unnamedWire#110",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 795.0
+          },
+          {
+            "x": 140.0,
+            "y": 790.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y10"
+          "compName": "GUIram2#3",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdemux2#1",
-          "pinName": "Y11"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A2"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
+          "compName": "GUIandor414#5",
            "pinName": "A3"
          },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "A4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "WE"
-        },
-        "pin2": {
-          "compName": "GUIand41#0",
-          "pinName": "B"
-        },
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 15.0,
-            "y": 850.0
+            "x": 140.0,
+            "y": 805.0
            },
            {
-            "x": 15.0,
-            "y": 195.0
+            "x": 140.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y1"
+          "compName": "GUIand41#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "WE"
+          "compName": "GUIandor414#0",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 290.0,
-            "y": 155.0
+            "x": 300.0,
+            "y": 390.0
            },
            {
-            "x": 290.0,
-            "y": 230.0
+            "x": 300.0,
+            "y": 440.0
            },
            {
-            "x": 35.0,
-            "y": 230.0
+            "x": 240.0,
+            "y": 440.0
            },
            {
-            "x": 35.0,
-            "y": 375.0
+            "x": 240.0,
+            "y": 500.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y2"
+          "compName": "GUIand41#1",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "WE"
+          "compName": "GUIandor414#0",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 285.0,
-            "y": 165.0
+            "x": 295.0,
+            "y": 400.0
            },
            {
-            "x": 285.0,
-            "y": 225.0
+            "x": 295.0,
+            "y": 435.0
            },
            {
-            "x": 30.0,
-            "y": 225.0
+            "x": 235.0,
+            "y": 435.0
            },
            {
-            "x": 30.0,
-            "y": 525.0
+            "x": 235.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y3"
+          "compName": "GUIram2#3",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "WE"
+          "compName": "GUIandor414#5",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#112",
          "path": [
            {
-            "x": 280.0,
-            "y": 175.0
-          },
-          {
-            "x": 280.0,
-            "y": 220.0
-          },
-          {
-            "x": 25.0,
-            "y": 220.0
+            "x": 140.0,
+            "y": 815.0
            },
            {
-            "x": 25.0,
-            "y": 675.0
+            "x": 140.0,
+            "y": 810.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#0",
-          "pinName": "Y4"
+          "compName": "GUIand41#1",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "WE"
+          "compName": "GUIandor414#0",
+          "pinName": "C1"
          },
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 275.0,
-            "y": 185.0
+            "x": 305.0,
+            "y": 380.0
            },
            {
-            "x": 275.0,
-            "y": 215.0
+            "x": 305.0,
+            "y": 445.0
            },
            {
-            "x": 20.0,
-            "y": 215.0
+            "x": 245.0,
+            "y": 445.0
            },
            {
-            "x": 20.0,
-            "y": 825.0
+            "x": 245.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "A0"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "GUIandor414#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "A1"
+          "compName": "GUIandor414#1",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#118",
          "path": [
            {
-            "x": 45.0,
-            "y": 345.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "B0"
-        },
-        "path": [
+            "x": 300.0,
+            "y": 500.0
+          },
            {
-            "x": 50.0,
-            "y": 355.0
+            "x": 300.0,
+            "y": 590.0
+          },
+          {
+            "x": 240.0,
+            "y": 590.0
+          },
+          {
+            "x": 240.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "GUIandor414#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "B1"
+          "compName": "GUIandor414#1",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#119",
          "path": [
            {
-            "x": 55.0,
-            "y": 365.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "A0"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "A1"
-        },
-        "path": []
+            "x": 295.0,
+            "y": 510.0
+          },
+          {
+            "x": 295.0,
+            "y": 585.0
+          },
+          {
+            "x": 235.0,
+            "y": 585.0
+          },
+          {
+            "x": 235.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "B0"
+          "compName": "GUIram2#3",
+          "pinName": "B1"
          },
-        "path": []
+        "name": "unnamedWire#41",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 815.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "GUIand41#1",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "B1"
+          "compName": "GUIandor414#0",
+          "pinName": "C4"
          },
-        "path": []
+        "name": "unnamedWire#116",
+        "path": [
+          {
+            "x": 290.0,
+            "y": 410.0
+          },
+          {
+            "x": 290.0,
+            "y": 430.0
+          },
+          {
+            "x": 230.0,
+            "y": 430.0
+          },
+          {
+            "x": 230.0,
+            "y": 520.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "GUIandor414#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIandor414#1",
+          "pinName": "C1"
          },
-        "path": []
+        "name": "unnamedWire#117",
+        "path": [
+          {
+            "x": 305.0,
+            "y": 490.0
+          },
+          {
+            "x": 305.0,
+            "y": 595.0
+          },
+          {
+            "x": 245.0,
+            "y": 595.0
+          },
+          {
+            "x": 245.0,
+            "y": 640.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B2"
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#42",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 250.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "D1"
          },
-        "path": []
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 385.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#27",
            "pinName": ""
          },
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "A0"
+          "compName": "GUIram2#0",
+          "pinName": "D3"
          },
-        "path": []
+        "name": "unnamedWire#47",
+        "path": [
+          {
+            "x": 70.0,
+            "y": 405.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "A1"
+          "compName": "GUIram2#0",
+          "pinName": "D2"
          },
-        "path": []
+        "name": "unnamedWire#46",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 395.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "B0"
+          "compName": "GUIram2#1",
+          "pinName": "D1"
          },
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "B1"
+          "compName": "GUIram2#0",
+          "pinName": "D4"
          },
-        "path": []
+        "name": "unnamedWire#48",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 415.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "A0"
+          "compName": "GUIand41#2",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#100",
          "path": [
            {
-            "x": 40.0,
-            "y": 785.0
+            "x": 140.0,
+            "y": 365.0
+          },
+          {
+            "x": 140.0,
+            "y": 360.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "A1"
+          "compName": "GUIandor414#3",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#103",
          "path": [
            {
-            "x": 45.0,
-            "y": 795.0
+            "x": 140.0,
+            "y": 505.0
+          },
+          {
+            "x": 140.0,
+            "y": 500.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "B0"
+          "compName": "GUIandor414#3",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#104",
          "path": [
            {
-            "x": 50.0,
-            "y": 805.0
+            "x": 140.0,
+            "y": 515.0
+          },
+          {
+            "x": 140.0,
+            "y": 510.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "GUIandor414#3",
+          "pinName": "A1"
          },
-        "path": []
+        "name": "unnamedWire#101",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 485.0
+          },
+          {
+            "x": 140.0,
+            "y": 480.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "B1"
+          "compName": "GUIandor414#3",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#102",
          "path": [
            {
-            "x": 55.0,
-            "y": 815.0
+            "x": 140.0,
+            "y": 495.0
+          },
+          {
+            "x": 140.0,
+            "y": 490.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIram2#1",
+          "pinName": "D2"
+        },
+        "name": "unnamedWire#50",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIram2#2",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "GUIandor414#4",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#107",
          "path": [
            {
-            "x": 40.0,
-            "y": 250.0
+            "x": 140.0,
+            "y": 655.0
+          },
+          {
+            "x": 140.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "GUIram2#2",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "GUIandor414#4",
+          "pinName": "A4"
          },
-        "path": []
+        "name": "unnamedWire#108",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 665.0
+          },
+          {
+            "x": 140.0,
+            "y": 660.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "D4"
          },
+        "name": "unnamedWire#52",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUIram2#2",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "D1"
+          "compName": "GUIandor414#4",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#105",
          "path": [
            {
-            "x": 60.0,
-            "y": 385.0
+            "x": 140.0,
+            "y": 635.0
+          },
+          {
+            "x": 140.0,
+            "y": 630.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "D2"
+          "compName": "GUIram2#1",
+          "pinName": "D3"
          },
-        "path": [
-          {
-            "x": 65.0,
-            "y": 395.0
-          }
-        ]
+        "name": "unnamedWire#51",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUIram2#2",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "D3"
+          "compName": "GUIandor414#4",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#106",
          "path": [
            {
-            "x": 70.0,
-            "y": 405.0
+            "x": 140.0,
+            "y": 645.0
+          },
+          {
+            "x": 140.0,
+            "y": 640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#0",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 415.0
-          }
-        ]
+        "name": "unnamedWire#54",
+        "path": []
        },
        {
          "pin1": {
@@ -1258,605 +1283,817 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
+        "name": "unnamedWire#53",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
+        "name": "unnamedWire#56",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "GUIram2#3",
+          "pinName": "QA1"
+        },
+        "pin2": {
+          "compName": "GUIandor414#5",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#109",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 785.0
+          },
+          {
+            "x": 140.0,
+            "y": 780.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#1",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
+        "name": "unnamedWire#55",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUIand41#0",
+          "pinName": "Y2"
          },
          "pin2": {
            "compName": "GUIram2#1",
-          "pinName": "D4"
+          "pinName": "WE"
          },
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 285.0,
+            "y": 165.0
+          },
+          {
+            "x": 285.0,
+            "y": 225.0
+          },
+          {
+            "x": 30.0,
+            "y": 225.0
+          },
+          {
+            "x": 30.0,
+            "y": 525.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUIand41#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "WE"
          },
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 290.0,
+            "y": 155.0
+          },
+          {
+            "x": 290.0,
+            "y": 230.0
+          },
+          {
+            "x": 35.0,
+            "y": 230.0
+          },
+          {
+            "x": 35.0,
+            "y": 375.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUIand41#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUIram2#3",
+          "pinName": "WE"
          },
-        "path": []
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 275.0,
+            "y": 185.0
+          },
+          {
+            "x": 275.0,
+            "y": 215.0
+          },
+          {
+            "x": 20.0,
+            "y": 215.0
+          },
+          {
+            "x": 20.0,
+            "y": 825.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUIand41#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "GUIram2#2",
+          "pinName": "WE"
+        },
+        "name": "unnamedWire#15",
+        "path": [
+          {
+            "x": 280.0,
+            "y": 175.0
+          },
+          {
+            "x": 280.0,
+            "y": 220.0
+          },
+          {
+            "x": 25.0,
+            "y": 220.0
+          },
+          {
+            "x": 25.0,
+            "y": 675.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
+        "pin2": {
+          "compName": "GUIram2#0",
+          "pinName": "A0"
+        },
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
+        "name": "unnamedWire#17",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "D2"
+          "compName": "GUIram2#0",
+          "pinName": "B0"
          },
-        "path": []
+        "name": "unnamedWire#21",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 355.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#25",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "D3"
+          "compName": "GUIram2#0",
+          "pinName": "A1"
          },
-        "path": []
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 345.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#2",
-          "pinName": "D4"
+          "compName": "GUIram2#1",
+          "pinName": "A0"
          },
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "B1"
          },
-        "path": []
+        "name": "unnamedWire#22",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 365.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "B0"
          },
+        "name": "unnamedWire#25",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#20",
            "pinName": ""
          },
+        "name": "unnamedWire#27",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "D1"
+          "compName": "GUIram2#1",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
+        "name": "unnamedWire#29",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
+        "name": "unnamedWire#28",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "GUIram2#3",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
+        "name": "unnamedWire#30",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 60.0,
-            "y": 950.0
-          }
-        ]
+        "name": "unnamedWire#32",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 65.0,
-            "y": 1050.0
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUIram2#2",
+          "pinName": "A1"
          },
-        "path": [
-          {
-            "x": 70.0,
-            "y": 1150.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "GUIram2#2",
+          "pinName": "A0"
          },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 1250.0
-          }
-        ]
+        "name": "unnamedWire#33",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y00"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#2",
+          "compName": "GUIandor414#1",
            "pinName": "B"
          },
+        "name": "unnamedWire#79",
          "path": [
            {
-            "x": 135.0,
-            "y": 50.0
-          },
-          {
-            "x": 135.0,
-            "y": 370.0
+            "x": 220.0,
+            "y": 720.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y01"
+          "compName": "GUIram2#0",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "B"
+          "compName": "GUIand41#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#81",
          "path": [
            {
-            "x": 130.0,
-            "y": 60.0
+            "x": 140.0,
+            "y": 375.0
            },
            {
-            "x": 130.0,
-            "y": 520.0
+            "x": 140.0,
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y10"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#80",
          "path": [
            {
-            "x": 125.0,
-            "y": 70.0
-          },
-          {
-            "x": 125.0,
-            "y": 670.0
+            "x": 215.0,
+            "y": 870.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdemux2#0",
-          "pinName": "Y11"
+          "compName": "GUIram2#0",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "B"
+          "compName": "GUIand41#1",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#83",
          "path": [
            {
-            "x": 120.0,
-            "y": 80.0
+            "x": 140.0,
+            "y": 395.0
            },
            {
-            "x": 120.0,
-            "y": 820.0
+            "x": 140.0,
+            "y": 400.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "QB2"
          },
          "pin2": {
            "compName": "GUIand41#1",
-          "pinName": "B"
+          "pinName": "A2"
          },
+        "name": "unnamedWire#82",
          "path": [
            {
-            "x": 230.0,
-            "y": 420.0
+            "x": 140.0,
+            "y": 385.0
+          },
+          {
+            "x": 140.0,
+            "y": 390.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIram2#1",
+          "pinName": "QB1"
          },
          "pin2": {
            "compName": "GUIandor414#0",
-          "pinName": "B"
+          "pinName": "A1"
          },
+        "name": "unnamedWire#85",
          "path": [
            {
-            "x": 225.0,
-            "y": 570.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "B"
-        },
-        "path": [
+            "x": 140.0,
+            "y": 525.0
+          },
            {
-            "x": 220.0,
-            "y": 720.0
+            "x": 140.0,
+            "y": 530.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUIram2#0",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "B"
+          "compName": "GUIand41#1",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#84",
          "path": [
            {
-            "x": 215.0,
-            "y": 870.0
+            "x": 140.0,
+            "y": 405.0
+          },
+          {
+            "x": 140.0,
+            "y": 410.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
-          "pinName": "QB1"
+          "compName": "GUIram2#1",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A1"
+          "compName": "GUIandor414#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#87",
          "path": [
            {
              "x": 140.0,
-            "y": 375.0
+            "y": 545.0
            },
            {
              "x": 140.0,
-            "y": 380.0
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
+          "compName": "GUIram2#1",
            "pinName": "QB2"
          },
          "pin2": {
-          "compName": "GUIand41#1",
+          "compName": "GUIandor414#0",
            "pinName": "A2"
          },
+        "name": "unnamedWire#86",
          "path": [
            {
              "x": 140.0,
-            "y": 385.0
+            "y": 535.0
            },
            {
              "x": 140.0,
-            "y": 390.0
+            "y": 540.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
-          "pinName": "QB3"
+          "compName": "GUIram2#2",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "GUIand41#1",
-          "pinName": "A3"
+          "compName": "GUIandor414#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#89",
          "path": [
            {
              "x": 140.0,
-            "y": 395.0
+            "y": 675.0
            },
            {
              "x": 140.0,
-            "y": 400.0
+            "y": 680.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
+          "compName": "GUIram2#1",
            "pinName": "QB4"
          },
          "pin2": {
-          "compName": "GUIand41#1",
+          "compName": "GUIandor414#0",
            "pinName": "A4"
          },
+        "name": "unnamedWire#88",
          "path": [
            {
              "x": 140.0,
-            "y": 405.0
+            "y": 555.0
            },
            {
              "x": 140.0,
-            "y": 410.0
+            "y": 560.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QB1"
+          "compName": "GUIandor414#4",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A1"
+          "compName": "GUIandor414#5",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#140",
          "path": [
            {
-            "x": 140.0,
-            "y": 525.0
+            "x": 195.0,
+            "y": 620.0
            },
            {
-            "x": 140.0,
-            "y": 530.0
+            "x": 195.0,
+            "y": 715.0
+          },
+          {
+            "x": 135.0,
+            "y": 715.0
+          },
+          {
+            "x": 135.0,
+            "y": 770.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QB2"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIand41#0",
            "pinName": "A2"
          },
+        "name": "unnamedWire#9",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#5",
+          "pinName": "Y3"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QA3"
+        },
+        "name": "unnamedWire#143",
          "path": [
            {
-            "x": 140.0,
-            "y": 535.0
+            "x": 200.0,
+            "y": 760.0
            },
            {
-            "x": 140.0,
-            "y": 540.0
+            "x": 200.0,
+            "y": 890.0
+          },
+          {
+            "x": 320.0,
+            "y": 890.0
+          },
+          {
+            "x": 320.0,
+            "y": 250.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QB3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A3"
+          "compName": "GUIand41#0",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#5",
+          "pinName": "Y4"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QA4"
+        },
+        "name": "unnamedWire#144",
          "path": [
            {
-            "x": 140.0,
-            "y": 545.0
+            "x": 195.0,
+            "y": 770.0
            },
            {
-            "x": 140.0,
-            "y": 550.0
+            "x": 195.0,
+            "y": 895.0
+          },
+          {
+            "x": 325.0,
+            "y": 895.0
+          },
+          {
+            "x": 325.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QB4"
+          "compName": "GUIdemux2#1",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#5",
+          "pinName": "Y1"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QA1"
          },
+        "name": "unnamedWire#141",
          "path": [
            {
-            "x": 140.0,
-            "y": 555.0
+            "x": 210.0,
+            "y": 740.0
            },
            {
-            "x": 140.0,
-            "y": 560.0
+            "x": 210.0,
+            "y": 880.0
+          },
+          {
+            "x": 310.0,
+            "y": 880.0
+          },
+          {
+            "x": 310.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#2",
-          "pinName": "QB1"
+          "compName": "GUIdemux2#1",
+          "pinName": "Y10"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#5",
+          "pinName": "Y2"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QA2"
          },
+        "name": "unnamedWire#142",
          "path": [
            {
-            "x": 140.0,
-            "y": 675.0
+            "x": 205.0,
+            "y": 750.0
            },
            {
-            "x": 140.0,
-            "y": 680.0
+            "x": 205.0,
+            "y": 885.0
+          },
+          {
+            "x": 315.0,
+            "y": 885.0
+          },
+          {
+            "x": 315.0,
+            "y": 150.0
            }
          ]
        },
@@ -1869,6 +2106,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#1",
            "pinName": "A2"
          },
+        "name": "unnamedWire#90",
          "path": [
            {
              "x": 140.0,
@@ -1883,60 +2121,63 @@ mograsim version: 0.1.3
        {
          "pin1": {
            "compName": "GUIram2#2",
-          "pinName": "QB3"
+          "pinName": "QB4"
          },
          "pin2": {
            "compName": "GUIandor414#1",
-          "pinName": "A3"
+          "pinName": "A4"
          },
+        "name": "unnamedWire#92",
          "path": [
            {
              "x": 140.0,
-            "y": 695.0
+            "y": 705.0
            },
            {
              "x": 140.0,
-            "y": 700.0
+            "y": 710.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "GUIram2#2",
-          "pinName": "QB4"
+          "pinName": "QB3"
          },
          "pin2": {
            "compName": "GUIandor414#1",
-          "pinName": "A4"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#91",
          "path": [
            {
              "x": 140.0,
-            "y": 705.0
+            "y": 695.0
            },
            {
              "x": 140.0,
-            "y": 710.0
+            "y": 700.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#3",
-          "pinName": "QB1"
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "A1"
+          "compName": "GUIdemux2#0",
+          "pinName": "S1"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 140.0,
-            "y": 825.0
+            "x": 10.0,
+            "y": 150.0
            },
            {
-            "x": 140.0,
-            "y": 830.0
+            "x": 10.0,
+            "y": 60.0
            }
          ]
        },
@@ -1949,6 +2190,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#2",
            "pinName": "A2"
          },
+        "name": "unnamedWire#94",
          "path": [
            {
              "x": 140.0,
@@ -1960,23 +2202,36 @@ mograsim version: 0.1.3
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A0"
+        },
+        "pin2": {
+          "compName": "GUIdemux2#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "GUIram2#3",
-          "pinName": "QB3"
+          "pinName": "QB1"
          },
          "pin2": {
            "compName": "GUIandor414#2",
-          "pinName": "A3"
+          "pinName": "A1"
          },
+        "name": "unnamedWire#93",
          "path": [
            {
              "x": 140.0,
-            "y": 845.0
+            "y": 825.0
            },
            {
              "x": 140.0,
-            "y": 850.0
+            "y": 830.0
            }
          ]
        },
@@ -1989,6 +2244,7 @@ mograsim version: 0.1.3
            "compName": "GUIandor414#2",
            "pinName": "A4"
          },
+        "name": "unnamedWire#96",
          "path": [
            {
              "x": 140.0,
@@ -2002,1185 +2258,1074 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
-          "pinName": "QA1"
+          "compName": "GUIram2#3",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "GUIand41#2",
-          "pinName": "A1"
+          "compName": "GUIandor414#2",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#95",
          "path": [
            {
              "x": 140.0,
-            "y": 335.0
+            "y": 845.0
            },
            {
              "x": 140.0,
-            "y": 330.0
+            "y": 850.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
-          "pinName": "QA2"
+          "compName": "GUIdemux2#1",
+          "pinName": "Y01"
          },
          "pin2": {
-          "compName": "GUIand41#2",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 345.0
-          },
-          {
-            "x": 140.0,
-            "y": 340.0
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#0",
-          "pinName": "QA3"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand41#2",
+          "compName": "GUIand41#0",
            "pinName": "A3"
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 355.0
-          },
-          {
-            "x": 140.0,
-            "y": 350.0
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
            "compName": "GUIram2#0",
-          "pinName": "QA4"
+          "pinName": "QA2"
          },
          "pin2": {
            "compName": "GUIand41#2",
-          "pinName": "A4"
+          "pinName": "A2"
          },
+        "name": "unnamedWire#98",
          "path": [
            {
              "x": 140.0,
-            "y": 365.0
+            "y": 345.0
            },
            {
              "x": 140.0,
-            "y": 360.0
+            "y": 340.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QA1"
+          "compName": "GUIdemux2#1",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 485.0
-          },
-          {
-            "x": 140.0,
-            "y": 480.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QA2"
+          "compName": "GUIram2#0",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A2"
+          "compName": "GUIand41#2",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#97",
          "path": [
            {
              "x": 140.0,
-            "y": 495.0
+            "y": 335.0
            },
            {
              "x": 140.0,
-            "y": 490.0
+            "y": 330.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QA3"
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A3"
+          "compName": "GUIdemux2#1",
+          "pinName": "S1"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 140.0,
-            "y": 505.0
+            "x": 10.0,
+            "y": 550.0
            },
            {
-            "x": 140.0,
-            "y": 500.0
+            "x": 10.0,
+            "y": 165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#1",
-          "pinName": "QA4"
+          "compName": "_submodelinterface",
+          "pinName": "WE"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "A4"
+          "compName": "GUIand41#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 140.0,
-            "y": 515.0
+            "x": 15.0,
+            "y": 850.0
            },
            {
-            "x": 140.0,
-            "y": 510.0
+            "x": 15.0,
+            "y": 195.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#2",
-          "pinName": "QA1"
+          "compName": "_submodelinterface",
+          "pinName": "B0"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "A1"
+          "compName": "GUIdemux2#1",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 140.0,
-            "y": 635.0
+            "x": 5.0,
+            "y": 450.0
            },
            {
-            "x": 140.0,
-            "y": 630.0
+            "x": 5.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#2",
-          "pinName": "QA2"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "A2"
+          "compName": "GUIand41#0",
+          "pinName": "A4"
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 645.0
-          },
-          {
-            "x": 140.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#2",
+          "compName": "GUIram2#0",
            "pinName": "QA3"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIand41#2",
            "pinName": "A3"
          },
+        "name": "unnamedWire#99",
          "path": [
            {
              "x": 140.0,
-            "y": 655.0
+            "y": 355.0
            },
            {
              "x": 140.0,
-            "y": 650.0
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram2#2",
-          "pinName": "QA4"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "A4"
+          "compName": "GUIram2#2",
+          "pinName": "D2"
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 665.0
-          },
-          {
-            "x": 140.0,
-            "y": 660.0
-          }
-        ]
+        "name": "unnamedWire#58",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#3",
-          "pinName": "QA1"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A1"
+          "compName": "GUIram2#2",
+          "pinName": "D1"
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 785.0
-          },
-          {
-            "x": 140.0,
-            "y": 780.0
-          }
-        ]
+        "name": "unnamedWire#57",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#3",
-          "pinName": "QA2"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A2"
+          "compName": "GUIram2#2",
+          "pinName": "D3"
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 795.0
-          },
-          {
-            "x": 140.0,
-            "y": 790.0
-          }
-        ]
+        "name": "unnamedWire#59",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram2#3",
-          "pinName": "QA3"
+          "compName": "GUIand41#2",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A3"
+          "compName": "GUIandor414#3",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#132",
          "path": [
            {
-            "x": 140.0,
-            "y": 805.0
+            "x": 195.0,
+            "y": 360.0
            },
            {
-            "x": 140.0,
-            "y": 800.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUIram2#3",
-          "pinName": "QA4"
-        },
-        "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "A4"
-        },
-        "path": [
+            "x": 195.0,
+            "y": 415.0
+          },
            {
-            "x": 140.0,
-            "y": 815.0
+            "x": 135.0,
+            "y": 415.0
            },
            {
-            "x": 140.0,
-            "y": 810.0
+            "x": 135.0,
+            "y": 470.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
+          "compName": "GUIandor414#3",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#4",
            "pinName": "C1"
          },
+        "name": "unnamedWire#133",
          "path": [
            {
-            "x": 305.0,
-            "y": 380.0
+            "x": 210.0,
+            "y": 440.0
            },
            {
-            "x": 305.0,
-            "y": 445.0
+            "x": 210.0,
+            "y": 580.0
            },
            {
-            "x": 245.0,
-            "y": 445.0
+            "x": 150.0,
+            "y": 580.0
            },
            {
-            "x": 245.0,
-            "y": 490.0
+            "x": 150.0,
+            "y": 590.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
+          "compName": "GUIand41#2",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#3",
            "pinName": "C2"
          },
+        "name": "unnamedWire#130",
          "path": [
            {
-            "x": 300.0,
-            "y": 390.0
+            "x": 205.0,
+            "y": 340.0
            },
            {
-            "x": 300.0,
-            "y": 440.0
+            "x": 205.0,
+            "y": 425.0
            },
            {
-            "x": 240.0,
-            "y": 440.0
+            "x": 145.0,
+            "y": 425.0
            },
            {
-            "x": 240.0,
-            "y": 500.0
+            "x": 145.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
+          "compName": "GUIand41#2",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#3",
            "pinName": "C3"
          },
+        "name": "unnamedWire#131",
          "path": [
            {
-            "x": 295.0,
-            "y": 400.0
+            "x": 200.0,
+            "y": 350.0
            },
            {
-            "x": 295.0,
-            "y": 435.0
+            "x": 200.0,
+            "y": 420.0
            },
            {
-            "x": 235.0,
-            "y": 435.0
+            "x": 140.0,
+            "y": 420.0
            },
            {
-            "x": 235.0,
-            "y": 510.0
+            "x": 140.0,
+            "y": 460.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#1",
+          "compName": "GUIandor414#3",
            "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#4",
            "pinName": "C4"
          },
+        "name": "unnamedWire#136",
          "path": [
            {
-            "x": 290.0,
-            "y": 410.0
+            "x": 195.0,
+            "y": 470.0
            },
            {
-            "x": 290.0,
-            "y": 430.0
+            "x": 195.0,
+            "y": 565.0
            },
            {
-            "x": 230.0,
-            "y": 430.0
+            "x": 135.0,
+            "y": 565.0
            },
            {
-            "x": 230.0,
-            "y": 520.0
+            "x": 135.0,
+            "y": 620.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#4",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
+          "compName": "GUIandor414#5",
            "pinName": "C1"
          },
+        "name": "unnamedWire#137",
          "path": [
            {
-            "x": 305.0,
-            "y": 490.0
+            "x": 210.0,
+            "y": 590.0
            },
            {
-            "x": 305.0,
-            "y": 595.0
+            "x": 210.0,
+            "y": 730.0
            },
            {
-            "x": 245.0,
-            "y": 595.0
+            "x": 150.0,
+            "y": 730.0
            },
            {
-            "x": 245.0,
-            "y": 640.0
+            "x": 150.0,
+            "y": 740.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#3",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
+          "compName": "GUIandor414#4",
            "pinName": "C2"
          },
+        "name": "unnamedWire#134",
          "path": [
            {
-            "x": 300.0,
-            "y": 500.0
+            "x": 205.0,
+            "y": 450.0
            },
            {
-            "x": 300.0,
-            "y": 590.0
+            "x": 205.0,
+            "y": 575.0
            },
            {
-            "x": 240.0,
-            "y": 590.0
+            "x": 145.0,
+            "y": 575.0
            },
            {
-            "x": 240.0,
-            "y": 650.0
+            "x": 145.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
+          "compName": "GUIandor414#3",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#1",
+          "compName": "GUIandor414#4",
            "pinName": "C3"
          },
+        "name": "unnamedWire#135",
          "path": [
            {
-            "x": 295.0,
-            "y": 510.0
+            "x": 200.0,
+            "y": 460.0
            },
            {
-            "x": 295.0,
-            "y": 585.0
+            "x": 200.0,
+            "y": 570.0
            },
            {
-            "x": 235.0,
-            "y": 585.0
+            "x": 140.0,
+            "y": 570.0
            },
            {
-            "x": 235.0,
-            "y": 660.0
+            "x": 140.0,
+            "y": 610.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#1",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 290.0,
-            "y": 520.0
-          },
-          {
-            "x": 290.0,
-            "y": 580.0
-          },
-          {
-            "x": 230.0,
-            "y": 580.0
-          },
-          {
-            "x": 230.0,
-            "y": 670.0
-          }
-        ]
+        "name": "unnamedWire#61",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C1"
+          "compName": "GUIram2#2",
+          "pinName": "D4"
          },
-        "path": [
-          {
-            "x": 305.0,
-            "y": 640.0
-          },
-          {
-            "x": 305.0,
-            "y": 745.0
-          },
-          {
-            "x": 245.0,
-            "y": 745.0
-          },
-          {
-            "x": 245.0,
-            "y": 790.0
-          }
-        ]
+        "name": "unnamedWire#60",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
+        },
+        "name": "unnamedWire#63",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#4",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
+          "compName": "GUIandor414#5",
            "pinName": "C2"
          },
+        "name": "unnamedWire#138",
          "path": [
            {
-            "x": 300.0,
-            "y": 650.0
+            "x": 205.0,
+            "y": 600.0
            },
            {
-            "x": 300.0,
-            "y": 740.0
+            "x": 205.0,
+            "y": 725.0
            },
            {
-            "x": 240.0,
-            "y": 740.0
+            "x": 145.0,
+            "y": 725.0
            },
            {
-            "x": 240.0,
-            "y": 800.0
+            "x": 145.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C3"
-        },
-        "path": [
-          {
-            "x": 295.0,
-            "y": 660.0
-          },
-          {
-            "x": 295.0,
-            "y": 735.0
-          },
-          {
-            "x": 235.0,
-            "y": 735.0
-          },
-          {
-            "x": 235.0,
-            "y": 810.0
-          }
-        ]
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "name": "unnamedWire#62",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#1",
-          "pinName": "Y4"
+          "compName": "GUIandor414#4",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#2",
-          "pinName": "C4"
+          "compName": "GUIandor414#5",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#139",
          "path": [
            {
-            "x": 290.0,
-            "y": 670.0
+            "x": 200.0,
+            "y": 610.0
            },
            {
-            "x": 290.0,
-            "y": 730.0
+            "x": 200.0,
+            "y": 720.0
            },
            {
-            "x": 230.0,
-            "y": 730.0
+            "x": 140.0,
+            "y": 720.0
            },
            {
-            "x": 230.0,
-            "y": 820.0
+            "x": 140.0,
+            "y": 760.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
+          "compName": "GUIram2#3",
+          "pinName": "D1"
          },
-        "path": [
-          {
-            "x": 330.0,
-            "y": 790.0
-          },
-          {
-            "x": 330.0,
-            "y": 450.0
-          }
-        ]
+        "name": "unnamedWire#65",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 335.0,
-            "y": 800.0
-          },
-          {
-            "x": 335.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#64",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
+          "compName": "GUIram2#3",
+          "pinName": "D3"
          },
-        "path": [
-          {
-            "x": 340.0,
-            "y": 810.0
-          },
-          {
-            "x": 340.0,
-            "y": 650.0
-          }
-        ]
+        "name": "unnamedWire#67",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIandor414#2",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
+          "compName": "GUIram2#3",
+          "pinName": "D2"
+        },
+        "name": "unnamedWire#66",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "QB4"
+          "pinName": "D1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
+        "name": "unnamedWire#69",
          "path": [
            {
-            "x": 345.0,
-            "y": 820.0
-          },
-          {
-            "x": 345.0,
-            "y": 750.0
+            "x": 60.0,
+            "y": 950.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIram2#3",
+          "pinName": "D4"
+        },
+        "name": "unnamedWire#68",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIandor414#1",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#2",
            "pinName": "C1"
          },
+        "name": "unnamedWire#121",
          "path": [
            {
-            "x": 210.0,
-            "y": 330.0
+            "x": 305.0,
+            "y": 640.0
            },
            {
-            "x": 210.0,
-            "y": 430.0
+            "x": 305.0,
+            "y": 745.0
            },
            {
-            "x": 150.0,
-            "y": 430.0
+            "x": 245.0,
+            "y": 745.0
            },
            {
-            "x": 150.0,
-            "y": 440.0
+            "x": 245.0,
+            "y": 790.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
+          "compName": "GUIandor414#1",
            "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#2",
            "pinName": "C2"
          },
+        "name": "unnamedWire#122",
          "path": [
            {
-            "x": 205.0,
-            "y": 340.0
+            "x": 300.0,
+            "y": 650.0
            },
            {
-            "x": 205.0,
-            "y": 425.0
+            "x": 300.0,
+            "y": 740.0
            },
            {
-            "x": 145.0,
-            "y": 425.0
+            "x": 240.0,
+            "y": 740.0
            },
            {
-            "x": 145.0,
-            "y": 450.0
+            "x": 240.0,
+            "y": 800.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
-          "pinName": "Y3"
+          "compName": "GUIandor414#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "C3"
+          "compName": "GUIandor414#1",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#120",
          "path": [
            {
-            "x": 200.0,
-            "y": 350.0
+            "x": 290.0,
+            "y": 520.0
            },
            {
-            "x": 200.0,
-            "y": 420.0
+            "x": 290.0,
+            "y": 580.0
            },
            {
-            "x": 140.0,
-            "y": 420.0
+            "x": 230.0,
+            "y": 580.0
            },
            {
-            "x": 140.0,
-            "y": 460.0
+            "x": 230.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand41#2",
-          "pinName": "Y4"
+          "compName": "GUIandor414#2",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#3",
-          "pinName": "C4"
+          "compName": "_submodelinterface",
+          "pinName": "QB1"
          },
+        "name": "unnamedWire#125",
          "path": [
            {
-            "x": 195.0,
-            "y": 360.0
-          },
-          {
-            "x": 195.0,
-            "y": 415.0
-          },
-          {
-            "x": 135.0,
-            "y": 415.0
+            "x": 330.0,
+            "y": 790.0
            },
            {
-            "x": 135.0,
-            "y": 470.0
+            "x": 330.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
-          "pinName": "Y1"
+          "compName": "GUIandor414#2",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "C1"
+          "compName": "_submodelinterface",
+          "pinName": "QB2"
          },
+        "name": "unnamedWire#126",
          "path": [
            {
-            "x": 210.0,
-            "y": 440.0
-          },
-          {
-            "x": 210.0,
-            "y": 580.0
-          },
-          {
-            "x": 150.0,
-            "y": 580.0
+            "x": 335.0,
+            "y": 800.0
            },
            {
-            "x": 150.0,
-            "y": 590.0
+            "x": 335.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
+        "name": "unnamedWire#70",
          "path": [
            {
-            "x": 205.0,
-            "y": 450.0
-          },
-          {
-            "x": 205.0,
-            "y": 575.0
-          },
-          {
-            "x": 145.0,
-            "y": 575.0
-          },
-          {
-            "x": 145.0,
-            "y": 600.0
+            "x": 65.0,
+            "y": 1050.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#1",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#2",
            "pinName": "C3"
          },
+        "name": "unnamedWire#123",
          "path": [
            {
-            "x": 200.0,
-            "y": 460.0
+            "x": 295.0,
+            "y": 660.0
            },
            {
-            "x": 200.0,
-            "y": 570.0
+            "x": 295.0,
+            "y": 735.0
            },
            {
-            "x": 140.0,
-            "y": 570.0
+            "x": 235.0,
+            "y": 735.0
            },
            {
-            "x": 140.0,
-            "y": 610.0
+            "x": 235.0,
+            "y": 810.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#3",
+          "compName": "GUIandor414#1",
            "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#2",
            "pinName": "C4"
          },
+        "name": "unnamedWire#124",
          "path": [
            {
-            "x": 195.0,
-            "y": 470.0
+            "x": 290.0,
+            "y": 670.0
            },
            {
-            "x": 195.0,
-            "y": 565.0
+            "x": 290.0,
+            "y": 730.0
            },
            {
-            "x": 135.0,
-            "y": 565.0
+            "x": 230.0,
+            "y": 730.0
            },
            {
-            "x": 135.0,
-            "y": 620.0
+            "x": 230.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
+          "compName": "_submodelinterface",
+          "pinName": "D4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
+        },
+        "name": "unnamedWire#72",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 1250.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIand41#2",
            "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
+          "compName": "GUIandor414#3",
            "pinName": "C1"
          },
+        "name": "unnamedWire#129",
          "path": [
            {
              "x": 210.0,
-            "y": 590.0
+            "y": 330.0
            },
            {
              "x": 210.0,
-            "y": 730.0
+            "y": 430.0
            },
            {
              "x": 150.0,
-            "y": 730.0
+            "y": 430.0
            },
            {
              "x": 150.0,
-            "y": 740.0
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "D3"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
+        "name": "unnamedWire#71",
          "path": [
            {
-            "x": 205.0,
-            "y": 600.0
-          },
-          {
-            "x": 205.0,
-            "y": 725.0
-          },
+            "x": 70.0,
+            "y": 1150.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIdemux2#0",
+          "pinName": "Y01"
+        },
+        "pin2": {
+          "compName": "GUIandor414#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#74",
+        "path": [
            {
-            "x": 145.0,
-            "y": 725.0
+            "x": 130.0,
+            "y": 60.0
            },
            {
-            "x": 145.0,
-            "y": 750.0
+            "x": 130.0,
+            "y": 520.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
+          "compName": "GUIandor414#2",
            "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "C3"
+          "compName": "_submodelinterface",
+          "pinName": "QB3"
          },
+        "name": "unnamedWire#127",
          "path": [
            {
-            "x": 200.0,
-            "y": 610.0
-          },
-          {
-            "x": 200.0,
-            "y": 720.0
-          },
-          {
-            "x": 140.0,
-            "y": 720.0
+            "x": 340.0,
+            "y": 810.0
            },
            {
-            "x": 140.0,
-            "y": 760.0
+            "x": 340.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#4",
-          "pinName": "Y4"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y00"
          },
          "pin2": {
-          "compName": "GUIandor414#5",
-          "pinName": "C4"
+          "compName": "GUIand41#2",
+          "pinName": "B"
          },
+        "name": "unnamedWire#73",
          "path": [
-          {
-            "x": 195.0,
-            "y": 620.0
-          },
-          {
-            "x": 195.0,
-            "y": 715.0
-          },
            {
              "x": 135.0,
-            "y": 715.0
+            "y": 50.0
            },
            {
              "x": 135.0,
-            "y": 770.0
+            "y": 370.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y1"
+          "compName": "GUIandor414#2",
+          "pinName": "Y4"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "QA1"
+          "pinName": "QB4"
          },
+        "name": "unnamedWire#128",
          "path": [
            {
-            "x": 210.0,
-            "y": 740.0
-          },
-          {
-            "x": 210.0,
-            "y": 880.0
-          },
-          {
-            "x": 310.0,
-            "y": 880.0
+            "x": 345.0,
+            "y": 820.0
            },
            {
-            "x": 310.0,
-            "y": 50.0
+            "x": 345.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y2"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y11"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
+          "compName": "GUIandor414#5",
+          "pinName": "B"
          },
+        "name": "unnamedWire#76",
          "path": [
            {
-            "x": 205.0,
-            "y": 750.0
-          },
-          {
-            "x": 205.0,
-            "y": 885.0
-          },
-          {
-            "x": 315.0,
-            "y": 885.0
+            "x": 120.0,
+            "y": 80.0
            },
            {
-            "x": 315.0,
-            "y": 150.0
+            "x": 120.0,
+            "y": 820.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y3"
+          "compName": "GUIdemux2#0",
+          "pinName": "Y10"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
+          "compName": "GUIandor414#4",
+          "pinName": "B"
          },
+        "name": "unnamedWire#75",
          "path": [
            {
-            "x": 200.0,
-            "y": 760.0
-          },
-          {
-            "x": 200.0,
-            "y": 890.0
-          },
-          {
-            "x": 320.0,
-            "y": 890.0
+            "x": 125.0,
+            "y": 70.0
            },
            {
-            "x": 320.0,
-            "y": 250.0
+            "x": 125.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIandor414#5",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
+          "compName": "GUIandor414#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 195.0,
-            "y": 770.0
-          },
-          {
-            "x": 195.0,
-            "y": 895.0
-          },
-          {
-            "x": 325.0,
-            "y": 895.0
-          },
+            "x": 225.0,
+            "y": 570.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIand41#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#77",
+        "path": [
            {
-            "x": 325.0,
-            "y": 350.0
+            "x": 230.0,
+            "y": 420.0
            }
          ]
        }
diff --git a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json

index 099fb5f..90d6f1c 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
@@ -120,673 +120,706 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 20.0,
            "y": 52.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 20.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 20.0,
            "y": 152.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 20.0,
            "y": 102.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
          "pos": {
            "x": 65.0,
            "y": 77.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#10",
          "pos": {
            "x": 65.0,
            "y": 52.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 6.5,
            "y": 66.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 6.5,
            "y": 16.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 4.0,
            "y": 41.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 6.5,
            "y": 116.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 4.0,
            "y": 141.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 4.0,
            "y": 91.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
          "pos": {
            "x": 65.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
          "pos": {
            "x": 65.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 20.0,
            "y": 77.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 20.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 20.0,
            "y": 177.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 20.0,
            "y": 127.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUINandGate#2",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 62.5
-          },
-          {
-            "x": 15.0,
-            "y": 7.5
-          }
-        ]
+        "name": "unnamedWire#14"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
            "compName": "GUINandGate#1",
-          "pinName": "A"
+          "pinName": "B"
          },
+        "name": "unnamedWire#13"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#16"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 17.5,
-            "y": 87.5
-          },
-          {
-            "x": 17.5,
-            "y": 57.5
+            "x": 7.5,
+            "y": 167.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#18"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#4",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#17"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#5",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#19"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#7",
+          "pinName": "B"
          },
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 17.5,
-            "y": 112.5
-          },
-          {
-            "x": 17.5,
-            "y": 107.5
+            "x": 5.0,
+            "y": 192.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "GUINandGate#6",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#20"
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#4",
+          "pinName": "Y"
          },
+        "pin2": {
+          "compName": "GUINandGate#8",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 17.5,
-            "y": 137.5
+            "x": 45.0,
+            "y": 37.5
            },
            {
-            "x": 17.5,
-            "y": 157.5
+            "x": 45.0,
+            "y": 17.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#8",
            "pinName": "A"
          },
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 10.0,
-            "y": 162.5
+            "x": 42.5,
+            "y": 12.5
            },
            {
-            "x": 10.0,
-            "y": 32.5
+            "x": 42.5,
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
+          "compName": "GUINandGate#5",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "A"
+          "compName": "GUINandGate#9",
+          "pinName": "B"
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 12.5,
-            "y": 187.5
+            "x": 50.0,
+            "y": 87.5
            },
            {
-            "x": 12.5,
-            "y": 82.5
+            "x": 50.0,
+            "y": 42.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#9",
            "pinName": "A"
          },
+        "name": "unnamedWire#24",
          "path": [
            {
-            "x": 15.0,
-            "y": 212.5
+            "x": 47.5,
+            "y": 62.5
            },
            {
-            "x": 15.0,
-            "y": 132.5
+            "x": 47.5,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
+          "compName": "GUINandGate#6",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "A"
+          "compName": "GUINandGate#10",
+          "pinName": "B"
          },
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 10.0,
-            "y": 237.5
+            "x": 55.0,
+            "y": 137.5
            },
            {
-            "x": 10.0,
-            "y": 182.5
+            "x": 55.0,
+            "y": 67.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SA"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        }
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#10",
+          "pinName": "A"
          },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        }
+        "name": "unnamedWire#26",
+        "path": [
+          {
+            "x": 52.5,
+            "y": 112.5
+          },
+          {
+            "x": 52.5,
+            "y": 57.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#11",
            "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
          },
-        "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#29",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 187.5
+          },
+          {
+            "x": 60.0,
+            "y": 92.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "GUINandGate#11",
+          "pinName": "A"
          },
+        "name": "unnamedWire#28",
          "path": [
            {
-            "x": 7.5,
-            "y": 167.5
+            "x": 57.5,
+            "y": 162.5
+          },
+          {
+            "x": 57.5,
+            "y": 82.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "SB"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        }
-      },
-      {
-        "pin1": {
            "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        }
+        "name": "unnamedWire#9"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "SA"
          },
          "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#8"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B4"
          },
          "pin2": {
            "compName": "GUINandGate#7",
-          "pinName": "B"
+          "pinName": "A"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 5.0,
-            "y": 192.5
+            "x": 10.0,
+            "y": 237.5
+          },
+          {
+            "x": 10.0,
+            "y": 182.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#6",
            "pinName": "A"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 42.5,
-            "y": 12.5
+            "x": 15.0,
+            "y": 212.5
            },
            {
-            "x": 42.5,
-            "y": 7.5
+            "x": 15.0,
+            "y": 132.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
-          "pinName": "B"
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 45.0,
-            "y": 37.5
+            "x": 17.5,
+            "y": 87.5
            },
            {
-            "x": 45.0,
-            "y": 17.5
+            "x": 17.5,
+            "y": 57.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#0",
          "path": [
            {
-            "x": 47.5,
+            "x": 15.0,
              "y": 62.5
            },
            {
-            "x": 47.5,
-            "y": 32.5
+            "x": 15.0,
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#8",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#9",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
          },
-        "path": [
-          {
-            "x": 50.0,
-            "y": 87.5
-          },
-          {
-            "x": 50.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#30",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#5",
            "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 52.5,
-            "y": 112.5
+            "x": 12.5,
+            "y": 187.5
            },
            {
-            "x": 52.5,
-            "y": 57.5
+            "x": 12.5,
+            "y": 82.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
-          "pinName": "B"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 55.0,
-            "y": 137.5
-          },
-          {
-            "x": 55.0,
-            "y": 67.5
-          }
-        ]
+        "name": "unnamedWire#10"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#10",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#11",
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#32",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "GUINandGate#4",
            "pinName": "A"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 57.5,
+            "x": 10.0,
              "y": 162.5
            },
            {
-            "x": 57.5,
-            "y": 82.5
+            "x": 10.0,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#9",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#11",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
+        },
+        "name": "unnamedWire#31",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
          },
+        "pin2": {
+          "compName": "GUINandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 60.0,
-            "y": 187.5
+            "x": 17.5,
+            "y": 137.5
            },
            {
-            "x": 60.0,
-            "y": 92.5
+            "x": 17.5,
+            "y": 157.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#8",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#12"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#9",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 112.5
+          },
+          {
+            "x": 17.5,
+            "y": 107.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#10",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#11"
        },
        {
          "pin1": {
@@ -797,6 +830,7 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Y4"
          },
+        "name": "unnamedWire#33",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json

index c85cf05..7b3b5a1 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
@@ -160,118 +160,118 @@ mograsim version: 0.1.3
      "innerScale": 0.2,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 50.0,
            "y": 620.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 50.0,
            "y": 570.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 50.0,
            "y": 720.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 50.0,
            "y": 670.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "GUInot4",
+        "name": "GUInot4#0",
          "pos": {
            "x": 75.0,
            "y": 250.0
-        },
-        "id": "GUInot4",
-        "name": "GUInot4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 29.0,
            "y": 634.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 29.0,
            "y": 584.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 29.0,
            "y": 684.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 152.5,
            "y": 65.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUIsel2_4",
+        "name": "GUIsel2_4#0",
          "pos": {
            "x": 35.0,
            "y": 250.0
-        },
-        "id": "GUIsel2_4",
-        "name": "GUIsel2_4#0"
+        }
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 152.5,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 152.5,
            "y": 165.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 152.5,
            "y": 115.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
@@ -279,505 +279,515 @@ mograsim version: 0.1.3
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "SA"
+          "pinName": "SC"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "SA"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#14",
          "path": [
            {
-            "x": 25.0,
-            "y": 25.0
-          },
-          {
-            "x": 25.0,
-            "y": 255.0
+            "x": 30.0,
+            "y": 125.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "SB"
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
          },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 75.0
-          },
-          {
-            "x": 20.0,
-            "y": 265.0
-          }
-        ]
+        "name": "unnamedWire#36",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A1"
+          "compName": "GUInot4#0",
+          "pinName": "A4"
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 175.0
-          },
-          {
-            "x": 15.0,
-            "y": 275.0
-          }
-        ]
+        "name": "unnamedWire#13",
+        "path": []
        },
        {
          "pin1": {
+          "compName": "GUINandGate#6",
+          "pinName": "Y"
+        },
+        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "A2"
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#35",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 10.0,
-            "y": 225.0
-          },
-          {
-            "x": 10.0,
-            "y": 285.0
+            "x": 30.0,
+            "y": 125.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A3"
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 275.0
-          },
-          {
-            "x": 5.0,
-            "y": 295.0
-          }
-        ]
+        "name": "unnamedWire#15",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 5.0,
-            "y": 325.0
-          },
-          {
-            "x": 5.0,
-            "y": 305.0
+            "x": 30.0,
+            "y": 125.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B1"
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 375.0
-          },
-          {
-            "x": 10.0,
-            "y": 315.0
-          }
-        ]
+        "name": "unnamedWire#17",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B2"
+          "compName": "GUINandGate#2",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 425.0
-          },
-          {
-            "x": 15.0,
-            "y": 325.0
-          }
-        ]
+        "name": "unnamedWire#19",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B3"
+          "pinName": "C1"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B3"
+          "compName": "GUINandGate#0",
+          "pinName": "A"
          },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 475.0
-          },
-          {
-            "x": 20.0,
-            "y": 335.0
-          }
-        ]
+        "name": "unnamedWire#21",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B4"
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 25.0,
-            "y": 525.0
-          },
-          {
-            "x": 25.0,
-            "y": 345.0
+            "x": 30.0,
+            "y": 735.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "C3"
          },
          "pin2": {
-          "compName": "GUInot4#0",
-          "pinName": "A1"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "C2"
          },
          "pin2": {
-          "compName": "GUInot4#0",
-          "pinName": "A2"
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
            "compName": "GUInot4#0",
-          "pinName": "A3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "GUInot4#0",
-          "pinName": "A4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SC"
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "A"
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 30.0,
-            "y": 125.0
+            "x": 115.0,
+            "y": 255.0
+          },
+          {
+            "x": 115.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "C4"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUINandGate#3",
+          "pinName": "A"
          },
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUInot4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#6",
+          "pinName": "A"
          },
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 30.0,
-            "y": 125.0
+            "x": 125.0,
+            "y": 275.0
+          },
+          {
+            "x": 125.0,
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUInot4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#5",
+          "pinName": "A"
          },
+        "name": "unnamedWire#26",
          "path": [
            {
-            "x": 30.0,
-            "y": 125.0
+            "x": 120.0,
+            "y": 265.0
+          },
+          {
+            "x": 120.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#4",
            "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#29",
+        "path": [
+          {
+            "x": 135.0,
+            "y": 580.0
+          },
+          {
+            "x": 135.0,
+            "y": 30.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUInot4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "GUINandGate#7",
+          "pinName": "A"
          },
+        "name": "unnamedWire#28",
          "path": [
            {
-            "x": 30.0,
-            "y": 735.0
+            "x": 130.0,
+            "y": 285.0
+          },
+          {
+            "x": 130.0,
+            "y": 170.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C1"
+          "pinName": "B4"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B4"
          },
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 525.0
+          },
+          {
+            "x": 25.0,
+            "y": 345.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C2"
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B3"
          },
-        "path": []
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 475.0
+          },
+          {
+            "x": 20.0,
+            "y": 335.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C3"
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B2"
          },
-        "path": []
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 425.0
+          },
+          {
+            "x": 15.0,
+            "y": 325.0
+          }
+        ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "C4"
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B1"
          },
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 375.0
+          },
+          {
+            "x": 10.0,
+            "y": 315.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUInot4#0",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "SB"
          },
          "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "SB"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 115.0,
-            "y": 255.0
+            "x": 20.0,
+            "y": 75.0
            },
            {
-            "x": 115.0,
-            "y": 20.0
+            "x": 20.0,
+            "y": 265.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUInot4#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "SA"
          },
          "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "SA"
          },
+        "name": "unnamedWire#0",
          "path": [
            {
-            "x": 120.0,
-            "y": 265.0
+            "x": 25.0,
+            "y": 25.0
            },
            {
-            "x": 120.0,
-            "y": 70.0
+            "x": 25.0,
+            "y": 255.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUInot4#0",
-          "pinName": "Y3"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "A"
+          "compName": "GUINandGate#5",
+          "pinName": "B"
          },
+        "name": "unnamedWire#30",
          "path": [
            {
-            "x": 125.0,
-            "y": 275.0
+            "x": 140.0,
+            "y": 630.0
            },
            {
-            "x": 125.0,
-            "y": 120.0
+            "x": 140.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUInot4#0",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "A4"
          },
          "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "A"
+          "compName": "GUIsel2_4#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 130.0,
-            "y": 285.0
+            "x": 5.0,
+            "y": 325.0
            },
            {
-            "x": 130.0,
-            "y": 170.0
+            "x": 5.0,
+            "y": 305.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y1"
+        },
+        "pin2": {
+          "compName": "GUInot4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#3",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#7",
            "pinName": "B"
          },
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 135.0,
-            "y": 580.0
+            "x": 150.0,
+            "y": 730.0
            },
            {
-            "x": 135.0,
-            "y": 30.0
+            "x": 150.0,
+            "y": 180.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "B"
+          "compName": "GUIsel2_4#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 140.0,
-            "y": 630.0
+            "x": 5.0,
+            "y": 275.0
            },
            {
-            "x": 140.0,
-            "y": 80.0
+            "x": 5.0,
+            "y": 295.0
            }
          ]
        },
@@ -790,6 +800,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#6",
            "pinName": "B"
          },
+        "name": "unnamedWire#31",
          "path": [
            {
              "x": 145.0,
@@ -803,33 +814,35 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "B"
+          "compName": "GUIsel2_4#0",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 150.0,
-            "y": 730.0
+            "x": 10.0,
+            "y": 225.0
            },
            {
-            "x": 150.0,
-            "y": 180.0
+            "x": 10.0,
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "GUInot4#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
@@ -841,28 +854,52 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "Y2"
          },
+        "name": "unnamedWire#34",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "GUIsel2_4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 175.0
+          },
+          {
+            "x": 15.0,
+            "y": 275.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y2"
+        },
+        "pin2": {
+          "compName": "GUInot4#0",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#11",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#4",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "pinName": "Y1"
          },
+        "name": "unnamedWire#33",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/GUIxor.json b/net.mograsim.logic.model.am2900/components/GUIxor.json

index d4e28ed..a010047 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIxor.json
+++ b/net.mograsim.logic.model.am2900/components/GUIxor.json
@@ -32,91 +32,97 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 35.0,
            "y": 2.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 7.5,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 62.5,
            "y": 15.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 4.0,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 35.0,
            "y": 27.5
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 11.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 29.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#9"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
-        },
-        "pin2": {
            "compName": "WireCrossPoint#1",
            "pinName": ""
          },
-        "path": []
+        "pin2": {
+          "compName": "GUINandGate#2",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 42.5
+          }
+        ]
        },
        {
          "pin1": {
@@ -124,41 +130,57 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 5.0,
-            "y": 20.0
+            "y": 7.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 5.0,
-            "y": 30.0
+            "x": 30.0,
+            "y": 32.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
            "pinName": ""
-        }
+        },
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
@@ -169,6 +191,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#1",
            "pinName": "B"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 30.0,
@@ -178,35 +201,25 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 30.0,
-            "y": 32.5
-          }
-        ]
+        "name": "unnamedWire#10"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 7.5
-          }
-        ]
+        "name": "unnamedWire#4"
        },
        {
          "pin1": {
@@ -214,35 +227,33 @@ mograsim version: 0.1.3
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
              "x": 5.0,
-            "y": 42.5
+            "y": 30.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#0",
            "pinName": "A"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
          },
-        "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 20.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -252,7 +263,8 @@ mograsim version: 0.1.3
          "pin2": {
            "compName": "_submodelinterface",
            "pinName": "Y"
-        }
+        },
+        "name": "unnamedWire#11"
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json

index b40848d..1da7f91 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
@@ -320,1364 +320,1084 @@ mograsim version: 0.1.3
      "innerScale": 0.1,
      "subComps": [
        {
+        "id": "GUIsel3_4",
+        "name": "GUIsel3_4#0",
          "pos": {
            "x": 45.0,
            "y": 2310.0
-        },
-        "id": "GUIsel3_4",
-        "name": "GUIsel3_4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 144.0,
            "y": 2524.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "GUIsel3_4",
+        "name": "GUIsel3_4#1",
          "pos": {
            "x": 45.0,
            "y": 2510.0
-        },
-        "id": "GUIsel3_4",
-        "name": "GUIsel3_4#1"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 139.0,
            "y": 2514.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#16",
          "pos": {
            "x": 234.0,
            "y": 2524.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 219.0,
            "y": 2494.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "GUIAm2901DestDecode",
+        "name": "GUIAm2901DestDecode#0",
          "pos": {
            "x": 15.0,
            "y": 45.0
-        },
-        "id": "GUIAm2901DestDecode",
-        "name": "GUIAm2901DestDecode#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#18",
          "pos": {
            "x": 39.0,
            "y": 2634.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#17",
          "pos": {
            "x": 34.0,
            "y": 2624.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#19",
          "pos": {
            "x": 279.0,
            "y": 2114.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 154.0,
            "y": 89.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 154.0,
            "y": 949.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 154.0,
            "y": 2319.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 154.0,
            "y": 2264.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 34.0,
            "y": 2324.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 39.0,
            "y": 2314.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 219.0,
            "y": 2224.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 29.0,
            "y": 2334.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 229.0,
            "y": 2244.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 224.0,
            "y": 2234.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 234.0,
            "y": 2254.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 134.0,
            "y": 2504.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 129.0,
            "y": 2494.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#1",
          "pos": {
            "x": 160.0,
            "y": 2275.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#1"
+        }
        },
        {
+        "id": "GUIdlatch4",
+        "name": "GUIdlatch4#0",
          "pos": {
            "x": 160.0,
            "y": 2220.0
-        },
-        "id": "GUIdlatch4",
-        "name": "GUIdlatch4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#40",
          "pos": {
            "x": 314.0,
            "y": 449.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#40",
          "params": 1
        },
        {
+        "id": "GUIAm2901QReg",
+        "name": "GUIAm2901QReg#0",
          "pos": {
            "x": 90.0,
            "y": 2490.0
-        },
-        "id": "GUIAm2901QReg",
-        "name": "GUIAm2901QReg#0"
+        }
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 320.0,
            "y": 440.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#36",
          "pos": {
            "x": 9.0,
            "y": 2384.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#36",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 160.0,
            "y": 75.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#35",
          "pos": {
            "x": 24.0,
            "y": 2414.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#35",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#38",
          "pos": {
            "x": 19.0,
            "y": 2434.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#38",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#37",
          "pos": {
            "x": 14.0,
            "y": 2424.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#37",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#39",
          "pos": {
            "x": 24.0,
            "y": 2444.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#39",
          "params": 1
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 190.0,
            "y": 65.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "GUImux1_4",
+        "name": "GUImux1_4#0",
          "pos": {
            "x": 275.0,
            "y": 135.0
-        },
-        "id": "GUImux1_4",
-        "name": "GUImux1_4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#30",
          "pos": {
            "x": 9.0,
            "y": 2354.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#30",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#32",
          "pos": {
            "x": 19.0,
            "y": 2374.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#32",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#31",
          "pos": {
            "x": 14.0,
            "y": 2364.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#31",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#34",
          "pos": {
            "x": 19.0,
            "y": 2404.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#34",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#33",
          "pos": {
            "x": 14.0,
            "y": 2394.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#33",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#25",
          "pos": {
            "x": 269.0,
            "y": 2104.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#25",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#24",
          "pos": {
            "x": 264.0,
            "y": 2099.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#24",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#27",
          "pos": {
            "x": 259.0,
            "y": 459.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#27",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#26",
          "pos": {
            "x": 254.0,
            "y": 449.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#26",
          "params": 1
        },
        {
+        "id": "GUIor4",
+        "name": "GUIor4#0",
          "pos": {
            "x": 275.0,
            "y": 445.0
-        },
-        "id": "GUIor4",
-        "name": "GUIor4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#29",
          "pos": {
            "x": 269.0,
            "y": 479.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#29",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
+        "name": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
          "pos": {
            "x": 240.0,
            "y": 2110.0
-        },
-        "id": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
-        "name": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#28",
          "pos": {
            "x": 264.0,
            "y": 469.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#28",
          "params": 1
        },
        {
+        "id": "GUIram4",
+        "name": "GUIram4#0",
          "pos": {
            "x": 95.0,
            "y": 2220.0
-        },
-        "id": "GUIram4",
-        "name": "GUIram4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#21",
          "pos": {
            "x": 329.0,
            "y": 949.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#20",
          "pos": {
            "x": 294.0,
            "y": 2144.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#23",
          "pos": {
            "x": 259.0,
            "y": 2094.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#22",
          "pos": {
            "x": 254.0,
            "y": 2089.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I8"
+          "compName": "GUIram4#0",
+          "pinName": "QA2"
          },
          "pin2": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "I8"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D2"
          },
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I7"
+          "compName": "GUIram4#0",
+          "pinName": "QA1"
          },
          "pin2": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "I7"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D1"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 150.0
-          },
-          {
-            "x": 5.0,
-            "y": 60.0
-          }
-        ]
+        "name": "unnamedWire#35",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I6"
+          "compName": "GUIram4#0",
+          "pinName": "QA4"
          },
          "pin2": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "I6"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D4"
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 250.0
-          },
-          {
-            "x": 10.0,
-            "y": 70.0
-          }
-        ]
+        "name": "unnamedWire#38",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I5"
+          "compName": "GUIram4#0",
+          "pinName": "QA3"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I5"
+          "compName": "GUIdlatch4#0",
+          "pinName": "D3"
          },
-        "path": [
-          {
-            "x": 130.0,
-            "y": 350.0
-          },
-          {
-            "x": 130.0,
-            "y": 2115.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "GUIram4#0",
+          "pinName": "QB1"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I4"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D1"
          },
+        "name": "unnamedWire#39",
          "path": [
            {
-            "x": 125.0,
-            "y": 450.0
+            "x": 150.0,
+            "y": 2265.0
            },
            {
-            "x": 125.0,
-            "y": 2125.0
+            "x": 150.0,
+            "y": 2280.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I3"
+          "compName": "GUImux1_4#0",
+          "pinName": "I1_1"
          },
+        "name": "unnamedWire#110",
          "path": [
            {
-            "x": 120.0,
-            "y": 550.0
-          },
-          {
-            "x": 120.0,
-            "y": 2135.0
+            "x": 255.0,
+            "y": 190.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I2"
+          "compName": "GUImux1_4#0",
+          "pinName": "I1_2"
          },
+        "name": "unnamedWire#111",
          "path": [
            {
-            "x": 115.0,
-            "y": 650.0
-          },
-          {
-            "x": 115.0,
-            "y": 2145.0
+            "x": 260.0,
+            "y": 200.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I1"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
+        "name": "unnamedWire#114",
          "path": [
            {
-            "x": 110.0,
-            "y": 750.0
-          },
-          {
-            "x": 110.0,
-            "y": 2155.0
+            "x": 10.0,
+            "y": 2090.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
          },
+        "name": "unnamedWire#115",
          "path": [
            {
-            "x": 105.0,
-            "y": 850.0
-          },
-          {
-            "x": 105.0,
-            "y": 2165.0
+            "x": 15.0,
+            "y": 2095.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#28",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUImux1_4#0",
+          "pinName": "I1_3"
          },
-        "path": []
+        "name": "unnamedWire#112",
+        "path": [
+          {
+            "x": 265.0,
+            "y": 210.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUImux1_4#0",
+          "pinName": "I1_4"
          },
+        "name": "unnamedWire#113",
          "path": [
            {
-            "x": 155.0,
-            "y": 80.0
+            "x": 270.0,
+            "y": 220.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#30",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUIsel3_4#0",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#118",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#31",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUIsel3_4#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#119",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "QB3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "C"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D3"
          },
-        "path": []
+        "name": "unnamedWire#41",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 2285.0
+          },
+          {
+            "x": 140.0,
+            "y": 2300.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#24",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#32",
            "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#116",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 2100.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "QB2"
          },
          "pin2": {
            "compName": "GUIdlatch4#1",
-          "pinName": "C"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "C"
+          "pinName": "D2"
          },
+        "name": "unnamedWire#40",
          "path": [
            {
-            "x": 155.0,
-            "y": 2485.0
-          },
-          {
-            "x": 80.0,
-            "y": 2485.0
+            "x": 145.0,
+            "y": 2275.0
            },
            {
-            "x": 80.0,
-            "y": 2495.0
+            "x": 145.0,
+            "y": 2290.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "LSH"
+          "compName": "_submodelinterface",
+          "pinName": "IRAMn"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUIsel3_4#0",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#117",
          "path": [
            {
-            "x": 55.0,
-            "y": 90.0
-          },
-          {
-            "x": 55.0,
-            "y": 125.0
+            "x": 5.0,
+            "y": 2350.0
            },
            {
-            "x": 40.0,
-            "y": 125.0
+            "x": 5.0,
+            "y": 2345.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "NSH"
+          "compName": "_submodelinterface",
+          "pinName": "Cn"
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Cn"
          },
+        "name": "unnamedWire#43",
          "path": [
            {
-            "x": 60.0,
-            "y": 50.0
-          },
-          {
-            "x": 60.0,
-            "y": 120.0
+            "x": 100.0,
+            "y": 1050.0
            },
            {
-            "x": 35.0,
-            "y": 120.0
+            "x": 100.0,
+            "y": 2175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "RSH"
+          "compName": "GUIram4#0",
+          "pinName": "QB4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "path": [
-          {
-            "x": 65.0,
-            "y": 60.0
-          },
-          {
-            "x": 65.0,
-            "y": 115.0
-          },
-          {
-            "x": 30.0,
-            "y": 115.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "SA"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "SB"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "SC"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "SA"
-        },
-        "path": [
-          {
-            "x": 40.0,
-            "y": 2515.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "SB"
-        },
-        "path": [
-          {
-            "x": 35.0,
-            "y": 2525.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "SC"
-        },
-        "path": [
-          {
-            "x": 30.0,
-            "y": 2535.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
-        },
-        "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "A0"
-        },
-        "path": [
-          {
-            "x": 80.0,
-            "y": 1550.0
-          },
-          {
-            "x": 80.0,
-            "y": 2225.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "A1"
-        },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 1650.0
-          },
-          {
-            "x": 75.0,
-            "y": 2235.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "A2"
-        },
-        "path": [
-          {
-            "x": 70.0,
-            "y": 1750.0
-          },
-          {
-            "x": 70.0,
-            "y": 2245.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "A3"
+          "compName": "GUIdlatch4#1",
+          "pinName": "D4"
          },
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 65.0,
-            "y": 1850.0
+            "x": 135.0,
+            "y": 2295.0
            },
            {
-            "x": 65.0,
-            "y": 2255.0
+            "x": 135.0,
+            "y": 2310.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B0"
+          "pinName": "D2"
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "B0"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D2"
          },
+        "name": "unnamedWire#45",
          "path": [
            {
-            "x": 60.0,
-            "y": 1950.0
+            "x": 175.0,
+            "y": 1250.0
            },
            {
-            "x": 60.0,
-            "y": 2265.0
+            "x": 175.0,
+            "y": 2195.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B1"
+          "pinName": "D1"
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "B1"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D1"
          },
+        "name": "unnamedWire#44",
          "path": [
            {
-            "x": 55.0,
-            "y": 2050.0
+            "x": 180.0,
+            "y": 1150.0
            },
            {
-            "x": 55.0,
-            "y": 2275.0
+            "x": 180.0,
+            "y": 2185.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B2"
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "B2"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D4"
          },
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 50.0,
-            "y": 2150.0
+            "x": 165.0,
+            "y": 1450.0
            },
            {
-            "x": 50.0,
-            "y": 2285.0
+            "x": 165.0,
+            "y": 2215.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B3"
+          "pinName": "D3"
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "B3"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D3"
          },
+        "name": "unnamedWire#46",
          "path": [
            {
-            "x": 45.0,
-            "y": 2250.0
+            "x": 170.0,
+            "y": 1350.0
            },
            {
-            "x": 45.0,
-            "y": 2295.0
+            "x": 170.0,
+            "y": 2205.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QA1"
-        },
-        "pin2": {
            "compName": "GUIdlatch4#0",
-          "pinName": "D1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QA2"
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
+        "name": "unnamedWire#49",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QA3"
-        },
-        "pin2": {
            "compName": "GUIdlatch4#0",
-          "pinName": "D3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QA4"
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
+        "name": "unnamedWire#48",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QB1"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F3"
          },
          "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
+        "name": "unnamedWire#100",
          "path": [
            {
-            "x": 150.0,
-            "y": 2265.0
+            "x": 290.0,
+            "y": 2135.0
            },
            {
-            "x": 150.0,
-            "y": 2280.0
+            "x": 290.0,
+            "y": 2100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QB2"
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 145.0,
-            "y": 2275.0
-          },
-          {
-            "x": 145.0,
-            "y": 2290.0
-          }
-        ]
+        "name": "unnamedWire#103",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QB3"
+          "compName": "WireCrossPoint#24",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 140.0,
-            "y": 2285.0
-          },
-          {
-            "x": 140.0,
-            "y": 2300.0
-          }
-        ]
+        "name": "unnamedWire#104",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIram4#0",
-          "pinName": "QB4"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
+        "name": "unnamedWire#101",
          "path": [
            {
-            "x": 135.0,
-            "y": 2295.0
-          },
-          {
-            "x": 135.0,
-            "y": 2310.0
+            "x": 295.0,
+            "y": 2105.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#22",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 100.0,
-            "y": 1050.0
-          },
-          {
-            "x": 100.0,
-            "y": 2175.0
-          }
-        ]
+        "name": "unnamedWire#102",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "GUIdlatch4#0",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 180.0,
-            "y": 1150.0
-          },
-          {
-            "x": 180.0,
-            "y": 2185.0
-          }
-        ]
+        "name": "unnamedWire#50",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "WireCrossPoint#27",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D2"
+          "compName": "GUIor4#0",
+          "pinName": "A2"
          },
-        "path": [
-          {
-            "x": 175.0,
-            "y": 1250.0
-          },
-          {
-            "x": 175.0,
-            "y": 2195.0
-          }
-        ]
+        "name": "unnamedWire#107",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#28",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D3"
+          "compName": "GUIor4#0",
+          "pinName": "A3"
          },
-        "path": [
-          {
-            "x": 170.0,
-            "y": 1350.0
-          },
-          {
-            "x": 170.0,
-            "y": 2205.0
-          }
-        ]
+        "name": "unnamedWire#108",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D4"
+          "compName": "GUImux1_4#0",
+          "pinName": "I0_1"
          },
+        "name": "unnamedWire#52",
          "path": [
            {
-            "x": 165.0,
-            "y": 1450.0
-          },
-          {
-            "x": 165.0,
-            "y": 2215.0
+            "x": 220.0,
+            "y": 150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#29",
            "pinName": ""
          },
+        "name": "unnamedWire#105",
          "path": []
        },
        {
          "pin1": {
            "compName": "GUIdlatch4#0",
-          "pinName": "Q3"
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
+        "name": "unnamedWire#51",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#0",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#26",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "GUIor4#0",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#106",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUImux1_4#0",
-          "pinName": "I0_1"
+          "pinName": "I0_3"
          },
+        "name": "unnamedWire#54",
          "path": [
            {
-            "x": 220.0,
-            "y": 150.0
+            "x": 230.0,
+            "y": 170.0
            }
          ]
        },
@@ -1690,6 +1410,7 @@ mograsim version: 0.1.3
            "compName": "GUImux1_4#0",
            "pinName": "I0_2"
          },
+        "name": "unnamedWire#53",
          "path": [
            {
              "x": 225.0,
@@ -1699,19 +1420,27 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "I0_3"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A1"
          },
-        "path": [
-          {
-            "x": 230.0,
-            "y": 170.0
-          }
-        ]
+        "name": "unnamedWire#56",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIor4#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#109",
+        "path": []
        },
        {
          "pin1": {
@@ -1722,6 +1451,7 @@ mograsim version: 0.1.3
            "compName": "GUImux1_4#0",
            "pinName": "I0_4"
          },
+        "name": "unnamedWire#55",
          "path": [
            {
              "x": 235.0,
@@ -1731,408 +1461,573 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A1"
+          "compName": "GUIdlatch4#0",
+          "pinName": "C"
          },
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A2"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A3"
+          "compName": "GUIdlatch4#1",
+          "pinName": "C"
          },
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "A4"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q1"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "LSH"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 200.0,
-            "y": 2280.0
+            "x": 55.0,
+            "y": 90.0
            },
            {
-            "x": 200.0,
-            "y": 2265.0
+            "x": 55.0,
+            "y": 125.0
+          },
+          {
+            "x": 40.0,
+            "y": 125.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "B2"
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "C"
          },
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 205.0,
-            "y": 2290.0
+            "x": 155.0,
+            "y": 2485.0
            },
            {
-            "x": 205.0,
-            "y": 2275.0
+            "x": 80.0,
+            "y": 2485.0
+          },
+          {
+            "x": 80.0,
+            "y": 2495.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q3"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "NSH"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "B3"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 210.0,
-            "y": 2300.0
+            "x": 60.0,
+            "y": 50.0
            },
            {
-            "x": 210.0,
-            "y": 2285.0
+            "x": 60.0,
+            "y": 120.0
+          },
+          {
+            "x": 35.0,
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIdlatch4#1",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "B4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "SA"
+        },
+        "name": "unnamedWire#21",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "RSH"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 215.0,
-            "y": 2310.0
+            "x": 65.0,
+            "y": 60.0
            },
            {
-            "x": 215.0,
-            "y": 2295.0
+            "x": 65.0,
+            "y": 115.0
+          },
+          {
+            "x": 30.0,
+            "y": 115.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "GUIsel3_4#0",
+          "pinName": "SC"
+        },
+        "name": "unnamedWire#23",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
+        "pin2": {
+          "compName": "GUIsel3_4#0",
+          "pinName": "SB"
+        },
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "GUIsel3_4#1",
+          "pinName": "SB"
+        },
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 2525.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "path": []
+        "pin2": {
+          "compName": "GUIsel3_4#1",
+          "pinName": "SA"
+        },
+        "name": "unnamedWire#24",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 2515.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "Q3"
+          "compName": "_submodelinterface",
+          "pinName": "A0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "GUIram4#0",
+          "pinName": "A0"
+        },
+        "name": "unnamedWire#27",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 1550.0
+          },
+          {
+            "x": 80.0,
+            "y": 2225.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
-        "path": []
+        "pin2": {
+          "compName": "GUIsel3_4#1",
+          "pinName": "SC"
+        },
+        "name": "unnamedWire#26",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 2535.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "GUIram4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#29",
+        "path": [
+          {
+            "x": 70.0,
+            "y": 1750.0
+          },
+          {
+            "x": 70.0,
+            "y": 2245.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "Q4"
+          "compName": "_submodelinterface",
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "A1"
          },
-        "path": []
+        "name": "unnamedWire#28",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 1650.0
+          },
+          {
+            "x": 75.0,
+            "y": 2235.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "A3"
          },
-        "path": []
+        "name": "unnamedWire#30",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 1850.0
+          },
+          {
+            "x": 65.0,
+            "y": 2255.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "OQn"
+          "compName": "GUIram4#0",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 335.0,
-            "y": 2495.0
+            "x": 55.0,
+            "y": 2050.0
            },
            {
-            "x": 335.0,
-            "y": 1050.0
+            "x": 55.0,
+            "y": 2275.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B0"
          },
          "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "B0"
          },
-        "path": []
+        "name": "unnamedWire#31",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 1950.0
+          },
+          {
+            "x": 60.0,
+            "y": 2265.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "OQn+3"
+          "compName": "GUIram4#0",
+          "pinName": "B3"
          },
+        "name": "unnamedWire#34",
          "path": [
            {
-            "x": 340.0,
-            "y": 2525.0
+            "x": 45.0,
+            "y": 2250.0
            },
            {
-            "x": 340.0,
-            "y": 1150.0
+            "x": 45.0,
+            "y": 2295.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "B2"
          },
+        "name": "unnamedWire#33",
          "path": [
            {
-            "x": 135.0,
-            "y": 2670.0
-          },
-          {
-            "x": 30.0,
-            "y": 2670.0
-          },
-          {
-            "x": 30.0,
-            "y": 2635.0
+            "x": 50.0,
+            "y": 2150.0
            },
            {
-            "x": 35.0,
-            "y": 2635.0
+            "x": 50.0,
+            "y": 2285.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "GUIsel3_4#1",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#79",
          "path": [
            {
-            "x": 140.0,
-            "y": 2675.0
+            "x": 130.0,
+            "y": 2665.0
            },
            {
-            "x": 35.0,
-            "y": 2675.0
+            "x": 25.0,
+            "y": 2665.0
            },
            {
-            "x": 35.0,
-            "y": 2640.0
+            "x": 25.0,
+            "y": 2630.0
            },
            {
-            "x": 40.0,
-            "y": 2640.0
+            "x": 30.0,
+            "y": 2630.0
+          },
+          {
+            "x": 30.0,
+            "y": 2555.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "GUImux1_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "C1"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
          },
+        "name": "unnamedWire#150",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "GUImux1_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "C2"
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
          },
-        "path": []
+        "name": "unnamedWire#151",
+        "path": [
+          {
+            "x": 335.0,
+            "y": 160.0
+          },
+          {
+            "x": 335.0,
+            "y": 250.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#40",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "C3"
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#154",
          "path": [
            {
-            "x": 145.0,
-            "y": 2680.0
-          },
-          {
-            "x": 40.0,
-            "y": 2680.0
-          },
-          {
-            "x": 40.0,
-            "y": 2645.0
+            "x": 315.0,
+            "y": 445.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IQn+3"
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "C4"
+          "compName": "GUINandGate#1",
+          "pinName": "B"
          },
+        "name": "unnamedWire#155",
          "path": [
            {
-            "x": 5.0,
-            "y": 2650.0
-          },
-          {
-            "x": 5.0,
-            "y": 2655.0
+            "x": 315.0,
+            "y": 455.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IQn"
+          "compName": "GUImux1_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
          },
+        "name": "unnamedWire#152",
          "path": [
            {
-            "x": 5.0,
-            "y": 2550.0
+            "x": 325.0,
+            "y": 170.0
            },
            {
-            "x": 5.0,
-            "y": 2545.0
+            "x": 325.0,
+            "y": 350.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "GUIor4#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
+        },
+        "name": "unnamedWire#153",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "A2"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Q2"
          },
+        "name": "unnamedWire#81",
          "path": [
-          {
-            "x": 130.0,
-            "y": 2665.0
-          },
-          {
-            "x": 25.0,
-            "y": 2665.0
-          },
-          {
-            "x": 25.0,
-            "y": 2630.0
-          },
-          {
-            "x": 30.0,
-            "y": 2630.0
+          {
+            "x": 225.0,
+            "y": 2505.0
            },
            {
-            "x": 30.0,
-            "y": 2555.0
+            "x": 225.0,
+            "y": 2315.0
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "F\u003d0"
+        },
+        "name": "unnamedWire#156",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#15",
@@ -2142,6 +2037,7 @@ mograsim version: 0.1.3
            "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
            "pinName": "Q1"
          },
+        "name": "unnamedWire#80",
          "path": [
            {
              "x": 220.0,
@@ -2151,21 +2047,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q2"
+          "pinName": "Q4"
          },
+        "name": "unnamedWire#83",
          "path": [
            {
-            "x": 225.0,
-            "y": 2505.0
-          },
-          {
-            "x": 225.0,
-            "y": 2315.0
+            "x": 235.0,
+            "y": 2335.0
            }
          ]
        },
@@ -2178,6 +2071,7 @@ mograsim version: 0.1.3
            "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
            "pinName": "Q3"
          },
+        "name": "unnamedWire#82",
          "path": [
            {
              "x": 230.0,
@@ -2191,17 +2085,18 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#18",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Q4"
+          "compName": "GUIsel3_4#1",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#85",
          "path": [
            {
-            "x": 235.0,
-            "y": 2335.0
+            "x": 40.0,
+            "y": 2575.0
            }
          ]
        },
@@ -2214,6 +2109,7 @@ mograsim version: 0.1.3
            "compName": "GUIsel3_4#1",
            "pinName": "A3"
          },
+        "name": "unnamedWire#84",
          "path": [
            {
              "x": 35.0,
@@ -2223,19 +2119,15 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "GUIsel3_4#1",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "A4"
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "D2"
          },
-        "path": [
-          {
-            "x": 40.0,
-            "y": 2575.0
-          }
-        ]
+        "name": "unnamedWire#87",
+        "path": []
        },
        {
          "pin1": {
@@ -2246,17 +2138,19 @@ mograsim version: 0.1.3
            "compName": "GUIAm2901QReg#0",
            "pinName": "D1"
          },
+        "name": "unnamedWire#86",
          "path": []
        },
        {
          "pin1": {
            "compName": "GUIsel3_4#1",
-          "pinName": "Y2"
+          "pinName": "Y4"
          },
          "pin2": {
            "compName": "GUIAm2901QReg#0",
-          "pinName": "D2"
+          "pinName": "D4"
          },
+        "name": "unnamedWire#89",
          "path": []
        },
        {
@@ -2268,571 +2162,634 @@ mograsim version: 0.1.3
            "compName": "GUIAm2901QReg#0",
            "pinName": "D3"
          },
+        "name": "unnamedWire#88",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "Y4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "D4"
+          "compName": "GUIram4#0",
+          "pinName": "D1"
          },
+        "name": "unnamedWire#140",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "Cn+4"
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn+4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 315.0,
-            "y": 2155.0
-          },
-          {
-            "x": 315.0,
-            "y": 550.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "OVR"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
+          "compName": "GUIram4#0",
+          "pinName": "D4"
+        },
+        "name": "unnamedWire#143",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "OVR"
+          "pinName": "I0"
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I0"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 320.0,
-            "y": 2165.0
+            "x": 105.0,
+            "y": 850.0
            },
            {
-            "x": 320.0,
-            "y": 650.0
+            "x": 105.0,
+            "y": 2165.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F4"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "RAMWE"
          },
          "pin2": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#144",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "ORAMn"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I1"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 325.0,
-            "y": 2115.0
+            "x": 110.0,
+            "y": 750.0
            },
            {
-            "x": 325.0,
-            "y": 850.0
+            "x": 110.0,
+            "y": 2155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "D2"
+        },
+        "name": "unnamedWire#141",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I2"
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I2"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 330.0,
+            "x": 115.0,
+            "y": 650.0
+          },
+          {
+            "x": 115.0,
              "y": 2145.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "ORAMn+3"
+          "compName": "GUIram4#0",
+          "pinName": "D3"
          },
+        "name": "unnamedWire#142",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "Cn+4"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "F3"
+          "pinName": "Cn+4"
          },
+        "name": "unnamedWire#90",
          "path": [
            {
-            "x": 330.0,
-            "y": 750.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
-        },
-        "path": [
+            "x": 315.0,
+            "y": 2155.0
+          },
            {
-            "x": 280.0,
-            "y": 2090.0
+            "x": 315.0,
+            "y": 550.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F2"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "QWE"
          },
          "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "WE"
          },
+        "name": "unnamedWire#147",
          "path": [
            {
-            "x": 285.0,
-            "y": 2125.0
+            "x": 85.0,
+            "y": 100.0
            },
            {
-            "x": 285.0,
-            "y": 2095.0
+            "x": 85.0,
+            "y": 2505.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "F3"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "YF"
          },
          "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "GUImux1_4#0",
+          "pinName": "S0"
          },
+        "name": "unnamedWire#148",
          "path": [
            {
-            "x": 290.0,
-            "y": 2135.0
+            "x": 70.0,
+            "y": 80.0
            },
            {
-            "x": 290.0,
-            "y": 2100.0
+            "x": 70.0,
+            "y": 140.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#20",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 295.0,
-            "y": 2105.0
-          }
-        ]
+        "name": "unnamedWire#92",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#145"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "OVR"
          },
          "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "OVR"
          },
-        "path": []
+        "name": "unnamedWire#91",
+        "path": [
+          {
+            "x": 320.0,
+            "y": 2165.0
+          },
+          {
+            "x": 320.0,
+            "y": 650.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "GUIram4#0",
+          "pinName": "WE"
          },
-        "path": []
+        "name": "unnamedWire#146",
+        "path": [
+          {
+            "x": 230.0,
+            "y": 70.0
+          },
+          {
+            "x": 230.0,
+            "y": 105.0
+          },
+          {
+            "x": 90.0,
+            "y": 105.0
+          },
+          {
+            "x": 90.0,
+            "y": 2305.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I7"
          },
          "pin2": {
-          "compName": "WireCrossPoint#29",
-          "pinName": ""
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "I7"
          },
-        "path": []
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 150.0
+          },
+          {
+            "x": 5.0,
+            "y": 60.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIor4#0",
-          "pinName": "A1"
+          "compName": "_submodelinterface",
+          "pinName": "ORAMn"
          },
-        "path": []
+        "name": "unnamedWire#94",
+        "path": [
+          {
+            "x": 325.0,
+            "y": 2115.0
+          },
+          {
+            "x": 325.0,
+            "y": 850.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I8"
          },
          "pin2": {
-          "compName": "GUIor4#0",
-          "pinName": "A2"
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "I8"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F4"
          },
          "pin2": {
-          "compName": "GUIor4#0",
-          "pinName": "A3"
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
          },
+        "name": "unnamedWire#93",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIor4#0",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "ORAMn+3"
          },
+        "name": "unnamedWire#96",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "GUImux1_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "I1_1"
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
          },
+        "name": "unnamedWire#149",
          "path": [
            {
-            "x": 255.0,
-            "y": 190.0
+            "x": 335.0,
+            "y": 140.0
+          },
+          {
+            "x": 335.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#20",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "I1_2"
+          "compName": "WireCrossPoint#21",
+          "pinName": ""
          },
+        "name": "unnamedWire#95",
          "path": [
            {
-            "x": 260.0,
-            "y": 200.0
+            "x": 330.0,
+            "y": 2145.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#28",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I3"
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "I1_3"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I3"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 265.0,
-            "y": 210.0
+            "x": 120.0,
+            "y": 550.0
+          },
+          {
+            "x": 120.0,
+            "y": 2135.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "I1_4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 270.0,
-            "y": 220.0
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#19",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#22",
            "pinName": ""
          },
+        "name": "unnamedWire#98",
          "path": [
            {
-            "x": 10.0,
+            "x": 280.0,
              "y": 2090.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I4"
          },
+        "name": "unnamedWire#4",
          "path": [
            {
-            "x": 15.0,
-            "y": 2095.0
+            "x": 125.0,
+            "y": 450.0
+          },
+          {
+            "x": 125.0,
+            "y": 2125.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#21",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "F3"
          },
+        "name": "unnamedWire#97",
          "path": [
            {
-            "x": 20.0,
-            "y": 2100.0
+            "x": 330.0,
+            "y": 750.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "IRAMn"
+          "pinName": "I5"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A1"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "I5"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 5.0,
-            "y": 2350.0
+            "x": 130.0,
+            "y": 350.0
            },
            {
-            "x": 5.0,
-            "y": 2345.0
+            "x": 130.0,
+            "y": 2115.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A2"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#33",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I6"
          },
-        "pin2": {
-          "compName": "WireCrossPoint#34",
-          "pinName": ""
+        "pin2": {
+          "compName": "GUIAm2901DestDecode#0",
+          "pinName": "I6"
          },
-        "path": []
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 250.0
+          },
+          {
+            "x": 10.0,
+            "y": 70.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#35",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#11",
          "path": [
            {
-            "x": 25.0,
-            "y": 2105.0
+            "x": 155.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "F2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#23",
            "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#99",
+        "path": [
+          {
+            "x": 285.0,
+            "y": 2125.0
+          },
+          {
+            "x": 285.0,
+            "y": 2095.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B1"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#58",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B2"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#57",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#34",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B3"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#59",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#35",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIsel3_4#0",
-          "pinName": "B4"
+          "pinName": "C1"
          },
+        "name": "unnamedWire#132",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#38",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "GUIsel3_4#0",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#133",
          "path": []
        },
        {
@@ -2844,6 +2801,7 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#38",
            "pinName": ""
          },
+        "name": "unnamedWire#130",
          "path": []
        },
        {
@@ -2855,29 +2813,42 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#39",
            "pinName": ""
          },
+        "name": "unnamedWire#131",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#36",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C1"
+          "compName": "GUIsel3_4#1",
+          "pinName": "B1"
          },
-        "path": []
+        "name": "unnamedWire#136",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 2585.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#37",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C2"
+          "compName": "GUIsel3_4#1",
+          "pinName": "B2"
          },
-        "path": []
+        "name": "unnamedWire#137",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 2595.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -2888,6 +2859,7 @@ mograsim version: 0.1.3
            "compName": "GUIsel3_4#0",
            "pinName": "C3"
          },
+        "name": "unnamedWire#134",
          "path": []
        },
        {
@@ -2899,6 +2871,7 @@ mograsim version: 0.1.3
            "compName": "GUIsel3_4#0",
            "pinName": "C4"
          },
+        "name": "unnamedWire#135",
          "path": [
            {
              "x": 5.0,
@@ -2912,33 +2885,64 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#36",
-          "pinName": ""
+          "compName": "GUIdlatch4#1",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B2"
+        },
+        "name": "unnamedWire#61",
+        "path": [
+          {
+            "x": 205.0,
+            "y": 2290.0
+          },
+          {
+            "x": 205.0,
+            "y": 2275.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIdlatch4#1",
+          "pinName": "Q1"
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
            "pinName": "B1"
          },
+        "name": "unnamedWire#60",
          "path": [
            {
-            "x": 10.0,
-            "y": 2585.0
+            "x": 200.0,
+            "y": 2280.0
+          },
+          {
+            "x": 200.0,
+            "y": 2265.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#37",
-          "pinName": ""
+          "compName": "GUIdlatch4#1",
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "GUIsel3_4#1",
-          "pinName": "B2"
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B4"
          },
+        "name": "unnamedWire#63",
          "path": [
            {
-            "x": 15.0,
-            "y": 2595.0
+            "x": 215.0,
+            "y": 2310.0
+          },
+          {
+            "x": 215.0,
+            "y": 2295.0
            }
          ]
        },
@@ -2951,6 +2955,7 @@ mograsim version: 0.1.3
            "compName": "GUIsel3_4#1",
            "pinName": "B3"
          },
+        "name": "unnamedWire#138",
          "path": [
            {
              "x": 20.0,
@@ -2958,6 +2963,27 @@ mograsim version: 0.1.3
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "GUIdlatch4#1",
+          "pinName": "Q3"
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B3"
+        },
+        "name": "unnamedWire#62",
+        "path": [
+          {
+            "x": 210.0,
+            "y": 2300.0
+          },
+          {
+            "x": 210.0,
+            "y": 2285.0
+          }
+        ]
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#39",
@@ -2967,6 +2993,7 @@ mograsim version: 0.1.3
            "compName": "GUIsel3_4#1",
            "pinName": "B4"
          },
+        "name": "unnamedWire#139",
          "path": [
            {
              "x": 25.0,
@@ -2976,261 +3003,391 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y1"
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "Q2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "name": "unnamedWire#65",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "Q1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "name": "unnamedWire#64",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "Q4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
+        },
+        "name": "unnamedWire#67",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901QReg#0",
+          "pinName": "Q3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "name": "unnamedWire#66",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "OQn"
+        },
+        "name": "unnamedWire#69",
+        "path": [
+          {
+            "x": 335.0,
+            "y": 2495.0
+          },
+          {
+            "x": 335.0,
+            "y": 1050.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
+        },
+        "name": "unnamedWire#68",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
+        },
+        "name": "unnamedWire#121",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
+        },
+        "name": "unnamedWire#122",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "D1"
+          "compName": "GUIsel3_4#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#120",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#36",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "D2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#125",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "D3"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B2"
          },
+        "name": "unnamedWire#126",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
+        "name": "unnamedWire#70",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "RAMWE"
+          "compName": "WireCrossPoint#25",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#123",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 2105.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "B"
-        }
+          "compName": "WireCrossPoint#36",
+          "pinName": ""
+        },
+        "name": "unnamedWire#124",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIram4#0",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
+        "name": "unnamedWire#72",
          "path": [
            {
-            "x": 230.0,
-            "y": 70.0
+            "x": 135.0,
+            "y": 2670.0
            },
            {
-            "x": 230.0,
-            "y": 105.0
+            "x": 30.0,
+            "y": 2670.0
            },
            {
-            "x": 90.0,
-            "y": 105.0
+            "x": 30.0,
+            "y": 2635.0
            },
            {
-            "x": 90.0,
-            "y": 2305.0
+            "x": 35.0,
+            "y": 2635.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "QWE"
+          "compName": "WireCrossPoint#33",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901QReg#0",
-          "pinName": "WE"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 85.0,
-            "y": 100.0
-          },
-          {
-            "x": 85.0,
-            "y": 2505.0
-          }
-        ]
+        "name": "unnamedWire#129",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901DestDecode#0",
-          "pinName": "YF"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUImux1_4#0",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "OQn+3"
          },
+        "name": "unnamedWire#71",
          "path": [
            {
-            "x": 70.0,
-            "y": 80.0
+            "x": 340.0,
+            "y": 2525.0
            },
            {
-            "x": 70.0,
-            "y": 140.0
+            "x": 340.0,
+            "y": 1150.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUImux1_4#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#17",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "GUIsel3_4#1",
+          "pinName": "C1"
          },
-        "path": [
-          {
-            "x": 335.0,
-            "y": 140.0
-          },
-          {
-            "x": 335.0,
-            "y": 50.0
-          }
-        ]
+        "name": "unnamedWire#74",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUImux1_4#0",
-          "pinName": "Y2"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B3"
          },
+        "name": "unnamedWire#127",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUImux1_4#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
+        "name": "unnamedWire#73",
          "path": [
            {
-            "x": 335.0,
-            "y": 160.0
+            "x": 140.0,
+            "y": 2675.0
            },
            {
-            "x": 335.0,
-            "y": 250.0
+            "x": 35.0,
+            "y": 2675.0
+          },
+          {
+            "x": 35.0,
+            "y": 2640.0
+          },
+          {
+            "x": 40.0,
+            "y": 2640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUImux1_4#0",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B4"
+        },
+        "name": "unnamedWire#128",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIsel3_4#1",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#76",
          "path": [
            {
-            "x": 325.0,
-            "y": 170.0
+            "x": 145.0,
+            "y": 2680.0
            },
            {
-            "x": 325.0,
-            "y": 350.0
+            "x": 40.0,
+            "y": 2680.0
+          },
+          {
+            "x": 40.0,
+            "y": 2645.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIor4#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "GUIsel3_4#1",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#75",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "IQn"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUIsel3_4#1",
+          "pinName": "A1"
          },
+        "name": "unnamedWire#78",
          "path": [
            {
-            "x": 315.0,
-            "y": 445.0
+            "x": 5.0,
+            "y": 2550.0
+          },
+          {
+            "x": 5.0,
+            "y": 2545.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#40",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "IQn+3"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "GUIsel3_4#1",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#77",
          "path": [
            {
-            "x": 315.0,
-            "y": 455.0
+            "x": 5.0,
+            "y": 2650.0
+          },
+          {
+            "x": 5.0,
+            "y": 2655.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F\u003d0"
-        },
-        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json

index b9c4492..dd417e7 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
@@ -80,592 +80,624 @@ mograsim version: 0.1.3
      "innerScale": 0.25,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 15.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "GUInand3",
+        "name": "GUInand3#0",
          "pos": {
            "x": 55.0,
            "y": 10.0
-        },
-        "id": "GUInand3",
-        "name": "GUInand3#0"
+        }
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 15.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 55.0,
            "y": 70.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 55.0,
            "y": 45.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 100.0,
            "y": 135.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 4.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 9.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 4.0,
            "y": 44.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 9.0,
            "y": 64.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 9.0,
            "y": 54.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 49.0,
            "y": 99.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 9.0,
            "y": 84.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 39.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 49.0,
            "y": 74.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 39.0,
            "y": 34.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 100.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I5"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
+        "name": "unnamedWire#14",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 15.0
-          }
-        ]
+        "name": "unnamedWire#13",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
-        "path": []
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 100.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "SN"
          },
-        "path": []
+        "name": "unnamedWire#15",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 105.0
+          },
+          {
+            "x": 135.0,
+            "y": 105.0
+          },
+          {
+            "x": 135.0,
+            "y": 100.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
+        "name": "unnamedWire#18",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "RN"
          },
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 45.0,
-            "y": 45.0
-          },
-          {
-            "x": 45.0,
-            "y": 50.0
+            "x": 50.0,
+            "y": 220.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "FN"
+          "compName": "GUInand3#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 5.0,
-            "y": 180.0
+            "x": 50.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "GUINandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#20",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
+        "pin2": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "name": "unnamedWire#23",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "CinE"
          },
+        "name": "unnamedWire#22",
          "path": [
            {
-            "x": 10.0,
-            "y": 40.0
+            "x": 40.0,
+            "y": 5.0
            },
            {
-            "x": 45.0,
-            "y": 40.0
+            "x": 115.0,
+            "y": 5.0
            },
            {
-            "x": 45.0,
-            "y": 15.0
+            "x": 115.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUIand#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 150.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#10",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUInand3#0",
+          "pinName": "C"
          },
+        "name": "unnamedWire#24",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUInand3#0",
+          "pinName": "Y"
          },
          "pin2": {
+          "compName": "GUINandGate#4",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#27"
+      },
+      {
+        "pin1": {
            "compName": "GUINandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "GUINandGate#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#29"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#4",
            "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#28"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SN"
+          "compName": "GUInand3#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
              "x": 10.0,
-            "y": 105.0
+            "y": 40.0
            },
            {
-            "x": 135.0,
-            "y": 105.0
+            "x": 45.0,
+            "y": 40.0
            },
            {
-            "x": 135.0,
-            "y": 100.0
+            "x": 45.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 50.0,
-            "y": 100.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I4"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "RN"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 50.0,
-            "y": 220.0
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "FN"
          },
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 180.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "B"
+          "compName": "GUINandGate#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 50.0,
-            "y": 25.0
+            "x": 5.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I5"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#4",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "L"
          },
+        "name": "unnamedWire#30",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "CinE"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
-            "x": 40.0,
-            "y": 5.0
-          },
-          {
-            "x": 115.0,
-            "y": 5.0
+            "x": 45.0,
+            "y": 45.0
            },
            {
-            "x": 115.0,
-            "y": 20.0
+            "x": 45.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "C"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
            "compName": "GUIand#0",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 40.0,
-            "y": 150.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "SBE"
          },
+        "name": "unnamedWire#31",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUInand3#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
-        }
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#1",
            "pinName": "B"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
          },
-        "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
-        }
+        "name": "unnamedWire#12",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "L"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SBE"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
+        "name": "unnamedWire#11",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json

index ee540ec..08d122c 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
@@ -152,1165 +152,1030 @@ mograsim version: 0.1.3
      "innerScale": 0.25,
      "subComps": [
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 34.0,
            "y": 354.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 34.0,
            "y": 254.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#16",
          "pos": {
            "x": 36.5,
            "y": 264.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 36.5,
            "y": 164.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#18",
          "pos": {
            "x": 84.0,
            "y": 374.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#17",
          "pos": {
            "x": 36.5,
            "y": 364.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUFuncDecode",
+        "name": "GUIAm2901ALUFuncDecode#0",
          "pos": {
            "x": 20.0,
            "y": 2.5
-        },
-        "id": "GUIAm2901ALUFuncDecode",
-        "name": "GUIAm2901ALUFuncDecode#0"
+        }
        },
        {
+        "id": "GUIAm2901ALUOneBit",
+        "name": "GUIAm2901ALUOneBit#0",
          "pos": {
            "x": 45.0,
            "y": 80.0
-        },
-        "id": "GUIAm2901ALUOneBit",
-        "name": "GUIAm2901ALUOneBit#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#19",
          "pos": {
            "x": 84.0,
            "y": 384.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
          "params": 1
        },
        {
+        "id": "GUIxor",
+        "name": "GUIxor#0",
          "pos": {
            "x": 95.0,
            "y": 400.0
-        },
-        "id": "GUIxor",
-        "name": "GUIxor#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 24.0,
            "y": 194.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 24.0,
            "y": 94.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 26.5,
            "y": 104.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 24.0,
            "y": 294.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 26.5,
            "y": 304.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 26.5,
            "y": 204.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUOneBit",
+        "name": "GUIAm2901ALUOneBit#1",
          "pos": {
            "x": 45.0,
            "y": 180.0
-        },
-        "id": "GUIAm2901ALUOneBit",
-        "name": "GUIAm2901ALUOneBit#1"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 29.0,
            "y": 224.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUOneBit",
+        "name": "GUIAm2901ALUOneBit#2",
          "pos": {
            "x": 45.0,
            "y": 280.0
-        },
-        "id": "GUIAm2901ALUOneBit",
-        "name": "GUIAm2901ALUOneBit#2"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 29.0,
            "y": 124.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUOneBit",
+        "name": "GUIAm2901ALUOneBit#3",
          "pos": {
            "x": 45.0,
            "y": 380.0
-        },
-        "id": "GUIAm2901ALUOneBit",
-        "name": "GUIAm2901ALUOneBit#3"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 31.5,
            "y": 144.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 29.0,
            "y": 324.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 31.5,
            "y": 244.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 34.0,
            "y": 154.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 31.5,
            "y": 344.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I5"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "I5"
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "FN"
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 20.0
-          },
-          {
-            "x": 5.0,
-            "y": 7.5
-          }
-        ]
+        "name": "unnamedWire#36",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
          },
          "pin2": {
+          "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "FN"
+        },
+        "name": "unnamedWire#35",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "I4"
+          "pinName": "L"
          },
+        "pin2": {
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
+        },
+        "name": "unnamedWire#38",
          "path": [
            {
-            "x": 10.0,
-            "y": 60.0
+            "x": 67.5,
+            "y": 17.5
            },
            {
-            "x": 10.0,
-            "y": 17.5
+            "x": 67.5,
+            "y": 75.0
+          },
+          {
+            "x": 37.5,
+            "y": 75.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "I3"
+          "compName": "GUIAm2901ALUOneBit#3",
+          "pinName": "FN"
          },
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 15.0,
-            "y": 100.0
-          },
-          {
-            "x": 15.0,
-            "y": 27.5
+            "x": 35.0,
+            "y": 455.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "SBE"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 62.5,
-            "y": 37.5
-          },
-          {
-            "x": 62.5,
-            "y": 70.0
-          },
-          {
-            "x": 25.0,
-            "y": 70.0
-          }
-        ]
+        "name": "unnamedWire#39",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "L"
          },
+        "name": "unnamedWire#41",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "CoutE"
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "L"
          },
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#16",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "CoutE"
+          "pinName": "L"
          },
+        "name": "unnamedWire#42",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "R1"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "CoutE"
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "R"
          },
-        "path": []
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 180.0
+          },
+          {
+            "x": 10.0,
+            "y": 115.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#17",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "CoutE"
+          "pinName": "L"
          },
+        "name": "unnamedWire#44",
          "path": [
            {
-            "x": 25.0,
-            "y": 395.0
+            "x": 37.5,
+            "y": 465.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "CinE"
+          "compName": "_submodelinterface",
+          "pinName": "R3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "R"
          },
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 70.0,
-            "y": 7.5
-          },
-          {
-            "x": 70.0,
-            "y": 77.5
+            "x": 10.0,
+            "y": 260.0
            },
            {
-            "x": 27.5,
-            "y": 77.5
+            "x": 10.0,
+            "y": 315.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "CinE"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "R2"
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "CinE"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "CinE"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "CinE"
+          "pinName": "R"
          },
+        "name": "unnamedWire#46",
          "path": [
            {
-            "x": 27.5,
-            "y": 405.0
+            "x": 10.0,
+            "y": 220.0
+          },
+          {
+            "x": 10.0,
+            "y": 215.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "RN"
+          "compName": "_submodelinterface",
+          "pinName": "S1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "S"
          },
+        "name": "unnamedWire#49",
          "path": [
            {
-            "x": 57.5,
-            "y": 57.5
-          },
-          {
-            "x": 57.5,
-            "y": 65.0
+            "x": 15.0,
+            "y": 340.0
            },
            {
-            "x": 30.0,
-            "y": 65.0
+            "x": 15.0,
+            "y": 135.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "RN"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "RN"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "RN"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "R4"
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "RN"
+          "pinName": "R"
          },
+        "name": "unnamedWire#48",
          "path": [
            {
-            "x": 30.0,
-            "y": 425.0
+            "x": 20.0,
+            "y": 300.0
+          },
+          {
+            "x": 20.0,
+            "y": 415.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "SN"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#3",
+          "pinName": "CoutE"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 65.0,
-            "y": 27.5
-          },
-          {
-            "x": 65.0,
-            "y": 72.5
-          },
-          {
-            "x": 32.5,
-            "y": 72.5
+            "x": 25.0,
+            "y": 395.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "SN"
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "CoutE"
          },
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "SN"
+          "pinName": "CoutE"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "SN"
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "CoutE"
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I4"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "SN"
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "I4"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 32.5,
-            "y": 445.0
+            "x": 10.0,
+            "y": 60.0
+          },
+          {
+            "x": 10.0,
+            "y": 17.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "FN"
+          "compName": "_submodelinterface",
+          "pinName": "S2"
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "S"
          },
+        "name": "unnamedWire#50",
          "path": [
            {
-            "x": 60.0,
-            "y": 47.5
-          },
-          {
-            "x": 60.0,
-            "y": 67.5
+            "x": 5.0,
+            "y": 380.0
            },
            {
-            "x": 35.0,
-            "y": 67.5
+            "x": 5.0,
+            "y": 235.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "FN"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "FN"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I5"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "FN"
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "I5"
          },
-        "path": []
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 20.0
+          },
+          {
+            "x": 5.0,
+            "y": 7.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "S4"
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "FN"
+          "pinName": "S"
          },
+        "name": "unnamedWire#52",
          "path": [
            {
-            "x": 35.0,
-            "y": 455.0
+            "x": 10.0,
+            "y": 460.0
+          },
+          {
+            "x": 10.0,
+            "y": 435.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUFuncDecode#0",
-          "pinName": "L"
+          "compName": "_submodelinterface",
+          "pinName": "S3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "S"
          },
+        "name": "unnamedWire#51",
          "path": [
            {
-            "x": 67.5,
-            "y": 17.5
-          },
-          {
-            "x": 67.5,
-            "y": 75.0
+            "x": 10.0,
+            "y": 420.0
            },
            {
-            "x": 37.5,
-            "y": 75.0
+            "x": 10.0,
+            "y": 335.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "L"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "L"
-        },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "CinE"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "L"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "L"
-        },
-        "path": [
-          {
-            "x": 37.5,
-            "y": 465.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R1"
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "R"
-        },
+        "name": "unnamedWire#10",
          "path": [
            {
-            "x": 10.0,
-            "y": 180.0
+            "x": 70.0,
+            "y": 7.5
            },
            {
-            "x": 10.0,
-            "y": 115.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R2"
-        },
-        "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "R"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 220.0
+            "x": 70.0,
+            "y": 77.5
            },
            {
-            "x": 10.0,
-            "y": 215.0
+            "x": 27.5,
+            "y": 77.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R3"
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "Cout"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "R"
+          "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "Cin"
          },
+        "name": "unnamedWire#54",
          "path": [
            {
-            "x": 10.0,
-            "y": 260.0
+            "x": 85.0,
+            "y": 85.0
            },
            {
-            "x": 10.0,
-            "y": 315.0
+            "x": 85.0,
+            "y": 175.0
+          },
+          {
+            "x": 40.0,
+            "y": 175.0
+          },
+          {
+            "x": 40.0,
+            "y": 185.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R4"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "R"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 300.0
-          },
-          {
-            "x": 20.0,
-            "y": 415.0
-          }
-        ]
+        "name": "unnamedWire#4",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "S1"
+          "pinName": "Cn"
          },
          "pin2": {
            "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "S"
+          "pinName": "Cin"
          },
+        "name": "unnamedWire#53",
          "path": [
            {
-            "x": 15.0,
-            "y": 340.0
+            "x": 5.0,
+            "y": 140.0
            },
            {
-            "x": 15.0,
-            "y": 135.0
+            "x": 5.0,
+            "y": 85.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S2"
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "SBE"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
-          "pinName": "S"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 5.0,
-            "y": 380.0
+            "x": 62.5,
+            "y": 37.5
            },
            {
-            "x": 5.0,
-            "y": 235.0
+            "x": 62.5,
+            "y": 70.0
+          },
+          {
+            "x": 25.0,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S3"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
            "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "S"
+          "pinName": "Cout"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
+        "name": "unnamedWire#56",
          "path": [
            {
-            "x": 10.0,
-            "y": 420.0
-          },
-          {
-            "x": 10.0,
-            "y": 335.0
+            "x": 85.0,
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "S4"
+          "pinName": "I3"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "S"
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "I3"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 10.0,
-            "y": 460.0
+            "x": 15.0,
+            "y": 100.0
            },
            {
-            "x": 10.0,
-            "y": 435.0
+            "x": 15.0,
+            "y": 27.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#0",
-          "pinName": "Cin"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 140.0
-          },
-          {
-            "x": 5.0,
-            "y": 85.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUOneBit#0",
+          "compName": "GUIAm2901ALUOneBit#1",
            "pinName": "Cout"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#1",
+          "compName": "GUIAm2901ALUOneBit#2",
            "pinName": "Cin"
          },
+        "name": "unnamedWire#55",
          "path": [
            {
              "x": 85.0,
-            "y": 85.0
+            "y": 185.0
            },
            {
              "x": 85.0,
-            "y": 175.0
+            "y": 275.0
            },
            {
              "x": 40.0,
-            "y": 175.0
+            "y": 275.0
            },
            {
              "x": 40.0,
-            "y": 185.0
+            "y": 285.0
            }
          ]
        },
        {
          "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
            "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "CinE"
+        },
+        "name": "unnamedWire#14",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901ALUOneBit#3",
            "pinName": "Cout"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#2",
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
+        },
+        "name": "unnamedWire#58",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "CinE"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#3",
            "pinName": "Cin"
          },
+        "name": "unnamedWire#57",
          "path": [
-          {
-            "x": 85.0,
-            "y": 185.0
-          },
-          {
-            "x": 85.0,
-            "y": 275.0
-          },
            {
              "x": 40.0,
-            "y": 275.0
+            "y": 375.0
            },
            {
              "x": 40.0,
-            "y": 285.0
+            "y": 385.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "Cout"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "GUIAm2901ALUOneBit#3",
+          "pinName": "CinE"
+        },
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 27.5,
+            "y": 405.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "CinE"
+        },
+        "name": "unnamedWire#15",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "F"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "F1"
+        },
+        "name": "unnamedWire#59",
          "path": [
            {
-            "x": 85.0,
-            "y": 285.0
+            "x": 90.0,
+            "y": 95.0
+          },
+          {
+            "x": 90.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "Cin"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
+        "name": "unnamedWire#18",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "RN"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 40.0,
-            "y": 375.0
+            "x": 57.5,
+            "y": 57.5
+          },
+          {
+            "x": 57.5,
+            "y": 65.0
            },
            {
-            "x": 40.0,
-            "y": 385.0
+            "x": 30.0,
+            "y": 65.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUOneBit#3",
-          "pinName": "Cout"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUOneBit#0",
+          "compName": "GUIAm2901ALUOneBit#2",
            "pinName": "F"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "F1"
+          "pinName": "F3"
          },
+        "name": "unnamedWire#61",
          "path": [
            {
-            "x": 90.0,
-            "y": 95.0
+            "x": 100.0,
+            "y": 295.0
            },
            {
-            "x": 90.0,
-            "y": 20.0
+            "x": 100.0,
+            "y": 100.0
            }
          ]
        },
@@ -1323,6 +1188,7 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "F2"
          },
+        "name": "unnamedWire#60",
          "path": [
            {
              "x": 95.0,
@@ -1336,21 +1202,22 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUOneBit#2",
-          "pinName": "F"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F3"
+          "compName": "GUIxor#0",
+          "pinName": "A"
          },
+        "name": "unnamedWire#63",
          "path": [
            {
-            "x": 100.0,
-            "y": 295.0
+            "x": 90.0,
+            "y": 375.0
            },
            {
-            "x": 100.0,
-            "y": 100.0
+            "x": 90.0,
+            "y": 405.0
            }
          ]
        },
@@ -1363,6 +1230,7 @@ mograsim version: 0.1.3
            "compName": "_submodelinterface",
            "pinName": "F4"
          },
+        "name": "unnamedWire#62",
          "path": [
            {
              "x": 105.0,
@@ -1376,24 +1244,49 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIxor#0",
-          "pinName": "A"
+          "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "RN"
+        },
+        "name": "unnamedWire#21",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#19",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Cn+4"
          },
+        "name": "unnamedWire#65",
          "path": [
            {
-            "x": 90.0,
-            "y": 375.0
+            "x": 130.0,
+            "y": 385.0
            },
            {
-            "x": 90.0,
-            "y": 405.0
+            "x": 130.0,
+            "y": 180.0
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "RN"
+        },
+        "name": "unnamedWire#20",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#19",
@@ -1403,6 +1296,7 @@ mograsim version: 0.1.3
            "compName": "GUIxor#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#64",
          "path": [
            {
              "x": 85.0,
@@ -1412,24 +1306,33 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn+4"
+          "compName": "GUIAm2901ALUOneBit#3",
+          "pinName": "RN"
          },
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 130.0,
-            "y": 385.0
-          },
-          {
-            "x": 130.0,
-            "y": 180.0
+            "x": 30.0,
+            "y": 425.0
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "RN"
+        },
+        "name": "unnamedWire#22",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "GUIxor#0",
@@ -1438,7 +1341,171 @@ mograsim version: 0.1.3
          "pin2": {
            "compName": "_submodelinterface",
            "pinName": "OVR"
-        }
+        },
+        "name": "unnamedWire#66"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "name": "unnamedWire#25",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "SN"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "name": "unnamedWire#24",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 27.5
+          },
+          {
+            "x": 65.0,
+            "y": 72.5
+          },
+          {
+            "x": 32.5,
+            "y": 72.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "SN"
+        },
+        "name": "unnamedWire#27",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "name": "unnamedWire#26",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#2",
+          "pinName": "SN"
+        },
+        "name": "unnamedWire#29",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#1",
+          "pinName": "SN"
+        },
+        "name": "unnamedWire#28",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#3",
+          "pinName": "SN"
+        },
+        "name": "unnamedWire#30",
+        "path": [
+          {
+            "x": 32.5,
+            "y": 445.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "name": "unnamedWire#32",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIAm2901ALUFuncDecode#0",
+          "pinName": "FN"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "name": "unnamedWire#31",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 47.5
+          },
+          {
+            "x": 60.0,
+            "y": 67.5
+          },
+          {
+            "x": 35.0,
+            "y": 67.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIAm2901ALUOneBit#0",
+          "pinName": "FN"
+        },
+        "name": "unnamedWire#34",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#13",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#14",
+          "pinName": ""
+        },
+        "name": "unnamedWire#33",
+        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json

index 5e9bea0..161cadb 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
@@ -240,1063 +240,1113 @@ mograsim version: 0.1.3
      "innerScale": 0.25,
      "subComps": [
        {
+        "id": "GUIsel3_4",
+        "name": "GUIsel3_4#0",
          "pos": {
            "x": 45.0,
            "y": 575.0
-        },
-        "id": "GUIsel3_4",
-        "name": "GUIsel3_4#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 14.0,
            "y": 499.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 9.0,
            "y": 459.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "GUIAm2901ALUInclDecode",
+        "name": "GUIAm2901ALUInclDecode#0",
          "pos": {
            "x": 60.0,
            "y": 15.0
-        },
-        "id": "GUIAm2901ALUInclDecode",
-        "name": "GUIAm2901ALUInclDecode#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 24.0,
            "y": 579.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 19.0,
            "y": 539.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUIsel2_4",
+        "name": "GUIsel2_4#0",
          "pos": {
            "x": 45.0,
            "y": 365.0
-        },
-        "id": "GUIsel2_4",
-        "name": "GUIsel2_4#0"
+        }
        },
        {
+        "id": "GUIAm2901SourceDecode",
+        "name": "GUIAm2901SourceDecode#0",
          "pos": {
            "x": 15.0,
            "y": 165.0
-        },
-        "id": "GUIAm2901SourceDecode",
-        "name": "GUIAm2901SourceDecode#0"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I5"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
            "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "I5"
+          "pinName": "R1"
          },
-        "path": []
+        "name": "unnamedWire#36",
+        "path": [
+          {
+            "x": 82.5,
+            "y": 370.0
+          },
+          {
+            "x": 82.5,
+            "y": 162.5
+          },
+          {
+            "x": 20.0,
+            "y": 162.5
+          },
+          {
+            "x": 20.0,
+            "y": 60.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "RD"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "I4"
+          "compName": "GUIsel2_4#0",
+          "pinName": "SA"
          },
+        "name": "unnamedWire#35",
          "path": [
            {
-            "x": 5.0,
-            "y": 60.0
+            "x": 55.0,
+            "y": 210.0
            },
            {
-            "x": 5.0,
-            "y": 30.0
+            "x": 55.0,
+            "y": 220.0
+          },
+          {
+            "x": 25.0,
+            "y": 220.0
+          },
+          {
+            "x": 25.0,
+            "y": 370.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
            "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "I3"
+          "pinName": "R3"
          },
+        "name": "unnamedWire#38",
          "path": [
            {
-            "x": 15.0,
-            "y": 100.0
+            "x": 87.5,
+            "y": 390.0
            },
            {
-            "x": 15.0,
-            "y": 40.0
+            "x": 87.5,
+            "y": 157.5
+          },
+          {
+            "x": 25.0,
+            "y": 157.5
+          },
+          {
+            "x": 25.0,
+            "y": 80.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I2"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "I2"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "R2"
          },
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 5.0,
-            "y": 140.0
+            "x": 85.0,
+            "y": 380.0
            },
            {
-            "x": 5.0,
-            "y": 170.0
+            "x": 85.0,
+            "y": 160.0
+          },
+          {
+            "x": 22.5,
+            "y": 160.0
+          },
+          {
+            "x": 22.5,
+            "y": 70.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
-        },
-        "pin2": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "I1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0"
+          "compName": "GUIsel2_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "I0"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "R4"
          },
+        "name": "unnamedWire#39",
          "path": [
            {
-            "x": 5.0,
-            "y": 220.0
+            "x": 90.0,
+            "y": 400.0
            },
            {
-            "x": 5.0,
-            "y": 190.0
+            "x": 90.0,
+            "y": 155.0
+          },
+          {
+            "x": 27.5,
+            "y": 155.0
+          },
+          {
+            "x": 27.5,
+            "y": 90.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y2"
          },
          "pin2": {
            "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "Cn"
+          "pinName": "S2"
          },
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 10.0,
-            "y": 260.0
+            "x": 95.0,
+            "y": 590.0
            },
            {
-            "x": 10.0,
-            "y": 50.0
+            "x": 95.0,
+            "y": 150.0
+          },
+          {
+            "x": 32.5,
+            "y": 150.0
+          },
+          {
+            "x": 32.5,
+            "y": 110.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y1"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A1"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "S1"
          },
+        "name": "unnamedWire#40",
          "path": [
            {
-            "x": 15.0,
-            "y": 300.0
+            "x": 92.5,
+            "y": 580.0
            },
            {
-            "x": 15.0,
-            "y": 390.0
+            "x": 92.5,
+            "y": 152.5
+          },
+          {
+            "x": 30.0,
+            "y": 152.5
+          },
+          {
+            "x": 30.0,
+            "y": 100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y4"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A2"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "S4"
          },
+        "name": "unnamedWire#43",
          "path": [
            {
-            "x": 10.0,
-            "y": 340.0
+            "x": 100.0,
+            "y": 610.0
            },
            {
-            "x": 10.0,
-            "y": 400.0
+            "x": 100.0,
+            "y": 145.0
+          },
+          {
+            "x": 37.5,
+            "y": 145.0
+          },
+          {
+            "x": 37.5,
+            "y": 130.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "GUIsel3_4#0",
+          "pinName": "Y3"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A3"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "S3"
          },
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 5.0,
-            "y": 380.0
+            "x": 97.5,
+            "y": 600.0
            },
            {
-            "x": 5.0,
-            "y": 410.0
+            "x": 97.5,
+            "y": 147.5
+          },
+          {
+            "x": 35.0,
+            "y": 147.5
+          },
+          {
+            "x": 35.0,
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "F2"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A4"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "pinName": "F2"
          },
-        "path": []
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 135.0,
+            "y": 30.0
+          },
+          {
+            "x": 135.0,
+            "y": 60.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "F1"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "F1"
          },
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "F4"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "F4"
          },
-        "path": []
+        "name": "unnamedWire#47",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 50.0
+          },
+          {
+            "x": 125.0,
+            "y": 140.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "F3"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "F3"
          },
-        "path": []
+        "name": "unnamedWire#46",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 40.0
+          },
+          {
+            "x": 130.0,
+            "y": 100.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "OVR"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B1"
+          "compName": "_submodelinterface",
+          "pinName": "OVR"
          },
+        "name": "unnamedWire#49",
          "path": [
            {
-            "x": 10.0,
-            "y": 430.0
+            "x": 115.0,
+            "y": 70.0
+          },
+          {
+            "x": 115.0,
+            "y": 220.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "Cn+4"
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B2"
+          "compName": "_submodelinterface",
+          "pinName": "Cn+4"
          },
+        "name": "unnamedWire#48",
          "path": [
            {
-            "x": 15.0,
-            "y": 440.0
+            "x": 120.0,
+            "y": 60.0
+          },
+          {
+            "x": 120.0,
+            "y": 180.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D3"
          },
          "pin2": {
            "compName": "GUIsel2_4#0",
-          "pinName": "B3"
+          "pinName": "A3"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 20.0,
-            "y": 450.0
+            "x": 5.0,
+            "y": 380.0
+          },
+          {
+            "x": 5.0,
+            "y": 410.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D2"
          },
          "pin2": {
            "compName": "GUIsel2_4#0",
-          "pinName": "B4"
+          "pinName": "A2"
          },
+        "name": "unnamedWire#8",
          "path": [
            {
-            "x": 25.0,
-            "y": 460.0
+            "x": 10.0,
+            "y": 340.0
+          },
+          {
+            "x": 10.0,
+            "y": 400.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
+          "compName": "GUIsel2_4#0",
            "pinName": "A1"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 10.0,
-            "y": 610.0
+            "x": 15.0,
+            "y": 300.0
+          },
+          {
+            "x": 15.0,
+            "y": 390.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Cn"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A2"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "Cn"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 15.0,
-            "y": 620.0
+            "x": 10.0,
+            "y": 260.0
+          },
+          {
+            "x": 10.0,
+            "y": 50.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I4"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A3"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "I4"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 20.0,
-            "y": 630.0
+            "x": 5.0,
+            "y": 60.0
+          },
+          {
+            "x": 5.0,
+            "y": 30.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I5"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "A4"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "I5"
          },
-        "path": [
-          {
-            "x": 25.0,
-            "y": 640.0
-          }
-        ]
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B1"
+          "pinName": "I0"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B1"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "I0"
          },
+        "name": "unnamedWire#5",
          "path": [
            {
              "x": 5.0,
-            "y": 620.0
+            "y": 220.0
            },
            {
              "x": 5.0,
-            "y": 650.0
+            "y": 190.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B2"
+          "pinName": "D4"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B2"
+          "compName": "GUIsel2_4#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#10",
          "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B3"
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B3"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "I1"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I2"
+        },
+        "pin2": {
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "I2"
          },
+        "name": "unnamedWire#3",
          "path": [
            {
              "x": 5.0,
-            "y": 700.0
+            "y": 140.0
            },
            {
              "x": 5.0,
-            "y": 670.0
+            "y": 170.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "B4"
+          "pinName": "A2"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "B4"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 740.0
-          },
-          {
-            "x": 10.0,
-            "y": 680.0
-          }
-        ]
+        "name": "unnamedWire#12",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Q1"
+          "pinName": "I3"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C1"
+          "compName": "GUIAm2901ALUInclDecode#0",
+          "pinName": "I3"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
              "x": 15.0,
-            "y": 780.0
+            "y": 100.0
            },
            {
              "x": 15.0,
-            "y": 690.0
+            "y": 40.0
            }
          ]
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Q2"
+          "pinName": "A1"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 820.0
-          },
-          {
-            "x": 20.0,
-            "y": 700.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Q3"
+          "pinName": "A4"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C3"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 25.0,
-            "y": 860.0
-          },
-          {
-            "x": 25.0,
-            "y": 710.0
-          }
-        ]
+        "name": "unnamedWire#14",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "pinName": "A3"
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "C4"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "B2"
+        },
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 30.0,
-            "y": 900.0
-          },
-          {
-            "x": 30.0,
-            "y": 720.0
+            "x": 15.0,
+            "y": 440.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "SQ"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "SC"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 75.0,
-            "y": 170.0
-          },
-          {
-            "x": 75.0,
-            "y": 240.0
-          },
-          {
-            "x": 30.0,
-            "y": 240.0
-          },
-          {
-            "x": 30.0,
-            "y": 600.0
+            "x": 10.0,
+            "y": 430.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "RA"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
            "compName": "GUIsel2_4#0",
-          "pinName": "SB"
+          "pinName": "B4"
          },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 70.0,
-            "y": 180.0
-          },
-          {
-            "x": 70.0,
-            "y": 235.0
-          },
-          {
-            "x": 20.0,
-            "y": 235.0
-          },
-          {
-            "x": 20.0,
-            "y": 380.0
+            "x": 25.0,
+            "y": 460.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "SB"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "SB"
+          "compName": "GUIsel2_4#0",
+          "pinName": "B3"
          },
+        "name": "unnamedWire#17",
          "path": [
            {
-            "x": 65.0,
-            "y": 190.0
-          },
-          {
-            "x": 65.0,
-            "y": 230.0
-          },
-          {
-            "x": 35.0,
-            "y": 230.0
-          },
-          {
-            "x": 35.0,
-            "y": 590.0
+            "x": 20.0,
+            "y": 450.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "SA"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
            "compName": "GUIsel3_4#0",
-          "pinName": "SA"
+          "pinName": "A1"
          },
+        "name": "unnamedWire#19",
          "path": [
            {
-            "x": 60.0,
-            "y": 200.0
-          },
-          {
-            "x": 60.0,
-            "y": 225.0
-          },
-          {
-            "x": 40.0,
-            "y": 225.0
-          },
-          {
-            "x": 40.0,
-            "y": 580.0
+            "x": 10.0,
+            "y": 610.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901SourceDecode#0",
-          "pinName": "RD"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "SA"
+          "compName": "GUIsel3_4#0",
+          "pinName": "A3"
          },
+        "name": "unnamedWire#21",
          "path": [
            {
-            "x": 55.0,
-            "y": 210.0
-          },
-          {
-            "x": 55.0,
-            "y": 220.0
-          },
-          {
-            "x": 25.0,
-            "y": 220.0
-          },
-          {
-            "x": 25.0,
-            "y": 370.0
+            "x": 20.0,
+            "y": 630.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y1"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "R1"
+          "compName": "GUIsel3_4#0",
+          "pinName": "A2"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 82.5,
-            "y": 370.0
-          },
-          {
-            "x": 82.5,
-            "y": 162.5
-          },
-          {
-            "x": 20.0,
-            "y": 162.5
-          },
-          {
-            "x": 20.0,
-            "y": 60.0
+            "x": 15.0,
+            "y": 620.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "B1"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "R2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B1"
          },
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 85.0,
-            "y": 380.0
-          },
-          {
-            "x": 85.0,
-            "y": 160.0
-          },
-          {
-            "x": 22.5,
-            "y": 160.0
+            "x": 5.0,
+            "y": 620.0
            },
            {
-            "x": 22.5,
-            "y": 70.0
+            "x": 5.0,
+            "y": 650.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "R3"
+          "compName": "GUIsel3_4#0",
+          "pinName": "A4"
          },
+        "name": "unnamedWire#22",
          "path": [
-          {
-            "x": 87.5,
-            "y": 390.0
-          },
-          {
-            "x": 87.5,
-            "y": 157.5
-          },
            {
              "x": 25.0,
-            "y": 157.5
-          },
-          {
-            "x": 25.0,
-            "y": 80.0
+            "y": 640.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "B3"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "R4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B3"
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 90.0,
-            "y": 400.0
-          },
-          {
-            "x": 90.0,
-            "y": 155.0
-          },
-          {
-            "x": 27.5,
-            "y": 155.0
+            "x": 5.0,
+            "y": 700.0
            },
            {
-            "x": 27.5,
-            "y": 90.0
+            "x": 5.0,
+            "y": 670.0
            }
          ]
        },
        {
          "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
            "compName": "GUIsel3_4#0",
-          "pinName": "Y1"
+          "pinName": "B2"
+        },
+        "name": "unnamedWire#24",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "Q1"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "S1"
+          "compName": "GUIsel3_4#0",
+          "pinName": "C1"
          },
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 92.5,
-            "y": 580.0
-          },
-          {
-            "x": 92.5,
-            "y": 152.5
-          },
-          {
-            "x": 30.0,
-            "y": 152.5
+            "x": 15.0,
+            "y": 780.0
            },
            {
-            "x": 30.0,
-            "y": 100.0
+            "x": 15.0,
+            "y": 690.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "B4"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "S2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "B4"
          },
+        "name": "unnamedWire#26",
          "path": [
            {
-            "x": 95.0,
-            "y": 590.0
-          },
-          {
-            "x": 95.0,
-            "y": 150.0
-          },
-          {
-            "x": 32.5,
-            "y": 150.0
+            "x": 10.0,
+            "y": 740.0
            },
            {
-            "x": 32.5,
-            "y": 110.0
+            "x": 10.0,
+            "y": 680.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "Q3"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "S3"
+          "compName": "GUIsel3_4#0",
+          "pinName": "C3"
          },
+        "name": "unnamedWire#29",
          "path": [
            {
-            "x": 97.5,
-            "y": 600.0
-          },
-          {
-            "x": 97.5,
-            "y": 147.5
-          },
-          {
-            "x": 35.0,
-            "y": 147.5
+            "x": 25.0,
+            "y": 860.0
            },
            {
-            "x": 35.0,
-            "y": 120.0
+            "x": 25.0,
+            "y": 710.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIsel3_4#0",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "Q2"
          },
          "pin2": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "S4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "C2"
          },
+        "name": "unnamedWire#28",
          "path": [
            {
-            "x": 100.0,
-            "y": 610.0
-          },
-          {
-            "x": 100.0,
-            "y": 145.0
-          },
-          {
-            "x": 37.5,
-            "y": 145.0
+            "x": 20.0,
+            "y": 820.0
            },
            {
-            "x": 37.5,
-            "y": 130.0
+            "x": 20.0,
+            "y": 700.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "F1"
-        },
-        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "F1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "F2"
+          "pinName": "Q4"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F2"
+          "compName": "GUIsel3_4#0",
+          "pinName": "C4"
          },
+        "name": "unnamedWire#30",
          "path": [
            {
-            "x": 135.0,
-            "y": 30.0
+            "x": 30.0,
+            "y": 900.0
            },
            {
-            "x": 135.0,
-            "y": 60.0
+            "x": 30.0,
+            "y": 720.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "F3"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "RA"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F3"
+          "compName": "GUIsel2_4#0",
+          "pinName": "SB"
          },
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 130.0,
-            "y": 40.0
+            "x": 70.0,
+            "y": 180.0
            },
            {
-            "x": 130.0,
-            "y": 100.0
+            "x": 70.0,
+            "y": 235.0
+          },
+          {
+            "x": 20.0,
+            "y": 235.0
+          },
+          {
+            "x": 20.0,
+            "y": 380.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "F4"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "SQ"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "SC"
          },
+        "name": "unnamedWire#31",
          "path": [
            {
-            "x": 125.0,
-            "y": 50.0
+            "x": 75.0,
+            "y": 170.0
            },
            {
-            "x": 125.0,
-            "y": 140.0
+            "x": 75.0,
+            "y": 240.0
+          },
+          {
+            "x": 30.0,
+            "y": 240.0
+          },
+          {
+            "x": 30.0,
+            "y": 600.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "Cn+4"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "SA"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Cn+4"
+          "compName": "GUIsel3_4#0",
+          "pinName": "SA"
          },
+        "name": "unnamedWire#34",
          "path": [
            {
-            "x": 120.0,
-            "y": 60.0
+            "x": 60.0,
+            "y": 200.0
            },
            {
-            "x": 120.0,
-            "y": 180.0
+            "x": 60.0,
+            "y": 225.0
+          },
+          {
+            "x": 40.0,
+            "y": 225.0
+          },
+          {
+            "x": 40.0,
+            "y": 580.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIAm2901ALUInclDecode#0",
-          "pinName": "OVR"
+          "compName": "GUIAm2901SourceDecode#0",
+          "pinName": "SB"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "OVR"
+          "compName": "GUIsel3_4#0",
+          "pinName": "SB"
          },
+        "name": "unnamedWire#33",
          "path": [
            {
-            "x": 115.0,
-            "y": 70.0
+            "x": 65.0,
+            "y": 190.0
            },
            {
-            "x": 115.0,
-            "y": 220.0
+            "x": 65.0,
+            "y": 230.0
+          },
+          {
+            "x": 35.0,
+            "y": 230.0
+          },
+          {
+            "x": 35.0,
+            "y": 590.0
            }
          ]
        }
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json

index 1dffc50..ca61568 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
@@ -96,188 +96,242 @@ mograsim version: 0.1.3
      "innerScale": 0.2,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 60.0,
            "y": 55.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 54.0,
            "y": 69.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 49.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "GUImux1",
+        "name": "GUImux1#0",
          "pos": {
            "x": 90.0,
            "y": 70.0
-        },
-        "id": "GUImux1",
-        "name": "GUImux1#0"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 10.0,
            "y": 20.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "GUIxor",
+        "name": "GUIxor#1",
          "pos": {
            "x": 10.0,
            "y": 290.0
-        },
-        "id": "GUIxor",
-        "name": "GUIxor#1"
+        }
        },
        {
+        "id": "GUIxor",
+        "name": "GUIxor#2",
          "pos": {
            "x": 135.0,
            "y": 70.0
-        },
-        "id": "GUIxor",
-        "name": "GUIxor#2"
+        }
        },
        {
+        "id": "GUIfulladder",
+        "name": "GUIfulladder#0",
          "pos": {
            "x": 60.0,
            "y": 20.0
-        },
-        "id": "GUIfulladder",
-        "name": "GUIfulladder#0"
+        }
        },
        {
+        "id": "GUIxor",
+        "name": "GUIxor#0",
          "pos": {
            "x": 10.0,
            "y": 190.0
-        },
-        "id": "GUIxor",
-        "name": "GUIxor#0"
+        }
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#1",
          "pos": {
            "x": 135.0,
            "y": 20.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#1"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Cin"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
+          "compName": "GUIfulladder#0",
+          "pinName": "C"
          },
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 55.0,
+            "y": 45.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "CoutE"
+          "compName": "GUIxor#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIand#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
+        "name": "unnamedWire#13",
          "path": [
            {
-            "x": 5.0,
-            "y": 75.0
+            "x": 55.0,
+            "y": 295.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "GUIfulladder#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "GUImux1#0",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 25.0
            },
            {
-            "x": 5.0,
-            "y": 10.0
+            "x": 100.0,
+            "y": 65.0
            },
            {
-            "x": 130.0,
-            "y": 10.0
+            "x": 85.0,
+            "y": 65.0
            },
            {
-            "x": 130.0,
-            "y": 25.0
+            "x": 85.0,
+            "y": 85.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "CinE"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#0",
+          "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#15",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "GUImux1#0",
+          "pinName": "I1"
+        },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 7.5,
-            "y": 125.0
+            "x": 82.5,
+            "y": 65.0
            },
            {
-            "x": 7.5,
-            "y": 35.0
+            "x": 82.5,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "R"
+          "compName": "GUIfulladder#0",
+          "pinName": "Z"
          },
          "pin2": {
-          "compName": "GUIxor#0",
-          "pinName": "A"
-        }
+          "compName": "GUIand#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#17",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "RN"
+          "compName": "GUImux1#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIxor#0",
-          "pinName": "B"
-        }
+          "compName": "GUIxor#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#19",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S"
+          "compName": "GUIand#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIxor#1",
+          "compName": "GUIfulladder#0",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "SN"
+          "pinName": "L"
          },
          "pin2": {
-          "compName": "GUIxor#1",
-          "pinName": "B"
-        }
+          "compName": "GUImux1#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 87.5,
+            "y": 425.0
+          },
+          {
+            "x": 87.5,
+            "y": 75.0
+          }
+        ]
        },
        {
          "pin1": {
@@ -288,6 +342,7 @@ mograsim version: 0.1.3
            "compName": "GUIxor#2",
            "pinName": "B"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
              "x": 130.0,
@@ -302,34 +357,66 @@ mograsim version: 0.1.3
        {
          "pin1": {
            "compName": "_submodelinterface",
-          "pinName": "L"
+          "pinName": "SN"
          },
          "pin2": {
-          "compName": "GUImux1#0",
-          "pinName": "S0"
+          "compName": "GUIxor#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "CoutE"
+        },
+        "pin2": {
+          "compName": "GUIand#1",
+          "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 87.5,
-            "y": 425.0
+            "x": 5.0,
+            "y": 75.0
            },
            {
-            "x": 87.5,
-            "y": 75.0
+            "x": 5.0,
+            "y": 10.0
+          },
+          {
+            "x": 130.0,
+            "y": 10.0
+          },
+          {
+            "x": 130.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "Cin"
          },
          "pin2": {
-          "compName": "GUIfulladder#0",
+          "compName": "GUIand#0",
            "pinName": "A"
          },
+        "name": "unnamedWire#0",
          "path": []
        },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "S"
+        },
+        "pin2": {
+          "compName": "GUIxor#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5"
+      },
        {
          "pin1": {
            "compName": "GUIxor#0",
@@ -339,6 +426,7 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#0",
            "pinName": ""
          },
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 50.0,
@@ -348,165 +436,99 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUIxor#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUIfulladder#0",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "F"
          },
-        "path": [
-          {
-            "x": 50.0,
-            "y": 35.0
-          }
-        ]
+        "name": "unnamedWire#21",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "RN"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUIxor#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#4"
        },
        {
          "pin1": {
-          "compName": "GUIxor#1",
+          "compName": "GUIand#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Cout"
          },
-        "path": [
-          {
-            "x": 55.0,
-            "y": 295.0
-          }
-        ]
+        "name": "unnamedWire#20",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "R"
          },
          "pin2": {
-          "compName": "GUIfulladder#0",
-          "pinName": "C"
+          "compName": "GUIxor#0",
+          "pinName": "A"
          },
-        "path": [
-          {
-            "x": 55.0,
-            "y": 45.0
-          }
-        ]
+        "name": "unnamedWire#3"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
            "compName": "GUINandGate#0",
-          "pinName": "B"
+          "pinName": "A"
          },
+        "name": "unnamedWire#12",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIfulladder#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "CinE"
          },
          "pin2": {
-          "compName": "GUImux1#0",
-          "pinName": "I0"
+          "compName": "GUIand#0",
+          "pinName": "B"
          },
+        "name": "unnamedWire#2",
          "path": [
            {
-            "x": 100.0,
-            "y": 25.0
-          },
-          {
-            "x": 100.0,
-            "y": 65.0
-          },
-          {
-            "x": 85.0,
-            "y": 65.0
+            "x": 7.5,
+            "y": 125.0
            },
            {
-            "x": 85.0,
-            "y": 85.0
+            "x": 7.5,
+            "y": 35.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUIfulladder#0",
-          "pinName": "Z"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIand#1",
+          "compName": "GUIfulladder#0",
            "pinName": "B"
          },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "GUImux1#0",
-          "pinName": "I1"
-        },
+        "name": "unnamedWire#11",
          "path": [
            {
-            "x": 82.5,
-            "y": 65.0
-          },
-          {
-            "x": 82.5,
-            "y": 95.0
+            "x": 50.0,
+            "y": 35.0
            }
          ]
-      },
-      {
-        "pin1": {
-          "compName": "GUImux1#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "GUIxor#2",
-          "pinName": "A"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIand#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Cout"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIxor#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "F"
-        },
-        "path": []
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json

index 3a75574..6be3799 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
@@ -80,593 +80,652 @@ mograsim version: 0.1.3
      "innerScale": 0.25,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 15.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 74.0,
            "y": 159.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 15.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 74.0,
            "y": 104.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 15.0,
            "y": 150.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 15.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 109.0,
            "y": 214.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 4.0,
            "y": 14.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 9.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 4.0,
            "y": 24.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 9.0,
            "y": 104.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 9.0,
            "y": 64.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 39.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 4.0,
            "y": 154.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 44.0,
            "y": 54.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 44.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 39.0,
            "y": 134.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 74.0,
            "y": 99.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 74.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#12",
          "pos": {
            "x": 115.0,
            "y": 210.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#12",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
          "pos": {
            "x": 110.0,
            "y": 105.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#10",
          "pos": {
            "x": 80.0,
            "y": 145.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#10",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
          "pos": {
            "x": 80.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
          "pos": {
            "x": 80.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 50.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 50.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 50.0,
            "y": 130.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 50.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I8"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 165.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "LSH"
          },
-        "path": []
+        "name": "unnamedWire#36",
+        "path": [
+          {
+            "x": 125.0,
+            "y": 140.0
+          },
+          {
+            "x": 125.0,
+            "y": 180.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "A"
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUINandGate#9",
+          "pinName": "B"
          },
+        "name": "unnamedWire#35",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
          },
+        "name": "unnamedWire#16",
          "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I7"
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
+        "name": "unnamedWire#38",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#4",
            "pinName": "A"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 10.0,
-            "y": 55.0
+            "x": 5.0,
+            "y": 5.0
+          },
+          {
+            "x": 40.0,
+            "y": 5.0
+          },
+          {
+            "x": 40.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUINandGate#10",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#37",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 150.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#5",
            "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#18",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#17",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 25.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#10",
            "pinName": "B"
          },
+        "name": "unnamedWire#39",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 95.0
-          }
-        ]
+        "name": "unnamedWire#19",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I6"
+          "compName": "GUINandGate#9",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUINandGate#11",
+          "pinName": "A"
          },
+        "name": "unnamedWire#41"
+      },
+      {
+        "pin1": {
+          "compName": "GUINandGate#8",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "RSH"
+        },
+        "name": "unnamedWire#40",
          "path": [
            {
-            "x": 5.0,
-            "y": 100.0
+            "x": 130.0,
+            "y": 20.0
+          },
+          {
+            "x": 130.0,
+            "y": 60.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
          },
+        "name": "unnamedWire#21",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "GUINandGate#10",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
          },
+        "name": "unnamedWire#43",
          "path": [
            {
-            "x": 5.0,
-            "y": 165.0
+            "x": 110.0,
+            "y": 155.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#8",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "NSH"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 5.0,
+            "x": 45.0,
              "y": 5.0
            },
            {
-            "x": 40.0,
+            "x": 135.0,
              "y": 5.0
            },
            {
-            "x": 40.0,
-            "y": 15.0
+            "x": 135.0,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#11",
            "pinName": "B"
          },
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 40.0,
-            "y": 25.0
+            "x": 75.0,
+            "y": 170.0
+          },
+          {
+            "x": 105.0,
+            "y": 170.0
+          },
+          {
+            "x": 105.0,
+            "y": 120.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "B"
+          "compName": "GUINandGate#6",
+          "pinName": "A"
          },
+        "name": "unnamedWire#23",
          "path": [
            {
-            "x": 40.0,
-            "y": 65.0
+            "x": 45.0,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "NSH"
+          "compName": "GUINandGate#12",
+          "pinName": "B"
          },
+        "name": "unnamedWire#45",
          "path": [
            {
-            "x": 45.0,
-            "y": 5.0
-          },
-          {
-            "x": 135.0,
-            "y": 5.0
-          },
-          {
-            "x": 135.0,
-            "y": 20.0
+            "x": 110.0,
+            "y": 225.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUINandGate#5",
+          "pinName": "A"
          },
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#12",
            "pinName": "A"
          },
+        "name": "unnamedWire#44",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "A"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 45.0,
-            "y": 95.0
+            "x": 40.0,
+            "y": 100.0
            }
          ]
        },
+      {
+        "pin1": {
+          "compName": "GUINandGate#12",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QWE"
+        },
+        "name": "unnamedWire#47",
+        "path": []
+      },
        {
          "pin1": {
            "compName": "WireCrossPoint#5",
@@ -676,6 +735,7 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#6",
            "pinName": "B"
          },
+        "name": "unnamedWire#24",
          "path": [
            {
              "x": 10.0,
@@ -693,17 +753,29 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#11",
            "pinName": "Y"
          },
          "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "YF"
+        },
+        "name": "unnamedWire#46"
+      },
+      {
+        "pin1": {
            "compName": "WireCrossPoint#10",
            "pinName": ""
          },
+        "pin2": {
+          "compName": "GUINandGate#7",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#27",
          "path": [
            {
              "x": 40.0,
-            "y": 100.0
+            "y": 145.0
            }
          ]
        },
@@ -716,21 +788,23 @@ mograsim version: 0.1.3
            "compName": "GUINandGate#7",
            "pinName": "A"
          },
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "B"
+          "compName": "GUINandGate#8",
+          "pinName": "A"
          },
+        "name": "unnamedWire#29",
          "path": [
            {
-            "x": 40.0,
-            "y": 145.0
+            "x": 75.0,
+            "y": 15.0
            }
          ]
        },
@@ -743,284 +817,258 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#11",
            "pinName": ""
          },
+        "name": "unnamedWire#28",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#8",
-          "pinName": "A"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 15.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#1",
            "pinName": "B"
          },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 25.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "RAMWE"
-        },
-        "path": [
-          {
-            "x": 125.0,
-            "y": 60.0
-          },
-          {
-            "x": 125.0,
-            "y": 100.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#1",
            "pinName": "A"
          },
+        "name": "unnamedWire#6",
          "path": [
            {
-            "x": 75.0,
-            "y": 95.0
+            "x": 10.0,
+            "y": 55.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
+        "name": "unnamedWire#1",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I8"
          },
          "pin2": {
-          "compName": "GUINandGate#9",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#0",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#7",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#11",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "LSH"
+          "compName": "GUINandGate#8",
+          "pinName": "B"
          },
+        "name": "unnamedWire#30",
          "path": [
            {
-            "x": 125.0,
-            "y": 140.0
-          },
-          {
-            "x": 125.0,
-            "y": 180.0
+            "x": 75.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "_submodelinterface",
+          "pinName": "I7"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
-          "pinName": "A"
+          "compName": "GUINandGate#2",
+          "pinName": "B"
          },
-        "path": [
-          {
-            "x": 75.0,
-            "y": 150.0
-          }
-        ]
+        "name": "unnamedWire#10",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#6",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
+        "name": "unnamedWire#32",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#0",
            "pinName": "B"
          },
+        "name": "unnamedWire#4",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#5",
            "pinName": "Y"
          },
          "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "RSH"
+          "pinName": "RAMWE"
          },
+        "name": "unnamedWire#31",
          "path": [
            {
-            "x": 130.0,
-            "y": 20.0
+            "x": 125.0,
+            "y": 60.0
            },
            {
-            "x": 130.0,
-            "y": 60.0
+            "x": 125.0,
+            "y": 100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#9",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#11",
+          "compName": "GUINandGate#0",
            "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#3",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I6"
          },
          "pin2": {
-          "compName": "GUINandGate#11",
-          "pinName": "B"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 75.0,
-            "y": 170.0
-          },
-          {
-            "x": 105.0,
-            "y": 170.0
-          },
-          {
-            "x": 105.0,
-            "y": 120.0
+            "x": 5.0,
+            "y": 100.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#10",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
-        "path": [
-          {
-            "x": 110.0,
-            "y": 155.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#12",
-          "pinName": "A"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#12",
-          "pinName": "B"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
          },
+        "name": "unnamedWire#11",
          "path": [
            {
-            "x": 110.0,
-            "y": 225.0
+            "x": 5.0,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#11",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "YF"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#12",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QWE"
+          "compName": "GUINandGate#9",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#33",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 95.0
+          }
+        ]
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json

index ec0983e..05bd783 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
@@ -88,141 +88,178 @@ mograsim version: 0.1.3
      "innerScale": 0.4,
      "subComps": [
        {
+        "id": "GUIdff",
+        "name": "GUIdff#1",
          "pos": {
            "x": 50.0,
            "y": 32.5
-        },
-        "id": "GUIdff",
-        "name": "GUIdff#1"
+        }
        },
        {
+        "id": "GUIdff",
+        "name": "GUIdff#0",
          "pos": {
            "x": 50.0,
            "y": 7.5
-        },
-        "id": "GUIdff",
-        "name": "GUIdff#0"
+        }
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 41.5,
            "y": 36.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 41.5,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 41.5,
            "y": 61.5
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "GUIand",
+        "name": "GUIand#0",
          "pos": {
            "x": 5.0,
            "y": 15.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
        },
        {
+        "id": "GUIdff",
+        "name": "GUIdff#3",
          "pos": {
            "x": 50.0,
            "y": 82.5
-        },
-        "id": "GUIdff",
-        "name": "GUIdff#3"
+        }
        },
        {
+        "id": "GUIdff",
+        "name": "GUIdff#2",
          "pos": {
            "x": 50.0,
            "y": 57.5
-        },
-        "id": "GUIdff",
-        "name": "GUIdff#2"
+        }
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C"
+          "compName": "GUIdff#1",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "A"
-        }
+          "compName": "_submodelinterface",
+          "pinName": "Q2"
+        },
+        "name": "unnamedWire#14",
+        "path": []
        },
        {
          "pin1": {
+          "compName": "GUIdff#0",
+          "pinName": "Q"
+        },
+        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "WE"
+          "pinName": "Q1"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "GUIdff#3",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "B"
-        }
+          "compName": "_submodelinterface",
+          "pinName": "Q4"
+        },
+        "name": "unnamedWire#16",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
+          "compName": "GUIdff#2",
+          "pinName": "Q"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Q3"
          },
+        "name": "unnamedWire#15",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D1"
          },
          "pin2": {
            "compName": "GUIdff#0",
-          "pinName": "C"
+          "pinName": "D"
          },
+        "name": "unnamedWire#9",
          "path": [
            {
-            "x": 42.5,
-            "y": 12.5
+            "x": 17.5,
+            "y": 62.5
+          },
+          {
+            "x": 17.5,
+            "y": 42.5
+          },
+          {
+            "x": 45.0,
+            "y": 42.5
+          },
+          {
+            "x": 45.0,
+            "y": 22.5
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUIdff#3",
+          "pinName": "C"
          },
-        "path": []
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 42.5,
+            "y": 87.5
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdff#1",
+          "compName": "GUIdff#2",
            "pinName": "C"
          },
+        "name": "unnamedWire#7",
          "path": []
        },
        {
@@ -234,62 +271,42 @@ mograsim version: 0.1.3
            "compName": "WireCrossPoint#2",
            "pinName": ""
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "WE"
          },
          "pin2": {
-          "compName": "GUIdff#2",
-          "pinName": "C"
+          "compName": "GUIand#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#1"
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "C"
          },
          "pin2": {
-          "compName": "GUIdff#3",
-          "pinName": "C"
+          "compName": "GUIand#0",
+          "pinName": "A"
          },
-        "path": [
-          {
-            "x": 42.5,
-            "y": 87.5
-          }
-        ]
+        "name": "unnamedWire#0"
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdff#0",
-          "pinName": "D"
+          "compName": "GUIdff#1",
+          "pinName": "C"
          },
-        "path": [
-          {
-            "x": 17.5,
-            "y": 62.5
-          },
-          {
-            "x": 17.5,
-            "y": 42.5
-          },
-          {
-            "x": 45.0,
-            "y": 42.5
-          },
-          {
-            "x": 45.0,
-            "y": 22.5
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
        },
        {
          "pin1": {
@@ -300,6 +317,7 @@ mograsim version: 0.1.3
            "compName": "GUIdff#1",
            "pinName": "D"
          },
+        "name": "unnamedWire#10",
          "path": [
            {
              "x": 22.5,
@@ -313,21 +331,30 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUIdff#2",
-          "pinName": "D"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "pin2": {
+          "compName": "GUIdff#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#3",
          "path": [
            {
-            "x": 27.5,
-            "y": 112.5
-          },
-          {
-            "x": 27.5,
-            "y": 72.5
+            "x": 42.5,
+            "y": 12.5
            }
          ]
        },
@@ -340,6 +367,7 @@ mograsim version: 0.1.3
            "compName": "GUIdff#3",
            "pinName": "D"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
              "x": 32.5,
@@ -353,47 +381,36 @@ mograsim version: 0.1.3
        },
        {
          "pin1": {
-          "compName": "GUIdff#0",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdff#1",
-          "pinName": "Q"
+          "compName": "GUIand#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUIdff#2",
-          "pinName": "Q"
-        },
-        "pin2": {
            "compName": "_submodelinterface",
-          "pinName": "Q3"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIdff#3",
-          "pinName": "Q"
+          "pinName": "D3"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "compName": "GUIdff#2",
+          "pinName": "D"
          },
-        "path": []
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 27.5,
+            "y": 112.5
+          },
+          {
+            "x": 27.5,
+            "y": 72.5
+          }
+        ]
        }
      ]
    },
diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json

index a995649..746f301 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
+++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
@@ -72,995 +72,1046 @@ mograsim version: 0.1.3
      "innerScale": 0.25,
      "subComps": [
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
          "pos": {
            "x": 10.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#14",
          "pos": {
            "x": 94.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
          "pos": {
            "x": 10.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#13",
          "pos": {
            "x": 64.0,
            "y": 139.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
          "pos": {
            "x": 40.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
          "pos": {
            "x": 10.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#15",
          "pos": {
            "x": 94.0,
            "y": 179.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
          "pos": {
            "x": 6.5,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
          "pos": {
            "x": 4.0,
            "y": 19.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
          "pos": {
            "x": 6.5,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
          "pos": {
            "x": 4.0,
            "y": 144.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
          "pos": {
            "x": 6.5,
            "y": 104.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
          "pos": {
            "x": 6.5,
            "y": 99.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
          "pos": {
            "x": 34.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
          "pos": {
            "x": 31.5,
            "y": 54.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
          "pos": {
            "x": 34.0,
            "y": 134.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
          "pos": {
            "x": 34.0,
            "y": 64.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
          "pos": {
            "x": 36.5,
            "y": 99.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#12",
          "pos": {
            "x": 64.0,
            "y": 99.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
          "params": 1
        },
        {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#11",
          "pos": {
            "x": 64.0,
            "y": 59.0
          },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#12",
          "pos": {
            "x": 70.0,
            "y": 170.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#12",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
          "pos": {
            "x": 70.0,
            "y": 130.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#11",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#14",
          "pos": {
            "x": 100.0,
            "y": 170.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#14",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#13",
          "pos": {
            "x": 100.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#13",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#10",
          "pos": {
            "x": 70.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#10",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
          "pos": {
            "x": 70.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
          "pos": {
            "x": 70.0,
            "y": 10.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
          "pos": {
            "x": 40.0,
            "y": 90.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
          "pos": {
            "x": 40.0,
            "y": 50.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
          "pos": {
            "x": 40.0,
            "y": 170.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
          "params": 1
        },
        {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
          "pos": {
            "x": 40.0,
            "y": 130.0
          },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
          "params": 1
        }
      ],
      "innerWires": [
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I2"
+          "compName": "GUINandGate#6",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
+        "name": "unnamedWire#36",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#12",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "GUINandGate#10",
+          "pinName": "B"
          },
+        "name": "unnamedWire#35",
          "path": [
            {
-            "x": 5.0,
-            "y": 5.0
-          },
-          {
-            "x": 35.0,
-            "y": 5.0
-          },
-          {
-            "x": 35.0,
-            "y": 15.0
+            "x": 65.0,
+            "y": 105.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#11",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#38",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 145.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#13",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#11",
            "pinName": "A"
          },
+        "name": "unnamedWire#37",
          "path": [
            {
-            "x": 7.5,
-            "y": 15.0
+            "x": 65.0,
+            "y": 135.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "GUINandGate#12",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#39"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUINandGate#13",
+          "pinName": "A"
          },
+        "name": "unnamedWire#41",
          "path": [
            {
-            "x": 7.5,
-            "y": 25.0
+            "x": 95.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#8",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
+        "name": "unnamedWire#40",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#9",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "B"
+          "compName": "_submodelinterface",
+          "pinName": "RA"
          },
+        "name": "unnamedWire#43",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#14",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#12",
+          "compName": "GUINandGate#13",
            "pinName": "B"
          },
+        "name": "unnamedWire#42",
          "path": [
            {
-            "x": 5.0,
-            "y": 195.0
-          },
-          {
-            "x": 65.0,
-            "y": 195.0
-          },
-          {
-            "x": 65.0,
-            "y": 185.0
+            "x": 95.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
+          "compName": "GUINandGate#11",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "SA"
          },
+        "name": "unnamedWire#45",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "GUINandGate#10",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "SB"
          },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 55.0
-          }
-        ]
+        "name": "unnamedWire#44",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "GUINandGate#14",
+          "pinName": "A"
          },
+        "name": "unnamedWire#47",
          "path": [
            {
-            "x": 7.5,
-            "y": 65.0
+            "x": 95.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I0"
+          "compName": "GUINandGate#12",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
+        "name": "unnamedWire#46",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "GUINandGate#13",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "SQ"
+        },
+        "name": "unnamedWire#49",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#15",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#14",
+          "pinName": "B"
          },
+        "name": "unnamedWire#48",
          "path": [
            {
-            "x": 7.5,
-            "y": 95.0
+            "x": 95.0,
+            "y": 185.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 55.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I1"
          },
          "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
          },
+        "name": "unnamedWire#8",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#12",
            "pinName": "B"
          },
+        "name": "unnamedWire#7",
          "path": [
            {
-            "x": 7.5,
-            "y": 112.5
+            "x": 5.0,
+            "y": 195.0
            },
            {
-            "x": 32.5,
-            "y": 112.5
+            "x": 65.0,
+            "y": 195.0
            },
            {
-            "x": 32.5,
-            "y": 105.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "path": [
-          {
-            "x": 32.5,
-            "y": 20.0
+            "x": 65.0,
+            "y": 185.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
+          "compName": "GUINandGate#6",
+          "pinName": "B"
          },
+        "name": "unnamedWire#6",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#3",
            "pinName": "A"
          },
+        "name": "unnamedWire#1",
          "path": [
            {
-            "x": 32.5,
-            "y": 95.0
+            "x": 5.0,
+            "y": 5.0
+          },
+          {
+            "x": 35.0,
+            "y": 5.0
+          },
+          {
+            "x": 35.0,
+            "y": 15.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#14",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "RD"
          },
+        "name": "unnamedWire#50",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I2"
          },
          "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 35.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#0",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#0",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#2",
            "pinName": ""
          },
+        "name": "unnamedWire#5",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#3",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#1",
            "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 65.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 25.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#0",
            "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 15.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#4",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#2",
            "pinName": "A"
          },
+        "name": "unnamedWire#12",
          "path": [
            {
-            "x": 35.0,
-            "y": 175.0
+            "x": 7.5,
+            "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#1",
            "pinName": ""
          },
+        "name": "unnamedWire#2",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I0"
          },
          "pin2": {
-          "compName": "GUINandGate#8",
-          "pinName": "B"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 37.5,
-            "y": 35.0
-          },
-          {
-            "x": 65.0,
-            "y": 35.0
-          },
-          {
-            "x": 65.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#11",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#2",
            "pinName": "B"
          },
-        "path": [
-          {
-            "x": 37.5,
-            "y": 185.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "GUINandGate#8",
-          "pinName": "A"
-        }
+        "name": "unnamedWire#14",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
+        "name": "unnamedWire#13",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
          },
          "pin2": {
-          "compName": "GUINandGate#9",
-          "pinName": "A"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
          },
+        "name": "unnamedWire#16",
          "path": [
            {
-            "x": 65.0,
-            "y": 55.0
+            "x": 32.5,
+            "y": 20.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#5",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#5",
            "pinName": "B"
          },
+        "name": "unnamedWire#15",
          "path": [
            {
-            "x": 65.0,
-            "y": 65.0
+            "x": 7.5,
+            "y": 112.5
+          },
+          {
+            "x": 32.5,
+            "y": 112.5
+          },
+          {
+            "x": 32.5,
+            "y": 105.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#5",
            "pinName": "A"
          },
+        "name": "unnamedWire#18",
          "path": [
            {
-            "x": 65.0,
+            "x": 32.5,
              "y": 95.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#6",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#10",
-          "pinName": "B"
+          "compName": "GUINandGate#4",
+          "pinName": "A"
          },
-        "path": [
-          {
-            "x": 65.0,
-            "y": 105.0
-          }
-        ]
+        "name": "unnamedWire#17",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#1",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
+        "name": "unnamedWire#19",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#11",
-          "pinName": "A"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
-        "path": [
-          {
-            "x": 65.0,
-            "y": 135.0
-          }
-        ]
+        "name": "unnamedWire#21",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#7",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#11",
+          "compName": "GUINandGate#3",
            "pinName": "B"
          },
+        "name": "unnamedWire#20",
          "path": [
            {
-            "x": 65.0,
-            "y": 145.0
+            "x": 35.0,
+            "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#7",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#12",
-          "pinName": "A"
-        }
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
+        },
+        "name": "unnamedWire#23",
+        "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#8",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "B"
          },
+        "name": "unnamedWire#22",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#13",
+          "compName": "GUINandGate#7",
            "pinName": "A"
          },
+        "name": "unnamedWire#25",
          "path": [
            {
-            "x": 95.0,
-            "y": 15.0
+            "x": 35.0,
+            "y": 175.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#13",
+          "compName": "GUINandGate#6",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#24",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#8",
            "pinName": "B"
          },
+        "name": "unnamedWire#27",
          "path": [
            {
-            "x": 95.0,
+            "x": 37.5,
+            "y": 35.0
+          },
+          {
+            "x": 65.0,
+            "y": 35.0
+          },
+          {
+            "x": 65.0,
              "y": 25.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#2",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "RA"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
+        "name": "unnamedWire#26",
          "path": []
        },
        {
          "pin1": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#3",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
+          "compName": "GUINandGate#8",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#29"
        },
        {
          "pin1": {
-          "compName": "GUINandGate#11",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SA"
+          "compName": "GUINandGate#7",
+          "pinName": "B"
          },
-        "path": []
+        "name": "unnamedWire#28",
+        "path": [
+          {
+            "x": 37.5,
+            "y": 185.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#12",
+          "compName": "GUINandGate#4",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
+        "name": "unnamedWire#30",
          "path": []
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#14",
-          "pinName": "A"
+          "compName": "GUINandGate#9",
+          "pinName": "B"
          },
+        "name": "unnamedWire#32",
          "path": [
            {
-            "x": 95.0,
-            "y": 175.0
+            "x": 65.0,
+            "y": 65.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
            "pinName": ""
          },
          "pin2": {
-          "compName": "GUINandGate#14",
-          "pinName": "B"
+          "compName": "GUINandGate#9",
+          "pinName": "A"
          },
+        "name": "unnamedWire#31",
          "path": [
            {
-            "x": 95.0,
-            "y": 185.0
+            "x": 65.0,
+            "y": 55.0
            }
          ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#13",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "SQ"
+          "compName": "GUINandGate#10",
+          "pinName": "A"
          },
-        "path": []
+        "name": "unnamedWire#34",
+        "path": [
+          {
+            "x": 65.0,
+            "y": 95.0
+          }
+        ]
        },
        {
          "pin1": {
-          "compName": "GUINandGate#14",
+          "compName": "GUINandGate#5",
            "pinName": "Y"
          },
          "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "RD"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
          },
+        "name": "unnamedWire#33",
          "path": []
        }
      ]
diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java

index 7bbc398..af838d1 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
@@ -150,7 +150,7 @@ public class TestableAm2901Impl implements TestableAm2901
                 while (modelsToIterate.size() > 0)
                 {
                         ViewModel model = modelsToIterate.poll();
-                       wiresIncludingSubmodels.addAll(model.getWires());
+                       wiresIncludingSubmodels.addAll(model.getWiresByName().values());
                         for (GUIComponent comp : model.getComponentsByName().values())
                                 if (comp instanceof SubmodelComponent)
                                         modelsToIterate.offer(((SubmodelComponent) comp).submodel);
diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java

index 58e1f6c..7e23160 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
@@ -91,7 +91,7 @@ public class HandleManager
                         registerInterfaceComponent(interfaceComp);
                         comps.forEach(c -> registerComponent(c));
  
-                       model.getWires().forEach(w -> registerWire(w));
+                       model.getWiresByName().values().forEach(w -> registerWire(w));
                         addHandle(cornerHandle = new CornerHandle(editor.toBeEdited));
                 }
         }
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java

index c85dd53..f88cc5d 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java
@@ -25,7 +25,7 @@ public class LogicUIRenderer
                 gc.setAntialias(SWT.ON);
                 gc.setClipping(visibleRegion);
                 gc.setLineWidth(.5);
-               model.getWires().forEach(w ->
+               model.getWiresByName().values().forEach(w ->
                 {
                         Rectangle bounds = w.getBounds();
                         double lw = gc.getLineWidth();
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java

index 1938132..68cc489 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java
@@ -14,8 +14,8 @@ public class ViewModel
  {
         private final Map<String, GUIComponent> components;
         private final Map<String, GUIComponent> componentsUnmodifiable;
-       private final List<GUIWire> wires;
-       private final List<GUIWire> wiresUnmodifiable;
+       private final Map<String, GUIWire> wires;
+       private final Map<String, GUIWire> wiresUnmodifiable;
  
         private final List<Consumer<? super GUIComponent>> componentAddedListeners;
         private final List<Consumer<? super GUIComponent>> componentRemovedListeners;
@@ -29,8 +29,8 @@ public class ViewModel
         {
                 components = new HashMap<>();
                 componentsUnmodifiable = Collections.unmodifiableMap(components);
-               wires = new ArrayList<>();
-               wiresUnmodifiable = Collections.unmodifiableList(wires);
+               wires = new HashMap<>();
+               wiresUnmodifiable = Collections.unmodifiableMap(wires);
  
                 componentAddedListeners = new ArrayList<>();
                 componentRemovedListeners = new ArrayList<>();
@@ -75,9 +75,9 @@ public class ViewModel
          */
         protected void wireCreated(GUIWire wire)
         {
-               if (wires.contains(wire))
+               if (wires.containsKey(wire.name))
                         throw new IllegalStateException("Don't add the same wire twice!");
-               wires.add(wire);
+               wires.put(wire.name, wire);
                 callWireAddedListeners(wire);
                 wire.addRedrawListener(redrawListenerForSubcomponents);
                 callRedrawListeners();
@@ -89,9 +89,9 @@ public class ViewModel
          */
         protected void wireDestroyed(GUIWire wire)
         {
-               if (!wires.contains(wire))
+               if (!wires.containsKey(wire.name))
                         throw new IllegalStateException("Don't remove the same wire twice!");
-               wires.remove(wire);
+               wires.remove(wire.name);
                 callWireRemovedListeners(wire);
                 wire.removeRedrawListener(redrawListenerForSubcomponents);
                 callRedrawListeners();
@@ -102,7 +102,7 @@ public class ViewModel
                 return componentsUnmodifiable;
         }
  
-       public List<GUIWire> getWires()
+       public Map<String, GUIWire> getWiresByName()
         {
                 return wiresUnmodifiable;
         }
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java

index 79304ec..55d0d72 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java
@@ -19,6 +19,17 @@ public class ViewModelModifiable extends ViewModel
                 }
         }
  
+       public String getDefaultWireName()
+       {
+               Set<String> wireNames = getWiresByName().keySet();
+               for (int i = 0;; i++)
+               {
+                       String nameCandidate = "unnamedWire#" + i;
+                       if (!wireNames.contains(nameCandidate))
+                               return nameCandidate;
+               }
+       }
+
         @Override
         public void componentCreated(GUIComponent component)
         {
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java

index 4baf335..c488de0 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
@@ -31,7 +31,7 @@ public abstract class GUIComponent
          */
         protected final ViewModelModifiable model;
         /**
-        * The name of this component. Is unique in its model.
+        * The name of this component. Is unique for all components in its model.
          */
         public final String name;
         private final Rectangle bounds;
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java

index 7146d63..f59355c 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java
@@ -30,6 +30,10 @@ public class GUIWire
          * The model this wire is a part of.
          */
         private final ViewModelModifiable model;
+       /**
+        * The name of this wire. Is unique for all wires in its model.
+        */
+       public final String name;
         /**
          * The logical width of this wire. Is equal to the logical with of {@link #pin1} and {@link #pin2}.
          */
@@ -72,83 +76,164 @@ public class GUIWire
         // creation and destruction
  
         /**
-        * Creates a new {@link GUIWire} with automatic interpolation.
+        * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2)
         {
-               this(model, pin1, pin2, (Point[]) null);
+               this(model, null, pin1, pin2);
         }
  
         /**
-        * Creates a new {@link GUIWire} with automatic interpolation.
+        * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2)
         {
-               this(model, pin1, pin2, (Point[]) null);
+               this(model, null, pin1, pin2);
         }
  
         /**
-        * Creates a new {@link GUIWire} with automatic interpolation.
+        * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2)
         {
-               this(model, pin1, pin2, (Point[]) null);
+               this(model, null, pin1, pin2);
         }
  
         /**
-        * Creates a new {@link GUIWire} with automatic interpolation.
+        * Creates a new {@link GUIWire} with automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2)
         {
-               this(model, pin1, pin2, (Point[]) null);
+               this(model, null, pin1, pin2);
         }
  
         /**
-        * Creates a new {@link GUIWire} without automatic interpolation.
+        * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
         {
-               this(model, pin1.getPin(), pin2.getPin(), path);
+               this(model, null, pin1, pin2, path);
         }
  
         /**
-        * Creates a new {@link GUIWire} without automatic interpolation.
+        * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path)
         {
-               this(model, pin1.getPin(), pin2, path);
+               this(model, null, pin1, pin2, path);
         }
  
         /**
-        * Creates a new {@link GUIWire} without automatic interpolation.
+        * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path)
         {
-               this(model, pin1, pin2.getPin(), path);
+               this(model, null, pin1, pin2, path);
         }
  
         /**
-        * Creates a new {@link GUIWire} without automatic interpolation.
+        * Creates a new {@link GUIWire} without automatic interpolation and using the default name.
          * 
          * @author Daniel Kirschten
          */
         public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
+       {
+               this(model, null, pin1, pin2, path);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} with automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2)
+       {
+               this(model, name, pin1, pin2, (Point[]) null);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} with automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2)
+       {
+               this(model, name, pin1, pin2, (Point[]) null);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} with automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2)
+       {
+               this(model, name, pin1, pin2, (Point[]) null);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} with automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2)
+       {
+               this(model, name, pin1, pin2, (Point[]) null);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} without automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2, Point... path)
+       {
+               this(model, name, pin1.getPin(), pin2.getPin(), path);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} without automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2, Point... path)
+       {
+               this(model, name, pin1.getPin(), pin2, path);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} without automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2, Point... path)
+       {
+               this(model, name, pin1, pin2.getPin(), path);
+       }
+
+       /**
+        * Creates a new {@link GUIWire} without automatic interpolation.
+        * 
+        * @author Daniel Kirschten
+        */
+       public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2, Point... path)
         {
                 this.model = model;
+               this.name = name == null ? model.getDefaultWireName() : name;
                 this.logicWidth = pin1.logicWidth;
                 if (pin2.logicWidth != pin1.logicWidth)
                         throw new IllegalArgumentException("Can't connect pins of different logic width");
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java

index 16b52ee..f41c407 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
@@ -1,9 +1,9 @@
  package net.mograsim.logic.model.modeladapter;
  
+import java.util.Collection;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.HashSet;
-import java.util.List;
  import java.util.Map;
  import java.util.Map.Entry;
  import java.util.Set;
@@ -43,7 +43,8 @@ public class ViewLogicModelAdapter
  
         private static void convert(ViewModel viewModel, LogicModelParameters params, Timeline timeline, Map<Pin, Wire> externalWires)
         {
-               Map<Pin, Wire> logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWires(), externalWires, params, timeline);
+               Map<Pin, Wire> logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWiresByName().values(), externalWires, params,
+                               timeline);
                 Map<Pin, Wire> logicWiresPerPinUnmodifiable = Collections.unmodifiableMap(logicWiresPerPin);
  
                 for (GUIComponent guiComp : viewModel.getComponentsByName().values())
@@ -70,7 +71,7 @@ public class ViewLogicModelAdapter
                                 .collect(Collectors.toSet());
         }
  
-       private static Map<Pin, Wire> convertWires(Set<Pin> allPins, List<GUIWire> wires, Map<Pin, Wire> externalWires,
+       private static Map<Pin, Wire> convertWires(Set<Pin> allPins, Collection<GUIWire> wires, Map<Pin, Wire> externalWires,
                         LogicModelParameters params, Timeline timeline)
         {
                 Map<Pin, Set<Pin>> connectedPinGroups = getConnectedPinGroups(allPins, wires);
@@ -105,7 +106,7 @@ public class ViewLogicModelAdapter
                 return logicWiresPerPin;
         }
  
-       private static void setGUIWiresLogicModelBinding(List<GUIWire> wires, Map<Pin, Wire> logicWiresPerPin)
+       private static void setGUIWiresLogicModelBinding(Collection<GUIWire> wires, Map<Pin, Wire> logicWiresPerPin)
         {
                 Map<Wire, ReadEnd> guiWireSharedReadEnd = logicWiresPerPin.values().stream().distinct()
                                 .collect(Collectors.toMap(Function.identity(), Wire::createReadOnlyEnd));
@@ -113,7 +114,7 @@ public class ViewLogicModelAdapter
                         guiWire.setLogicModelBinding(guiWireSharedReadEnd.get(logicWiresPerPin.get(guiWire.getPin1())));
         }
  
-       private static Map<Pin, Set<Pin>> getConnectedPinGroups(Set<Pin> allPins, List<GUIWire> wires)
+       private static Map<Pin, Set<Pin>> getConnectedPinGroups(Set<Pin> allPins, Collection<GUIWire> wires)
         {
                 Map<Pin, Set<Pin>> connectedPinsPerPin = new HashMap<>();
  
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java

index 49edfd6..aa7a5fb 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java
@@ -43,15 +43,16 @@ public class SubmodelComponentParams
  
                 public static class InnerComponentParams
                 {
-                       public Point pos;
                         public String id;
                         public String name;
+                       public Point pos;
                         public JsonElement params;
                 }
  
                 public static class InnerWireParams
                 {
                         public InnerPinParams pin1, pin2;
+                       public String name;
                         public Point[] path;
  
                         public static class InnerPinParams
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java

index d98d4c9..dfcb47a 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
@@ -1,8 +1,8 @@
  package net.mograsim.logic.model.serializing;
  
  import java.io.IOException;
+import java.util.Collection;
  import java.util.HashMap;
-import java.util.List;
  import java.util.Map;
  import java.util.function.Function;
  
@@ -194,7 +194,7 @@ public final class SubmodelComponentSerializer
                 for (int i = 0; i < submodelParams.innerWires.length; i++)
                 {
                         InnerWireParams innerWire = submodelParams.innerWires[i];
-                       new GUIWire(submodelModifiable, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName),
+                       new GUIWire(submodelModifiable, innerWire.name, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName),
                                         componentsByName.get(innerWire.pin2.compName).getPin(innerWire.pin2.pinName), innerWire.path);
                 }
                 return comp;
@@ -222,48 +222,49 @@ public final class SubmodelComponentSerializer
  
                 Map<String, GUIComponent> components = new HashMap<>(comp.submodel.getComponentsByName());
                 components.remove(SubmodelComponent.SUBMODEL_INTERFACE_NAME);
-               InnerComponentParams[] comps = new InnerComponentParams[components.size()];
+               InnerComponentParams[] componentParams = new InnerComponentParams[components.size()];
                 int i1 = 0;
-               for (GUIComponent innerComp : components.values())
+               for (GUIComponent innerComponent : components.values())
                 {
-                       InnerComponentParams innerParams = new InnerComponentParams();
-                       comps[i1] = innerParams;
-                       innerParams.pos = new Point(innerComp.getPosX(), innerComp.getPosY());
+                       InnerComponentParams innerComponentParams = new InnerComponentParams();
+                       componentParams[i1] = innerComponentParams;
+                       innerComponentParams.pos = new Point(innerComponent.getPosX(), innerComponent.getPosY());
                         DeserializedSubmodelComponent innerCompCasted;
-                       if (innerComp instanceof DeserializedSubmodelComponent
-                                       && (innerCompCasted = (DeserializedSubmodelComponent) innerComp).idForSerializingOverride != null)
+                       if (innerComponent instanceof DeserializedSubmodelComponent
+                                       && (innerCompCasted = (DeserializedSubmodelComponent) innerComponent).idForSerializingOverride != null)
                         {
-                               innerParams.id = innerCompCasted.idForSerializingOverride;
-                               innerParams.params = innerCompCasted.paramsForSerializingOverride;
+                               innerComponentParams.id = innerCompCasted.idForSerializingOverride;
+                               innerComponentParams.params = innerCompCasted.paramsForSerializingOverride;
                         } else
                         {
-                               innerParams.id = getIdentifier.apply(innerComp);
-                               innerParams.params = innerComp.getParamsForSerializing();
+                               innerComponentParams.id = getIdentifier.apply(innerComponent);
+                               innerComponentParams.params = innerComponent.getParamsForSerializing();
                         }
-                       innerParams.name = innerComp.name;
+                       innerComponentParams.name = innerComponent.name;
                         i1++;
                 }
-               submodelParams.subComps = comps;
+               submodelParams.subComps = componentParams;
  
-               List<GUIWire> wireList = comp.submodel.getWires();
-               InnerWireParams wires[] = new InnerWireParams[wireList.size()];
+               Collection<GUIWire> wires = comp.submodel.getWiresByName().values();
+               InnerWireParams wireParams[] = new InnerWireParams[wires.size()];
                 i1 = 0;
-               for (GUIWire wire : wireList)
+               for (GUIWire innerWire : wires)
                 {
-                       InnerWireParams inner = new InnerWireParams();
-                       wires[i1] = inner;
+                       InnerWireParams innerWireParams = new InnerWireParams();
+                       wireParams[i1] = innerWireParams;
                         InnerPinParams pin1Params = new InnerPinParams(), pin2Params = new InnerPinParams();
  
-                       pin1Params.pinName = wire.getPin1().name;
-                       pin1Params.compName = wire.getPin1().component.name;
-                       pin2Params.pinName = wire.getPin2().name;
-                       pin2Params.compName = wire.getPin2().component.name;
-                       inner.pin1 = pin1Params;
-                       inner.pin2 = pin2Params;
-                       inner.path = wire.getPath();
+                       pin1Params.pinName = innerWire.getPin1().name;
+                       pin1Params.compName = innerWire.getPin1().component.name;
+                       pin2Params.pinName = innerWire.getPin2().name;
+                       pin2Params.compName = innerWire.getPin2().component.name;
+                       innerWireParams.name = innerWire.name;
+                       innerWireParams.pin1 = pin1Params;
+                       innerWireParams.pin2 = pin2Params;
+                       innerWireParams.path = innerWire.getPath();
                         i1++;
                 }
-               submodelParams.innerWires = wires;
+               submodelParams.innerWires = wireParams;
  
                 SubmodelComponentParams params = new SubmodelComponentParams();
                 params.submodel = submodelParams;
@@ -284,7 +285,7 @@ public final class SubmodelComponentSerializer
                 }
                 params.interfacePins = iPins;
  
-               // TODO does this code belong here?
+               // TODO This code does not belong here
                 if (comp instanceof SimpleRectangularSubmodelComponent)
                 {
                         SimpleRectangularSubmodelComponent compCasted = (SimpleRectangularSubmodelComponent) comp;
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java

index f3b9424..1f19edb 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
@@ -17,47 +17,92 @@ public class ModellingTool
  
         public GUIWire connect(GUIComponent a, GUIComponent b, String pinA, String pinB)
         {
-               return connect(a.getPin(pinA), b.getPin(pinB));
+               return connect(null, a, b, pinA, pinB);
         }
  
         public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB)
         {
-               return connect(a.getPin(), b.getPin(pinB));
+               return connect(null, a, b, pinB);
         }
  
         public GUIWire connect(Pin a, GUIComponent b, String pinB)
         {
-               return connect(a, b.getPin(pinB));
+               return connect(null, a, b, pinB);
         }
  
         public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA)
         {
-               return connect(a.getPin(pinA), b.getPin());
+               return connect(null, a, b, pinA);
         }
  
         public GUIWire connect(WireCrossPoint a, WireCrossPoint b)
         {
-               return connect(a.getPin(), b.getPin());
+               return connect(null, a, b);
         }
  
         public GUIWire connect(Pin a, WireCrossPoint b)
         {
-               return connect(a, b.getPin());
+               return connect(null, a, b);
         }
  
         public GUIWire connect(GUIComponent a, Pin b, String pinA)
         {
-               return connect(a.getPin(pinA), b);
+               return connect(null, a, b, pinA);
         }
  
         public GUIWire connect(WireCrossPoint a, Pin b)
         {
-               return connect(a.getPin(), b);
+               return connect(null, a, b);
         }
  
         public GUIWire connect(Pin a, Pin b)
         {
-               return new GUIWire(model, a, b);
+               return connect(null, a, b);
+       }
+
+       public GUIWire connect(String name, GUIComponent a, GUIComponent b, String pinA, String pinB)
+       {
+               return connect(name, a.getPin(pinA), b.getPin(pinB));
+       }
+
+       public GUIWire connect(String name, WireCrossPoint a, GUIComponent b, String pinB)
+       {
+               return connect(name, a.getPin(), b.getPin(pinB));
+       }
+
+       public GUIWire connect(String name, Pin a, GUIComponent b, String pinB)
+       {
+               return connect(name, a, b.getPin(pinB));
+       }
+
+       public GUIWire connect(String name, GUIComponent a, WireCrossPoint b, String pinA)
+       {
+               return connect(name, a.getPin(pinA), b.getPin());
+       }
+
+       public GUIWire connect(String name, WireCrossPoint a, WireCrossPoint b)
+       {
+               return connect(name, a.getPin(), b.getPin());
+       }
+
+       public GUIWire connect(String name, Pin a, WireCrossPoint b)
+       {
+               return connect(name, a, b.getPin());
+       }
+
+       public GUIWire connect(String name, GUIComponent a, Pin b, String pinA)
+       {
+               return connect(name, a.getPin(pinA), b);
+       }
+
+       public GUIWire connect(String name, WireCrossPoint a, Pin b)
+       {
+               return connect(name, a.getPin(), b);
+       }
+
+       public GUIWire connect(String name, Pin a, Pin b)
+       {
+               return new GUIWire(model, name, a, b);
         }
  
         public static ModellingTool createFor(ViewModelModifiable model)
author	Daniel Kirschten <daniel.kirschten@gmx.de>
	Mon, 15 Jul 2019 16:35:42 +0000 (18:35 +0200)
committer	Daniel Kirschten <daniel.kirschten@gmx.de>
	Mon, 15 Jul 2019 16:39:33 +0000 (18:39 +0200)
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIand.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIand41.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIandor414.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIdemux2.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIdff.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIdlatch.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIdlatch4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIfulladder.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIhalfadder.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUImux1.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUImux1_4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUInand3.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUInot4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIor4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIor_4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIram2.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIram4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIsel2_4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIsel3_4.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/GUIxor.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json		patch \| blob \| history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json		patch \| blob \| history
net.mograsim.logic.model.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java		patch \| blob \| history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentParams.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java		patch \| blob \| history
net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java		patch \| blob \| history