X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=dbca8f24884bd37e195e5f47b385c091f979a952;hb=ad841126238b8b7653a311a9c89d3dada18ce3c5;hp=7afc8a7aec221248c387c4d57a8ec927f8e287eb;hpb=da41b8caf9b5b0016ecc029a5988d0b81766ef2c;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index 7afc8a7a..dbca8f24 100644
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -157,94 +157,118 @@
         }
       },
       {
-        "id": "Merger",
-        "name": "Merger#0",
+        "id": "NandGate",
+        "name": "NandGate#0",
         "pos": {
-          "x": 235.0,
-          "y": 56.0
+          "x": 255.0,
+          "y": 495.0
         },
-        "params": 8
+        "params": 1
       },
       {
-        "id": "Merger",
-        "name": "Merger#1",
+        "id": "NandGate",
+        "name": "NandGate#1",
         "pos": {
-          "x": 235.0,
-          "y": 136.0
+          "x": 270.0,
+          "y": 550.0
         },
-        "params": 4
+        "params": 1
       },
       {
-        "id": "Merger",
-        "name": "Merger#2",
+        "id": "Splitter",
+        "name": "Splitter#0",
         "pos": {
-          "x": 235.0,
-          "y": 176.0
+          "x": 215.0,
+          "y": 56.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 16,
+          "orientation": "RIGHT"
+        }
       },
       {
-        "id": "Merger",
-        "name": "Merger#3",
+        "id": "Splitter",
+        "name": "Splitter#1",
         "pos": {
-          "x": 360.0,
-          "y": 20.0
+          "x": 305.0,
+          "y": 30.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
-        "id": "Merger",
-        "name": "Merger#4",
+        "id": "Splitter",
+        "name": "Splitter#10",
         "pos": {
-          "x": 360.0,
-          "y": 125.0
+          "x": 600.0,
+          "y": 395.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
-        "id": "NandGate",
-        "name": "NandGate#0",
+        "id": "Splitter",
+        "name": "Splitter#11",
         "pos": {
-          "x": 255.0,
-          "y": 495.0
+          "x": 235.0,
+          "y": 56.0
         },
-        "params": 1
+        "params": {
+          "logicWidth": 8,
+          "orientation": "LEFT"
+        }
       },
       {
-        "id": "NandGate",
-        "name": "NandGate#1",
+        "id": "Splitter",
+        "name": "Splitter#12",
         "pos": {
-          "x": 270.0,
-          "y": 550.0
+          "x": 235.0,
+          "y": 136.0
         },
-        "params": 1
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#0",
+        "name": "Splitter#13",
         "pos": {
-          "x": 215.0,
-          "y": 56.0
+          "x": 235.0,
+          "y": 176.0
         },
-        "params": 16
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#1",
+        "name": "Splitter#14",
         "pos": {
-          "x": 305.0,
-          "y": 30.0
+          "x": 360.0,
+          "y": 20.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#15",
         "pos": {
-          "x": 600.0,
-          "y": 395.0
+          "x": 360.0,
+          "y": 125.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "Splitter",
@@ -253,7 +277,10 @@
           "x": 305.0,
           "y": 135.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -262,7 +289,10 @@
           "x": 405.0,
           "y": 395.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -271,7 +301,10 @@
           "x": 405.0,
           "y": 435.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -280,7 +313,10 @@
           "x": 470.0,
           "y": 395.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -289,7 +325,10 @@
           "x": 470.0,
           "y": 435.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -298,7 +337,10 @@
           "x": 535.0,
           "y": 435.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -307,7 +349,10 @@
           "x": 535.0,
           "y": 395.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -316,7 +361,10 @@
           "x": 600.0,
           "y": 435.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "WireCrossPoint",
@@ -377,9 +425,9 @@
         "name": "WireCrossPoint#14",
         "pos": {
           "x": 354.0,
-          "y": 504.0
+          "y": 509.0
         },
-        "params": 12
+        "params": 16
       },
       {
         "id": "WireCrossPoint",
@@ -477,14 +525,6 @@
           "y": 526.0
         }
       },
-      {
-        "id": "dff12_we",
-        "name": "dff12_we#0",
-        "pos": {
-          "x": 290.0,
-          "y": 485.0
-        }
-      },
       {
         "id": "dff16_invwe",
         "name": "dff16_invwe#0",
@@ -494,16 +534,25 @@
         }
       },
       {
-        "id": "inc12",
-        "name": "inc12#0",
+        "id": "dff16_we",
+        "name": "dff16_we#0",
+        "pos": {
+          "x": 290.0,
+          "y": 485.0
+        }
+      },
+      {
+        "id": "inc",
+        "name": "inc#0",
         "pos": {
           "x": 245.0,
           "y": 525.0
-        }
+        },
+        "params": 16
       },
       {
-        "id": "mux1_12",
-        "name": "mux1_12#0",
+        "id": "mux1_16",
+        "name": "mux1_16#0",
         "pos": {
           "x": 170.0,
           "y": 495.0
@@ -733,8 +782,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#3",
-          "pinName": "O"
+          "compName": "Splitter#14",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#10",
@@ -749,8 +798,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#4",
-          "pinName": "O"
+          "compName": "Splitter#15",
+          "pinName": "I"
         },
         "name": "unnamedWire#114",
         "path": []
@@ -917,7 +966,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff12_we#0",
+          "compName": "dff16_we#0",
           "pinName": "WE"
         },
         "name": "unnamedWire#127",
@@ -925,11 +974,11 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff12_we#0",
+          "compName": "dff16_we#0",
           "pinName": "D"
         },
         "name": "unnamedWire#128",
@@ -937,11 +986,11 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "A"
         },
         "pin2": {
-          "compName": "mux1_12#0",
+          "compName": "mux1_16#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#129",
@@ -961,7 +1010,7 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -1009,7 +1058,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_12#0",
+          "compName": "mux1_16#0",
           "pinName": "I1"
         },
         "pin2": {
@@ -1021,7 +1070,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_12#0",
+          "compName": "mux1_16#0",
           "pinName": "S"
         },
         "pin2": {
@@ -1045,26 +1094,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "name": "unnamedWire#137",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dff12_we#0",
+          "compName": "dff16_we#0",
           "pinName": "Q"
         },
         "pin2": {
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#137",
         "path": []
       },
       {
@@ -1493,16 +1530,16 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I7"
+          "compName": "Splitter#11",
+          "pinName": "O7"
         },
         "name": "unnamedWire#46",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I6"
+          "compName": "Splitter#11",
+          "pinName": "O6"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1517,16 +1554,16 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I5"
+          "compName": "Splitter#11",
+          "pinName": "O5"
         },
         "name": "unnamedWire#48",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I4"
+          "compName": "Splitter#11",
+          "pinName": "O4"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1553,8 +1590,8 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I3"
+          "compName": "Splitter#11",
+          "pinName": "O3"
         },
         "name": "unnamedWire#50",
         "path": []
@@ -1565,16 +1602,16 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I2"
+          "compName": "Splitter#11",
+          "pinName": "O2"
         },
         "name": "unnamedWire#51",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I1"
+          "compName": "Splitter#11",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1589,8 +1626,8 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I0"
+          "compName": "Splitter#11",
+          "pinName": "O0"
         },
         "name": "unnamedWire#53",
         "path": []
@@ -1618,8 +1655,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#1",
-          "pinName": "I3"
+          "compName": "Splitter#12",
+          "pinName": "O3"
         },
         "name": "unnamedWire#55",
         "path": [
@@ -1635,16 +1672,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#2",
-          "pinName": "I3"
+          "compName": "Splitter#13",
+          "pinName": "O3"
         },
         "name": "unnamedWire#56",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#2",
-          "pinName": "I2"
+          "compName": "Splitter#13",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1659,16 +1696,16 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Merger#2",
-          "pinName": "I1"
+          "compName": "Splitter#13",
+          "pinName": "O1"
         },
         "name": "unnamedWire#58",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#2",
-          "pinName": "I0"
+          "compName": "Splitter#13",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1691,8 +1728,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#1",
-          "pinName": "I0"
+          "compName": "Splitter#12",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1707,16 +1744,16 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Merger#1",
-          "pinName": "I1"
+          "compName": "Splitter#12",
+          "pinName": "O1"
         },
         "name": "unnamedWire#61",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#1",
-          "pinName": "I2"
+          "compName": "Splitter#12",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -1835,8 +1872,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#2",
-          "pinName": "O"
+          "compName": "Splitter#13",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "Splitter#2",
@@ -1847,8 +1884,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#1",
-          "pinName": "O"
+          "compName": "Splitter#12",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "Splitter#1",
@@ -1863,16 +1900,16 @@
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Merger#3",
-          "pinName": "I3"
+          "compName": "Splitter#14",
+          "pinName": "O3"
         },
         "name": "unnamedWire#73",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#3",
-          "pinName": "I2"
+          "compName": "Splitter#14",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "mux1_4#0",
@@ -1887,16 +1924,16 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Merger#3",
-          "pinName": "I1"
+          "compName": "Splitter#14",
+          "pinName": "O1"
         },
         "name": "unnamedWire#75",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#3",
-          "pinName": "I0"
+          "compName": "Splitter#14",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "mux1_4#0",
@@ -1911,16 +1948,16 @@
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Merger#4",
-          "pinName": "I3"
+          "compName": "Splitter#15",
+          "pinName": "O3"
         },
         "name": "unnamedWire#77",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#4",
-          "pinName": "I2"
+          "compName": "Splitter#15",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "mux1_4#1",
@@ -1935,8 +1972,8 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Merger#4",
-          "pinName": "I1"
+          "compName": "Splitter#15",
+          "pinName": "O1"
         },
         "name": "unnamedWire#79",
         "path": []
@@ -1955,8 +1992,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#4",
-          "pinName": "I0"
+          "compName": "Splitter#15",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "mux1_4#1",