projects / Mograsim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed a bug in Am2900; created dlatch8/80; relayouted some components
[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2910 / Am2910.json
diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index b0d1cfd..9a6e0ba 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@ -1,10 +1,10 @@
 {
-  "width": 72.0,
-  "height": 67.0,
+  "width": 60.0,
+  "height": 45.0,
   "interfacePins": [
     {
       "location": {
-        "x": 60.0,
+        "x": 40.0,
         "y": 0.0
       },
       "name": "C",
@@ -13,8 +13,8 @@
     },
     {
       "location": {
-        "x": 72.0,
-        "y": 40.0
+        "x": 60.0,
+        "y": 30.0
       },
       "name": "CI",
       "logicWidth": 1,
@@ -22,7 +22,7 @@
     },
     {
       "location": {
-        "x": 36.0,
+        "x": 30.0,
         "y": 0.0
       },
       "name": "D",
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 50.0
+        "y": 25.0
       },
       "name": "I",
       "logicWidth": 4,
@@ -40,8 +40,8 @@
     },
     {
       "location": {
-        "x": 38.0,
-        "y": 67.0
+        "x": 35.0,
+        "y": 45.0
       },
       "name": "Y",
       "logicWidth": 12,
@@ -50,7 +50,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 38.0
+        "y": 10.0
       },
       "name": "_CC",
       "logicWidth": 1,
@@ -59,7 +59,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 44.0
+        "y": 15.0
       },
       "name": "_CCEN",
       "logicWidth": 1,
@@ -67,8 +67,8 @@
     },
     {
       "location": {
-        "x": 72.0,
-        "y": 14.0
+        "x": 60.0,
+        "y": 5.0
       },
       "name": "_FULL",
       "logicWidth": 1,
@@ -76,8 +76,8 @@
     },
     {
       "location": {
-        "x": 19.0,
-        "y": 67.0
+        "x": 15.0,
+        "y": 45.0
       },
       "name": "_MAP",
       "logicWidth": 1,
@@ -85,8 +85,8 @@
     },
     {
       "location": {
-        "x": 49.0,
-        "y": 67.0
+        "x": 40.0,
+        "y": 45.0
       },
       "name": "_OE",
       "logicWidth": 1,
@@ -94,8 +94,8 @@
     },
     {
       "location": {
-        "x": 13.0,
-        "y": 67.0
+        "x": 10.0,
+        "y": 45.0
       },
       "name": "_PL",
       "logicWidth": 1,
@@ -104,7 +104,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 6.0
+        "y": 5.0
       },
       "name": "_RLD",
       "logicWidth": 1,
@@ -112,8 +112,8 @@
     },
     {
       "location": {
-        "x": 25.0,
-        "y": 67.0
+        "x": 20.0,
+        "y": 45.0
       },
       "name": "_VECT",
       "logicWidth": 1,
@@ -127,86 +127,32 @@
         "id": "Am2910InstrPLA",
         "name": "Am2910InstrPLA#0",
         "pos": {
-          "x": 80.0,
-          "y": 155.0
+          "x": 70.0,
+          "y": 90.0
         }
       },
       {
         "id": "Am2910RegCntr",
         "name": "Am2910RegCntr#0",
         "pos": {
-          "x": 160.0,
-          "y": 25.0
+          "x": 130.0,
+          "y": 15.0
         }
       },
       {
         "id": "Am2910SP",
         "name": "Am2910SP#0",
         "pos": {
-          "x": 305.0,
-          "y": 55.0
+          "x": 240.0,
+          "y": 10.0
         }
       },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#0",
-        "pos": {
-          "x": 160.0,
-          "y": 95.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#1",
-        "pos": {
-          "x": 260.0,
-          "y": 115.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#2",
-        "pos": {
-          "x": 345.0,
-          "y": 180.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#3",
-        "pos": {
-          "x": 265.0,
-          "y": 150.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#4",
-        "pos": {
-          "x": 260.0,
-          "y": 85.0
-        },
-        "params": 3
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#5",
-        "pos": {
-          "x": 260.0,
-          "y": 70.0
-        },
-        "params": 3
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
           "x": 40.0,
-          "y": 185.0
+          "y": 45.0
         },
         "params": 1
       },
@@ -215,7 +161,7 @@
         "name": "NandGate#1",
         "pos": {
           "x": 10.0,
-          "y": 210.0
+          "y": 60.0
         },
         "params": 1
       },
@@ -223,8 +169,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 250.0,
-          "y": 305.0
+          "x": 205.0,
+          "y": 195.0
         },
         "params": 1
       },
@@ -232,60 +178,20 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
         "pos": {
-          "x": 180.0,
-          "y": 290.0
+          "x": 165.0,
+          "y": 180.0
         },
         "params": {
           "logicWidth": 12,
           "orientation": "DOWN"
         }
       },
-      {
-        "id": "dff12",
-        "name": "dff12#0",
-        "pos": {
-          "x": 305.0,
-          "y": 160.0
-        }
-      },
-      {
-        "id": "inc12",
-        "name": "inc12#0",
-        "pos": {
-          "x": 305.0,
-          "y": 190.0
-        }
-      },
-      {
-        "id": "nor12",
-        "name": "nor12#0",
-        "pos": {
-          "x": 190.0,
-          "y": 80.0
-        }
-      },
-      {
-        "id": "ram5_12",
-        "name": "ram5_12#0",
-        "pos": {
-          "x": 305.0,
-          "y": 100.0
-        }
-      },
-      {
-        "id": "sel4_12",
-        "name": "sel4_12#0",
-        "pos": {
-          "x": 150.0,
-          "y": 175.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 324.0,
-          "y": 149.0
+          "x": 259.0,
+          "y": 99.0
         },
         "params": 12
       },
@@ -293,17 +199,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 294.0,
-          "y": 104.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 244.0,
-          "y": 319.0
+          "x": 224.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -311,8 +208,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 189.0,
-          "y": 274.0
+          "x": 174.0,
+          "y": 174.0
         },
         "params": 12
       },
@@ -320,8 +217,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 179.0,
-          "y": 89.0
+          "x": 164.0,
+          "y": 59.0
         },
         "params": 12
       },
@@ -329,8 +226,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 179.0,
-          "y": 14.0
+          "x": 149.0,
+          "y": 9.0
         },
         "params": 12
       },
@@ -339,7 +236,7 @@
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 4.0,
-          "y": 219.0
+          "y": 74.0
         },
         "params": 1
       },
@@ -347,8 +244,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 299.0,
-          "y": 79.0
+          "x": 234.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -356,8 +253,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 299.0,
-          "y": 44.0
+          "x": 199.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -365,8 +262,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 299.0,
-          "y": 169.0
+          "x": 234.0,
+          "y": 69.0
         },
         "params": 1
       },
@@ -374,10 +271,51 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 299.0,
-          "y": 114.0
+          "x": 199.0,
+          "y": 209.0
         },
         "params": 1
+      },
+      {
+        "id": "dff12",
+        "name": "dff12#0",
+        "pos": {
+          "x": 240.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "inc",
+        "name": "inc#0",
+        "pos": {
+          "x": 240.0,
+          "y": 140.0
+        },
+        "params": 12
+      },
+      {
+        "id": "nor12",
+        "name": "nor12#0",
+        "pos": {
+          "x": 175.0,
+          "y": 50.0
+        }
+      },
+      {
+        "id": "ram5_12",
+        "name": "ram5_12#0",
+        "pos": {
+          "x": 240.0,
+          "y": 55.0
+        }
+      },
+      {
+        "id": "sel4_12",
+        "name": "sel4_12#0",
+        "pos": {
+          "x": 135.0,
+          "y": 110.0
+        }
       }
     ],
     "wires": [
@@ -417,16 +355,16 @@
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 230.0,
-            "y": 90.0
+            "x": 215.0,
+            "y": 60.0
           },
           {
-            "x": 230.0,
-            "y": 120.0
+            "x": 215.0,
+            "y": 75.0
           },
           {
-            "x": 95.0,
-            "y": 120.0
+            "x": 85.0,
+            "y": 75.0
           }
         ]
       },
@@ -442,12 +380,12 @@
         "name": "unnamedWire#11",
         "path": [
           {
-            "x": 115.0,
-            "y": 160.0
+            "x": 105.0,
+            "y": 95.0
           },
           {
-            "x": 115.0,
-            "y": 45.0
+            "x": 105.0,
+            "y": 35.0
           }
         ]
       },
@@ -463,12 +401,12 @@
         "name": "unnamedWire#12",
         "path": [
           {
-            "x": 120.0,
-            "y": 170.0
+            "x": 110.0,
+            "y": 105.0
           },
           {
-            "x": 120.0,
-            "y": 55.0
+            "x": 110.0,
+            "y": 45.0
           }
         ]
       },
@@ -484,8 +422,8 @@
         "name": "unnamedWire#13",
         "path": [
           {
-            "x": 295.0,
-            "y": 220.0
+            "x": 225.0,
+            "y": 155.0
           }
         ]
       },
@@ -501,12 +439,12 @@
         "name": "unnamedWire#14",
         "path": [
           {
-            "x": 290.0,
-            "y": 230.0
+            "x": 230.0,
+            "y": 165.0
           },
           {
-            "x": 290.0,
-            "y": 70.0
+            "x": 230.0,
+            "y": 25.0
           }
         ]
       },
@@ -522,8 +460,8 @@
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 295.0,
-            "y": 60.0
+            "x": 225.0,
+            "y": 15.0
           }
         ]
       },
@@ -557,14 +495,14 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "A"
         },
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 325.0,
-            "y": 275.0
+            "x": 260.0,
+            "y": 175.0
           }
         ]
       },
@@ -580,8 +518,8 @@
         "name": "unnamedWire#19",
         "path": [
           {
-            "x": 200.0,
-            "y": 130.0
+            "x": 185.0,
+            "y": 85.0
           }
         ]
       },
@@ -609,8 +547,8 @@
         "name": "unnamedWire#20",
         "path": [
           {
-            "x": 220.0,
-            "y": 150.0
+            "x": 205.0,
+            "y": 100.0
           }
         ]
       },
@@ -674,16 +612,16 @@
         "name": "unnamedWire#25",
         "path": [
           {
-            "x": 145.0,
-            "y": 15.0
+            "x": 125.0,
+            "y": 10.0
           },
           {
-            "x": 145.0,
-            "y": 150.0
+            "x": 125.0,
+            "y": 65.0
           },
           {
-            "x": 160.0,
-            "y": 150.0
+            "x": 145.0,
+            "y": 65.0
           }
         ]
       },
@@ -697,7 +635,16 @@
           "pinName": "_RLD"
         },
         "name": "unnamedWire#26",
-        "path": []
+        "path": [
+          {
+            "x": 50.0,
+            "y": 25.0
+          },
+          {
+            "x": 50.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -724,11 +671,11 @@
         "path": [
           {
             "x": 65.0,
-            "y": 195.0
+            "y": 55.0
           },
           {
             "x": 65.0,
-            "y": 160.0
+            "y": 95.0
           }
         ]
       },
@@ -781,7 +728,7 @@
         "path": [
           {
             "x": 5.0,
-            "y": 215.0
+            "y": 65.0
           }
         ]
       },
@@ -795,12 +742,7 @@
           "pinName": "B"
         },
         "name": "unnamedWire#32",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 225.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -815,11 +757,11 @@
         "path": [
           {
             "x": 35.0,
-            "y": 220.0
+            "y": 70.0
           },
           {
             "x": 35.0,
-            "y": 200.0
+            "y": 60.0
           }
         ]
       },
@@ -845,7 +787,12 @@
           "pinName": "C"
         },
         "name": "unnamedWire#35",
-        "path": []
+        "path": [
+          {
+            "x": 235.0,
+            "y": 115.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -853,7 +800,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#36",
@@ -897,7 +844,7 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -921,7 +868,7 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -943,12 +890,12 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 85.0,
-            "y": 290.0
+            "x": 75.0,
+            "y": 180.0
           },
           {
-            "x": 65.0,
-            "y": 290.0
+            "x": 50.0,
+            "y": 180.0
           }
         ]
       },
@@ -962,7 +909,16 @@
           "pinName": "_MAP"
         },
         "name": "unnamedWire#43",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 185.0
+          },
+          {
+            "x": 75.0,
+            "y": 185.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -976,12 +932,12 @@
         "name": "unnamedWire#44",
         "path": [
           {
-            "x": 105.0,
-            "y": 290.0
+            "x": 95.0,
+            "y": 190.0
           },
           {
-            "x": 125.0,
-            "y": 290.0
+            "x": 100.0,
+            "y": 190.0
           }
         ]
       },
@@ -997,63 +953,15 @@
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 70.0,
-            "y": 250.0
+            "x": 35.0,
+            "y": 125.0
           },
           {
-            "x": 70.0,
-            "y": 175.0
+            "x": 35.0,
+            "y": 110.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Am2910RegCntr#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#46",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram5_12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#47",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "inc12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#48",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dff12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#49",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "dff12#0",
@@ -1068,7 +976,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -1078,18 +986,6 @@
         "name": "unnamedWire#50",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "name": "unnamedWire#51",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "TriStateBuffer#0",
@@ -1108,7 +1004,7 @@
           "pinName": "_OE"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#53",
@@ -1116,31 +1012,7 @@
       },
       {
         "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "BitDisplay#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#54",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "BitDisplay#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#55",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -1156,14 +1028,14 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#57",
         "path": [
           {
-            "x": 245.0,
-            "y": 310.0
+            "x": 200.0,
+            "y": 200.0
           }
         ]
       },
@@ -1179,12 +1051,12 @@
         "name": "unnamedWire#58",
         "path": [
           {
-            "x": 275.0,
-            "y": 300.0
+            "x": 230.0,
+            "y": 190.0
           },
           {
-            "x": 275.0,
-            "y": 315.0
+            "x": 230.0,
+            "y": 205.0
           }
         ]
       },
@@ -1234,7 +1106,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 150.0,
+            "y": 60.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"
@@ -1251,28 +1128,28 @@
   "highLevelStateHandlerSnippetID": "standard",
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {
-      "r": {
+      "mupc": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "Am2910RegCntr#0"
+          "delegateTarget": "dff12#0"
         }
       },
-      "stack": {
+      "r": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram5_12#0"
+          "delegateTarget": "Am2910RegCntr#0"
         }
       },
-      "mupc": {
+      "sp": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff12#0"
+          "delegateTarget": "Am2910SP#0"
         }
       },
-      "sp": {
+      "stack": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "Am2910SP#0"
+          "delegateTarget": "ram5_12#0"
         }
       }
     },
Mirror of https://github.com/Mograsim-Team/Mograsim