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 55256c7..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
@@ -204,15 +204,6 @@
         },
         "params": 1
       },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 199.0,
-          "y": 209.0
-        },
-        "params": 1
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
@@ -269,13 +260,22 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#8",
         "pos": {
           "x": 234.0,
           "y": 69.0
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 199.0,
+          "y": 209.0
+        },
+        "params": 1
+      },
       {
         "id": "dff12",
         "name": "dff12#0",
@@ -285,12 +285,13 @@
         }
       },
       {
-        "id": "inc12",
-        "name": "inc12#0",
+        "id": "inc",
+        "name": "inc#0",
         "pos": {
           "x": 240.0,
           "y": 140.0
-        }
+        },
+        "params": 12
       },
       {
         "id": "nor12",
@@ -494,7 +495,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "A"
         },
         "name": "unnamedWire#18",
@@ -634,7 +635,16 @@
           "pinName": "_RLD"
         },
         "name": "unnamedWire#26",
-        "path": []
+        "path": [
+          {
+            "x": 50.0,
+            "y": 25.0
+          },
+          {
+            "x": 50.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -769,7 +779,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -790,7 +800,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#36",
@@ -834,7 +844,7 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -858,7 +868,7 @@
       },
       {
         "pin1": {
-          "compName": "inc12#0",
+          "compName": "inc#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -966,7 +976,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -994,7 +1004,7 @@
           "pinName": "_OE"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#53",
@@ -1002,7 +1012,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -1018,7 +1028,7 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#57",
@@ -1118,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"
         }
       }
     },