projects / Mograsim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Shortened the memory test a bit because it was longer than necessary
[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2901 / Am2901.json
diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index bd5a844..270afa2 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -2,40 +2,13 @@
   "width": 90.0,
   "height": 125.0,
   "interfacePins": [
-    {
-      "location": {
-        "x": 90.0,
-        "y": 10.0
-      },
-      "name": "A0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
     {
       "location": {
         "x": 90.0,
         "y": 15.0
       },
-      "name": "A1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 90.0,
-        "y": 20.0
-      },
-      "name": "A2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 90.0,
-        "y": 25.0
-      },
-      "name": "A3",
-      "logicWidth": 1,
+      "name": "A",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
@@ -43,35 +16,8 @@
         "x": 90.0,
         "y": 35.0
       },
-      "name": "B0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 90.0,
-        "y": 40.0
-      },
-      "name": "B1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 90.0,
-        "y": 45.0
-      },
-      "name": "B2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 90.0,
-        "y": 50.0
-      },
-      "name": "B3",
-      "logicWidth": 1,
+      "name": "B",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
@@ -255,14 +201,38 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#3",
         "pos": {
-          "x": 485.0,
-          "y": 620.0
+          "x": 670.0,
+          "y": 135.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#4",
+        "pos": {
+          "x": 670.0,
+          "y": 335.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#5",
+        "pos": {
+          "x": 475.0,
+          "y": 615.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "DOWN"
         }
       },
       {
@@ -270,7 +240,7 @@
         "name": "TriStateBuffer#0",
         "pos": {
           "x": 355.0,
-          "y": 900.0
+          "y": 920.0
         },
         "params": {
           "logicWidth": 1,
@@ -294,7 +264,7 @@
         "name": "TriStateBuffer#2",
         "pos": {
           "x": 400.0,
-          "y": 930.0
+          "y": 950.0
         },
         "params": {
           "logicWidth": 1,
@@ -335,8 +305,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 229.0,
-          "y": 909.0
+          "x": 239.0,
+          "y": 929.0
         },
         "params": 1
       },
@@ -344,8 +314,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 234.0,
-          "y": 919.0
+          "x": 244.0,
+          "y": 939.0
         },
         "params": 1
       },
@@ -353,8 +323,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 239.0,
-          "y": 929.0
+          "x": 249.0,
+          "y": 949.0
         },
         "params": 1
       },
@@ -362,8 +332,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 244.0,
-          "y": 939.0
+          "x": 254.0,
+          "y": 959.0
         },
         "params": 1
       },
@@ -372,7 +342,7 @@
         "name": "WireCrossPoint#14",
         "pos": {
           "x": 319.0,
-          "y": 909.0
+          "y": 929.0
         },
         "params": 1
       },
@@ -381,7 +351,7 @@
         "name": "WireCrossPoint#15",
         "pos": {
           "x": 334.0,
-          "y": 939.0
+          "y": 959.0
         },
         "params": 1
       },
@@ -748,8 +718,8 @@
         "id": "dff4",
         "name": "dff4#0",
         "pos": {
-          "x": 190.0,
-          "y": 905.0
+          "x": 200.0,
+          "y": 925.0
         }
       },
       {
@@ -1671,12 +1641,12 @@
             "y": 245.0
           },
           {
-            "x": 185.0,
+            "x": 190.0,
             "y": 245.0
           },
           {
-            "x": 185.0,
-            "y": 920.0
+            "x": 190.0,
+            "y": 980.0
           }
         ]
       },
@@ -1703,22 +1673,18 @@
       },
       {
         "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D4"
+          "compName": "Splitter#5",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D1"
         },
         "name": "unnamedWire#149",
         "path": [
           {
-            "x": 500.0,
-            "y": 645.0
-          },
-          {
-            "x": 500.0,
-            "y": 650.0
+            "x": 505.0,
+            "y": 630.0
           }
         ]
       },
@@ -1751,18 +1717,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#150",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -1937,7 +1891,7 @@
           },
           {
             "x": 380.0,
-            "y": 910.0
+            "y": 930.0
           }
         ]
       },
@@ -2151,12 +2105,12 @@
             "y": 900.0
           },
           {
-            "x": 180.0,
+            "x": 195.0,
             "y": 900.0
           },
           {
-            "x": 180.0,
-            "y": 910.0
+            "x": 195.0,
+            "y": 970.0
           }
         ]
       },
@@ -2223,7 +2177,7 @@
         "path": [
           {
             "x": 425.0,
-            "y": 940.0
+            "y": 960.0
           }
         ]
       },
@@ -2246,70 +2200,36 @@
       },
       {
         "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D2"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
+          "compName": "ram4#0",
+          "pinName": "B0"
         },
-        "name": "unnamedWire#175",
+        "name": "unnamedWire#178",
         "path": [
           {
-            "x": 500.0,
-            "y": 635.0
+            "x": 635.0,
+            "y": 365.0
           },
           {
-            "x": 500.0,
-            "y": 630.0
+            "x": 635.0,
+            "y": 215.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#176",
-        "path": [
-          {
-            "x": 505.0,
-            "y": 620.0
-          },
-          {
-            "x": 505.0,
-            "y": 630.0
-          }
-        ]
-      },
-      {
-        "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "I"
+          "pinName": "B"
         },
-        "name": "unnamedWire#177",
-        "path": [
-          {
-            "x": 600.0,
-            "y": 480.0
-          },
-          {
-            "x": 480.0,
-            "y": 480.0
-          },
-          {
-            "x": 480.0,
-            "y": 635.0
-          }
-        ]
+        "name": "unnamedWire#179",
+        "path": []
       },
       {
         "pin1": {
@@ -2500,72 +2420,55 @@
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
+          "compName": "Splitter#3",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A0"
+          "compName": "_submodelinterface",
+          "pinName": "A"
         },
         "name": "unnamedWire#27",
-        "path": [
-          {
-            "x": 650.0,
-            "y": 100.0
-          },
-          {
-            "x": 650.0,
-            "y": 175.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "ram4#0",
+          "pinName": "B3"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A1"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
         "name": "unnamedWire#28",
         "path": [
           {
-            "x": 645.0,
-            "y": 150.0
+            "x": 650.0,
+            "y": 245.0
           },
           {
-            "x": 645.0,
-            "y": 185.0
+            "x": 650.0,
+            "y": 335.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
+          "compName": "ram4#0",
+          "pinName": "B2"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A2"
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
         "name": "unnamedWire#29",
         "path": [
           {
-            "x": 860.0,
-            "y": 200.0
-          },
-          {
-            "x": 860.0,
-            "y": 160.0
-          },
-          {
-            "x": 640.0,
-            "y": 160.0
+            "x": 645.0,
+            "y": 235.0
           },
           {
-            "x": 640.0,
-            "y": 195.0
+            "x": 645.0,
+            "y": 345.0
           }
         ]
       },
@@ -2596,114 +2499,94 @@
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "ram4#0",
-          "pinName": "A3"
+          "pinName": "B1"
         },
         "name": "unnamedWire#30",
         "path": [
           {
-            "x": 855.0,
-            "y": 250.0
-          },
-          {
-            "x": 855.0,
-            "y": 165.0
-          },
-          {
-            "x": 635.0,
-            "y": 165.0
+            "x": 640.0,
+            "y": 355.0
           },
           {
-            "x": 635.0,
-            "y": 205.0
+            "x": 640.0,
+            "y": 225.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "Splitter#5",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B0"
+          "compName": "_submodelinterface",
+          "pinName": "D"
         },
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 635.0,
-            "y": 350.0
+            "x": 490.0,
+            "y": 480.0
           },
           {
-            "x": 635.0,
-            "y": 215.0
+            "x": 600.0,
+            "y": 480.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D4"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B1"
+          "compName": "Splitter#5",
+          "pinName": "O3"
         },
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 640.0,
-            "y": 400.0
-          },
-          {
-            "x": 640.0,
-            "y": 225.0
+            "x": 475.0,
+            "y": 645.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
+          "compName": "Splitter#5",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B2"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D3"
         },
         "name": "unnamedWire#33",
         "path": [
           {
-            "x": 645.0,
-            "y": 450.0
-          },
-          {
-            "x": 645.0,
-            "y": 235.0
+            "x": 485.0,
+            "y": 640.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "D2"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B3"
+          "compName": "Splitter#5",
+          "pinName": "O1"
         },
         "name": "unnamedWire#34",
         "path": [
           {
-            "x": 650.0,
-            "y": 500.0
-          },
-          {
-            "x": 650.0,
-            "y": 245.0
+            "x": 495.0,
+            "y": 635.0
           }
         ]
       },
@@ -2921,6 +2804,90 @@
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "ram4#0",
+          "pinName": "A0"
+        },
+        "pin2": {
+          "compName": "Splitter#3",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#44",
+        "path": [
+          {
+            "x": 650.0,
+            "y": 175.0
+          },
+          {
+            "x": 650.0,
+            "y": 165.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "ram4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#45",
+        "path": [
+          {
+            "x": 645.0,
+            "y": 155.0
+          },
+          {
+            "x": 645.0,
+            "y": 185.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "ram4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#46",
+        "path": [
+          {
+            "x": 640.0,
+            "y": 145.0
+          },
+          {
+            "x": 640.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "ram4#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#47",
+        "path": [
+          {
+            "x": 635.0,
+            "y": 135.0
+          },
+          {
+            "x": 635.0,
+            "y": 205.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "dlatch4#0",
@@ -3400,7 +3367,7 @@
         "name": "unnamedWire#72",
         "path": [
           {
-            "x": 235.0,
+            "x": 245.0,
             "y": 1095.0
           },
           {
@@ -3429,7 +3396,7 @@
         "name": "unnamedWire#73",
         "path": [
           {
-            "x": 240.0,
+            "x": 250.0,
             "y": 1100.0
           },
           {
@@ -3482,7 +3449,7 @@
         "name": "unnamedWire#76",
         "path": [
           {
-            "x": 245.0,
+            "x": 255.0,
             "y": 1105.0
           },
           {
@@ -3557,7 +3524,7 @@
         "name": "unnamedWire#79",
         "path": [
           {
-            "x": 230.0,
+            "x": 240.0,
             "y": 1090.0
           },
           {
@@ -3641,7 +3608,7 @@
         "path": [
           {
             "x": 325.0,
-            "y": 920.0
+            "y": 940.0
           },
           {
             "x": 325.0,
@@ -3662,7 +3629,7 @@
         "path": [
           {
             "x": 330.0,
-            "y": 930.0
+            "y": 950.0
           },
           {
             "x": 330.0,
Mirror of https://github.com/Mograsim-Team/Mograsim