X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2FAm2904Testbench.json;h=c7bec19fa978c7fa39281618f97ac872a4f98ed8;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=2146f401eb334bb8498195e8db22b8d3db5c65f3;hpb=71d300be42fd0315fa6d0d27023ef8f2c7092e36;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/Am2904Testbench.json b/net.mograsim.logic.model.am2900/Am2904Testbench.json
index 2146f401..c7bec19f 100644
--- a/net.mograsim.logic.model.am2900/Am2904Testbench.json
+++ b/net.mograsim.logic.model.am2900/Am2904Testbench.json
@@ -7,7 +7,7 @@
     "components": [
       {
         "id": "Am2904",
-        "name": "Am2904",
+        "name": "Am2904#0",
         "pos": {
           "x": 220.0,
           "y": 175.0
@@ -455,108 +455,15 @@
         "params": 1
       },
       {
-        "id": "Merger",
+        "id": "Splitter",
         "name": "Merger#0",
         "pos": {
           "x": 85.0,
           "y": 130.0
         },
-        "params": 13
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#0",
-        "pos": {
-          "x": 175.0,
-          "y": 315.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#1",
-        "pos": {
-          "x": 175.0,
-          "y": 330.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#2",
-        "pos": {
-          "x": 175.0,
-          "y": 385.0
-        },
         "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#3",
-        "pos": {
-          "x": 175.0,
-          "y": 370.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#4",
-        "pos": {
-          "x": 335.0,
-          "y": 105.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#5",
-        "pos": {
-          "x": 335.0,
-          "y": 90.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#6",
-        "pos": {
-          "x": 335.0,
-          "y": 120.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "TriStateBuffer",
-        "name": "TriStateBuffer#7",
-        "pos": {
-          "x": 335.0,
-          "y": 135.0
-        },
-        "params": {
-          "logicWidth": 1,
-          "orientation": "RIGHT"
+          "logicWidth": 13,
+          "orientation": "LEFT"
         }
       },
       {
@@ -1000,12 +907,108 @@
         },
         "params": "_EOVR"
       },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#0",
+        "pos": {
+          "x": 175.0,
+          "y": 315.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#1",
+        "pos": {
+          "x": 175.0,
+          "y": 330.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#2",
+        "pos": {
+          "x": 175.0,
+          "y": 385.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#3",
+        "pos": {
+          "x": 175.0,
+          "y": 370.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#4",
+        "pos": {
+          "x": 335.0,
+          "y": 105.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#5",
+        "pos": {
+          "x": 335.0,
+          "y": 90.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#6",
+        "pos": {
+          "x": 335.0,
+          "y": 120.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#7",
+        "pos": {
+          "x": 335.0,
+          "y": 135.0
+        },
+        "params": {
+          "logicWidth": 1,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 185.0,
-          "y": 365.0
+          "x": 184.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1013,8 +1016,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 185.0,
-          "y": 310.0
+          "x": 184.0,
+          "y": 309.0
         },
         "params": 1
       },
@@ -1022,8 +1025,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 370.0,
-          "y": 175.0
+          "x": 369.0,
+          "y": 174.0
         },
         "params": 1
       },
@@ -1031,8 +1034,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 375.0,
-          "y": 190.0
+          "x": 374.0,
+          "y": 189.0
         },
         "params": 1
       },
@@ -1040,8 +1043,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 380.0,
-          "y": 200.0
+          "x": 379.0,
+          "y": 199.0
         },
         "params": 1
       },
@@ -1049,8 +1052,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 210.0,
-          "y": 325.0
+          "x": 209.0,
+          "y": 324.0
         },
         "params": 1
       },
@@ -1058,8 +1061,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 215.0,
-          "y": 340.0
+          "x": 214.0,
+          "y": 339.0
         },
         "params": 1
       },
@@ -1067,8 +1070,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 355.0,
-          "y": 380.0
+          "x": 354.0,
+          "y": 379.0
         },
         "params": 1
       },
@@ -1076,8 +1079,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 360.0,
-          "y": 390.0
+          "x": 359.0,
+          "y": 389.0
         },
         "params": 1
       },
@@ -1085,8 +1088,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 345.0,
-          "y": 85.0
+          "x": 344.0,
+          "y": 84.0
         },
         "params": 1
       },
@@ -1094,8 +1097,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 360.0,
-          "y": 110.0
+          "x": 359.0,
+          "y": 109.0
         },
         "params": 1
       },
@@ -1103,8 +1106,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 360.0,
-          "y": 125.0
+          "x": 359.0,
+          "y": 124.0
         },
         "params": 1
       },
@@ -1112,8 +1115,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 365.0,
-          "y": 160.0
+          "x": 364.0,
+          "y": 159.0
         },
         "params": 1
       }
@@ -1125,7 +1128,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_OEY"
         },
         "name": "unnamedWire#0",
@@ -1142,7 +1145,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "C"
         },
         "name": "unnamedWire#1",
@@ -1159,7 +1162,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_EOVR"
         },
         "pin2": {
@@ -1184,7 +1187,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_EN"
         },
         "name": "unnamedWire#11",
@@ -1202,10 +1205,10 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "O"
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "I"
         },
         "name": "unnamedWire#12",
@@ -1234,7 +1237,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "Cx"
         },
         "name": "unnamedWire#13",
@@ -1251,7 +1254,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "YOVR"
         },
         "pin2": {
@@ -1267,7 +1270,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "YN"
         },
         "name": "unnamedWire#15",
@@ -1292,7 +1295,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "YZ"
         },
         "pin2": {
@@ -1309,7 +1312,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "CT"
         },
         "pin2": {
@@ -1330,7 +1333,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "C0"
         },
         "pin2": {
@@ -1346,7 +1349,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "IZ"
         },
         "name": "unnamedWire#2",
@@ -1363,7 +1366,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "SIOn"
         },
         "pin2": {
@@ -1396,7 +1399,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "QIOn"
         },
         "name": "unnamedWire#22",
@@ -1493,7 +1496,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "IC"
         },
         "pin2": {
@@ -1709,7 +1712,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "IN"
         },
         "name": "unnamedWire#4",
@@ -1730,7 +1733,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "SIO0"
         },
         "name": "unnamedWire#40",
@@ -1743,7 +1746,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "QIO0"
         },
         "pin2": {
@@ -1765,7 +1768,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I12"
+          "pinName": "O12"
         },
         "name": "unnamedWire#42",
         "path": []
@@ -1773,7 +1776,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I11"
+          "pinName": "O11"
         },
         "pin2": {
           "compName": "ManualSwitch#13",
@@ -1789,7 +1792,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I10"
+          "pinName": "O10"
         },
         "name": "unnamedWire#44",
         "path": []
@@ -1797,7 +1800,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I9"
+          "pinName": "O9"
         },
         "pin2": {
           "compName": "ManualSwitch#22",
@@ -1813,7 +1816,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I8"
+          "pinName": "O8"
         },
         "name": "unnamedWire#46",
         "path": []
@@ -1821,7 +1824,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I7"
+          "pinName": "O7"
         },
         "pin2": {
           "compName": "ManualSwitch#23",
@@ -1837,7 +1840,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I6"
+          "pinName": "O6"
         },
         "name": "unnamedWire#48",
         "path": []
@@ -1845,7 +1848,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I5"
+          "pinName": "O5"
         },
         "pin2": {
           "compName": "ManualSwitch#26",
@@ -1856,7 +1859,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "IOVR"
         },
         "pin2": {
@@ -1882,7 +1885,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I4"
+          "pinName": "O4"
         },
         "name": "unnamedWire#50",
         "path": []
@@ -1890,7 +1893,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I3"
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "ManualSwitch#30",
@@ -1906,7 +1909,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I2"
+          "pinName": "O2"
         },
         "name": "unnamedWire#52",
         "path": []
@@ -1914,7 +1917,7 @@
       {
         "pin1": {
           "compName": "Merger#0",
-          "pinName": "I1"
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "ManualSwitch#27",
@@ -1930,7 +1933,7 @@
         },
         "pin2": {
           "compName": "Merger#0",
-          "pinName": "I0"
+          "pinName": "O0"
         },
         "name": "unnamedWire#54",
         "path": []
@@ -2001,7 +2004,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_CEM"
         },
         "name": "unnamedWire#6",
@@ -2129,7 +2132,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "YC"
         },
         "pin2": {
@@ -2163,7 +2166,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_CEmu"
         },
         "pin2": {
@@ -2247,7 +2250,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_SE"
         },
         "pin2": {
@@ -2272,7 +2275,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_OECT"
         },
         "name": "unnamedWire#75",
@@ -2297,7 +2300,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_EZ"
         },
         "pin2": {
@@ -2309,7 +2312,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2904",
+          "compName": "Am2904#0",
           "pinName": "_EC"
         },
         "pin2": {