Started cleaning up some components

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

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
index 6cd9dcf..003a88f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
@@ -23,28 +23,10 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
-      },
-      "name": "I3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 15.0
+        "y": 10.0
       },
-      "name": "I4",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 5.0
-      },
-      "name": "I5",
-      "logicWidth": 1,
+      "name": "I",
+      "logicWidth": 3,
       "usage": "INPUT"
     },
     {
@@ -91,7 +73,7 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 15.0,
+          "x": 30.0,
           "y": 10.0
         },
         "params": 1
@@ -100,8 +82,8 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 15.0,
-          "y": 50.0
+          "x": 30.0,
+          "y": 65.0
         },
         "params": 1
       },
@@ -109,8 +91,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 55.0,
-          "y": 45.0
+          "x": 70.0,
+          "y": 60.0
         },
         "params": 1
       },
@@ -118,8 +100,8 @@
         "id": "NandGate",
         "name": "NandGate#3",
         "pos": {
-          "x": 55.0,
-          "y": 70.0
+          "x": 70.0,
+          "y": 115.0
         },
         "params": 1
       },
@@ -127,17 +109,29 @@
         "id": "NandGate",
         "name": "NandGate#4",
         "pos": {
-          "x": 100.0,
+          "x": 115.0,
           "y": 50.0
         },
         "params": 1
       },
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": 5.0,
+          "y": 30.0
+        },
+        "params": {
+          "logicWidth": 3,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 4.0,
-          "y": 19.0
+          "x": 24.0,
+          "y": 39.0
         },
         "params": 1
       },
@@ -145,7 +139,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 4.0,
+          "x": 19.0,
           "y": 24.0
         },
         "params": 1
@@ -154,7 +148,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 4.0,
+          "x": 19.0,
           "y": 44.0
         },
         "params": 1
@@ -163,8 +157,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 9.0,
-          "y": 59.0
+          "x": 24.0,
+          "y": 69.0
         },
         "params": 1
       },
@@ -172,8 +166,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 9.0,
-          "y": 54.0
+          "x": 24.0,
+          "y": 79.0
         },
         "params": 1
       },
@@ -181,8 +175,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 9.0,
-          "y": 64.0
+          "x": 24.0,
+          "y": 99.0
         },
         "params": 1
       },
@@ -190,8 +184,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 9.0,
-          "y": 84.0
+          "x": 64.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -199,8 +193,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 49.0,
-          "y": 99.0
+          "x": 64.0,
+          "y": 49.0
         },
         "params": 1
       },
@@ -208,8 +202,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 49.0,
-          "y": 74.0
+          "x": 54.0,
+          "y": 19.0
         },
         "params": 1
       },
@@ -217,8 +211,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 39.0,
-          "y": 19.0
+          "x": 54.0,
+          "y": 29.0
         },
         "params": 1
       },
@@ -226,8 +220,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 39.0,
-          "y": 34.0
+          "x": 19.0,
+          "y": 29.0
         },
         "params": 1
       },
@@ -235,7 +229,7 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 100.0,
+          "x": 110.0,
           "y": 135.0
         }
       },
@@ -243,8 +237,8 @@
         "id": "nand3",
         "name": "nand3#0",
         "pos": {
-          "x": 55.0,
-          "y": 10.0
+          "x": 70.0,
+          "y": 25.0
         }
       }
     ],
@@ -252,18 +246,18 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "I5"
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "name": "unnamedWire#0",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
@@ -273,18 +267,18 @@
         "name": "unnamedWire#1",
         "path": [
           {
-            "x": 5.0,
+            "x": 20.0,
             "y": 15.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "name": "unnamedWire#2",
@@ -292,12 +286,12 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "name": "unnamedWire#3",
         "path": []
@@ -308,8 +302,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "NandGate#0",
+          "pinName": "B"
         },
         "name": "unnamedWire#4",
         "path": []
@@ -326,12 +320,12 @@
         "name": "unnamedWire#5",
         "path": [
           {
-            "x": 45.0,
+            "x": 60.0,
             "y": 45.0
           },
           {
-            "x": 45.0,
-            "y": 50.0
+            "x": 60.0,
+            "y": 65.0
           }
         ]
       },
@@ -347,18 +341,18 @@
         "name": "unnamedWire#6",
         "path": [
           {
-            "x": 5.0,
+            "x": 20.0,
             "y": 180.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#7",
@@ -366,44 +360,31 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "nand3#0",
+          "pinName": "A"
         },
         "name": "unnamedWire#8",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
           "compName": "nand3#0",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 15.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
@@ -419,7 +400,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#11",
@@ -427,7 +408,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
@@ -439,11 +420,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#13",
@@ -451,7 +432,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
@@ -459,11 +440,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#14",
-        "path": []
+        "path": [
+          {
+            "x": 25.0,
+            "y": 130.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
@@ -471,41 +457,23 @@
           "pinName": "SN"
         },
         "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 105.0
-          },
-          {
-            "x": 135.0,
-            "y": 105.0
-          },
-          {
-            "x": 135.0,
-            "y": 100.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "nand3#0",
+          "pinName": "C"
+        },
         "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 100.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
@@ -515,18 +483,18 @@
         "name": "unnamedWire#17",
         "path": [
           {
-            "x": 50.0,
+            "x": 65.0,
             "y": 220.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#18",
@@ -534,31 +502,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "nand3#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#19",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 25.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#19",
         "path": []
       },
       {
@@ -567,74 +518,62 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#20",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "CinE"
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#21",
         "path": [
           {
-            "x": 40.0,
+            "x": 55.0,
             "y": 5.0
           },
           {
-            "x": 115.0,
+            "x": 130.0,
             "y": 5.0
           },
           {
-            "x": 115.0,
+            "x": 130.0,
             "y": 20.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#23",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "pin2": {
-          "compName": "nand3#0",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#22",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#23",
         "path": [
           {
-            "x": 40.0,
+            "x": 55.0,
             "y": 150.0
           }
         ]
@@ -648,7 +587,7 @@
           "compName": "NandGate#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#24",
         "path": []
       },
       {
@@ -660,7 +599,17 @@
           "compName": "NandGate#4",
           "pinName": "A"
         },
-        "name": "unnamedWire#27"
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 110.0,
+            "y": 30.0
+          },
+          {
+            "x": 110.0,
+            "y": 55.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -671,7 +620,17 @@
           "compName": "NandGate#4",
           "pinName": "B"
         },
-        "name": "unnamedWire#28"
+        "name": "unnamedWire#26",
+        "path": [
+          {
+            "x": 110.0,
+            "y": 70.0
+          },
+          {
+            "x": 110.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -682,7 +641,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#29"
+        "name": "unnamedWire#27"
       },
       {
         "pin1": {
@@ -693,7 +652,7 @@
           "compName": "_submodelinterface",
           "pinName": "L"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#28",
         "path": []
       },
       {
@@ -705,8 +664,44 @@
           "compName": "_submodelinterface",
           "pinName": "SBE"
         },
+        "name": "unnamedWire#29",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "name": "unnamedWire#30",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
         "name": "unnamedWire#31",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#32",
+        "path": []
       }
     ],
     "version": "0.1.1"