X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FAm2910.json;h=b2f52088379d5c66a30f6da3439d89e5229317b1;hb=HEAD;hp=425805f947df5f00d5b4bdb09af669ae6f6f7da2;hpb=660c1e31333d4807e03e21aed1ca24706f310b87;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index 425805f9..b2f52088 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@ -135,8 +135,8 @@
         "id": "Am2910RegCntr",
         "name": "Am2910RegCntr#0",
         "pos": {
-          "x": 130.0,
-          "y": 10.0
+          "x": 115.0,
+          "y": 20.0
         }
       },
       {
@@ -174,6 +174,15 @@
         },
         "params": 1
       },
+      {
+        "id": "NandGate",
+        "name": "NandGate#3",
+        "pos": {
+          "x": 85.0,
+          "y": 20.0
+        },
+        "params": 1
+      },
       {
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
@@ -217,7 +226,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 149.0,
+          "x": 169.0,
           "y": 54.0
         },
         "params": 12
@@ -226,8 +235,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 149.0,
-          "y": 4.0
+          "x": 109.0,
+          "y": 49.0
         },
         "params": 12
       },
@@ -245,7 +254,7 @@
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 239.0,
-          "y": 34.0
+          "y": 14.0
         },
         "params": 1
       },
@@ -254,7 +263,7 @@
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 199.0,
-          "y": 29.0
+          "y": 14.0
         },
         "params": 1
       },
@@ -289,7 +298,7 @@
         "name": "inc12#0",
         "pos": {
           "x": 255.0,
-          "y": 165.0
+          "y": 170.0
         }
       },
       {
@@ -462,7 +471,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 170.0,
+            "y": 40.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -489,27 +503,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Am2910InstrPLA#0",
-          "pinName": "RLD"
-        },
-        "pin2": {
-          "compName": "Am2910RegCntr#0",
-          "pinName": "LD"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 115.0,
-            "y": 105.0
-          },
-          {
-            "x": 115.0,
-            "y": 30.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "Am2910InstrPLA#0",
@@ -519,15 +512,15 @@
           "compName": "Am2910RegCntr#0",
           "pinName": "DEC"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#11",
         "path": [
           {
-            "x": 120.0,
+            "x": 105.0,
             "y": 115.0
           },
           {
-            "x": 120.0,
-            "y": 40.0
+            "x": 105.0,
+            "y": 60.0
           }
         ]
       },
@@ -540,7 +533,7 @@
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#12",
         "path": [
           {
             "x": 230.0,
@@ -557,7 +550,7 @@
           "compName": "Am2910SP#0",
           "pinName": "STKI1"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#13",
         "path": [
           {
             "x": 235.0,
@@ -578,11 +571,11 @@
           "compName": "Am2910SP#0",
           "pinName": "STKI0"
         },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 230.0,
-            "y": 15.0
+            "y": 35.0
           }
         ]
       },
@@ -595,7 +588,7 @@
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#15",
         "path": []
       },
       {
@@ -607,7 +600,7 @@
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#16",
         "path": [
           {
             "x": 200.0,
@@ -624,7 +617,7 @@
           "compName": "inc12#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#17",
         "path": []
       },
       {
@@ -636,7 +629,7 @@
           "compName": "sel4_12#0",
           "pinName": "I3"
         },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 160.0,
@@ -653,7 +646,7 @@
           "compName": "sel4_12#0",
           "pinName": "I4"
         },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 170.0,
@@ -670,8 +663,17 @@
           "compName": "sel4_12#0",
           "pinName": "I2"
         },
-        "name": "unnamedWire#21",
-        "path": []
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 70.0
+          },
+          {
+            "x": 150.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -682,7 +684,7 @@
           "compName": "nor12#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -694,8 +696,17 @@
           "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#23",
-        "path": []
+        "name": "unnamedWire#22",
+        "path": [
+          {
+            "x": 150.0,
+            "y": 10.0
+          },
+          {
+            "x": 110.0,
+            "y": 10.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -706,7 +717,7 @@
           "compName": "Am2910RegCntr#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -718,19 +729,15 @@
           "compName": "sel4_12#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#24",
         "path": [
           {
-            "x": 125.0,
-            "y": 5.0
-          },
-          {
-            "x": 125.0,
-            "y": 65.0
+            "x": 110.0,
+            "y": 70.0
           },
           {
             "x": 140.0,
-            "y": 65.0
+            "y": 70.0
           }
         ]
       },
@@ -740,20 +747,11 @@
           "pinName": "_RLD"
         },
         "pin2": {
-          "compName": "Am2910RegCntr#0",
-          "pinName": "_RLD"
+          "compName": "NandGate#3",
+          "pinName": "A"
         },
-        "name": "unnamedWire#26",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 25.0
-          },
-          {
-            "x": 50.0,
-            "y": 15.0
-          }
-        ]
+        "name": "unnamedWire#25",
+        "path": []
       },
       {
         "pin1": {
@@ -764,7 +762,7 @@
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#26",
         "path": [
           {
             "x": 175.0,
@@ -781,7 +779,7 @@
           "compName": "Am2910InstrPLA#0",
           "pinName": "PASS"
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 65.0,
@@ -806,7 +804,7 @@
           "compName": "NandGate#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#28",
         "path": []
       },
       {
@@ -818,7 +816,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#29",
         "path": []
       },
       {
@@ -830,7 +828,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#30",
         "path": [
           {
             "x": 5.0,
@@ -847,7 +845,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#31",
         "path": []
       },
       {
@@ -859,7 +857,7 @@
           "compName": "NandGate#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#32",
         "path": [
           {
             "x": 35.0,
@@ -880,7 +878,7 @@
           "compName": "_submodelinterface",
           "pinName": "_FULL"
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#33",
         "path": []
       },
       {
@@ -892,7 +890,7 @@
           "compName": "dff12#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#34",
         "path": [
           {
             "x": 240.0,
@@ -909,7 +907,7 @@
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#35",
         "path": []
       },
       {
@@ -921,7 +919,7 @@
           "compName": "Am2910SP#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#36",
         "path": []
       },
       {
@@ -933,13 +931,8 @@
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#38",
-        "path": [
-          {
-            "x": 240.0,
-            "y": 30.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
       },
       {
         "pin1": {
@@ -950,8 +943,13 @@
           "compName": "Am2910RegCntr#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#39",
-        "path": []
+        "name": "unnamedWire#38",
+        "path": [
+          {
+            "x": 140.0,
+            "y": 15.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -962,7 +960,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#39",
         "path": []
       },
       {
@@ -974,19 +972,19 @@
           "compName": "_submodelinterface",
           "pinName": "CI"
         },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#40",
         "path": [
           {
             "x": 250.0,
-            "y": 170.0
+            "y": 190.0
           },
           {
             "x": 250.0,
-            "y": 160.0
+            "y": 200.0
           },
           {
             "x": 290.0,
-            "y": 160.0
+            "y": 200.0
           },
           {
             "x": 290.0,
@@ -1003,7 +1001,7 @@
           "compName": "_submodelinterface",
           "pinName": "_PL"
         },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#41",
         "path": [
           {
             "x": 45.0,
@@ -1024,7 +1022,7 @@
           "compName": "_submodelinterface",
           "pinName": "_MAP"
         },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#42",
         "path": [
           {
             "x": 60.0,
@@ -1045,7 +1043,7 @@
           "compName": "_submodelinterface",
           "pinName": "_VECT"
         },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#43",
         "path": [
           {
             "x": 75.0,
@@ -1066,7 +1064,7 @@
           "compName": "Am2910InstrPLA#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#44",
         "path": [
           {
             "x": 25.0,
@@ -1087,7 +1085,7 @@
           "compName": "ram5_12#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#45",
         "path": []
       },
       {
@@ -1099,7 +1097,7 @@
           "compName": "_submodelinterface",
           "pinName": "Y"
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#46",
         "path": []
       },
       {
@@ -1111,7 +1109,7 @@
           "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
@@ -1123,7 +1121,7 @@
           "compName": "NandGate#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#48",
         "path": []
       },
       {
@@ -1135,7 +1133,7 @@
           "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#49",
         "path": [
           {
             "x": 200.0,
@@ -1152,7 +1150,7 @@
           "compName": "NandGate#2",
           "pinName": "Y"
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#50",
         "path": [
           {
             "x": 230.0,
@@ -1163,6 +1161,47 @@
             "y": 210.0
           }
         ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2910InstrPLA#0",
+          "pinName": "_RLD"
+        },
+        "pin2": {
+          "compName": "NandGate#3",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#51",
+        "path": [
+          {
+            "x": 95.0,
+            "y": 105.0
+          },
+          {
+            "x": 95.0,
+            "y": 95.0
+          },
+          {
+            "x": 80.0,
+            "y": 95.0
+          },
+          {
+            "x": 80.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Am2910RegCntr#0",
+          "pinName": "LD"
+        },
+        "name": "unnamedWire#52",
+        "path": []
       }
     ],
     "version": "0.1.1"