Changed getCurrentMicroInstructionAddress to use HighLevelStates

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / Am2900.json

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index fe7cde2..37f08e5 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -108,11 +108,11 @@
         "id": "Clock",
         "name": "Clock#0",
         "pos": {
-          "x": 70.0,
-          "y": 365.0
+          "x": 115.0,
+          "y": 355.0
         },
         "params": {
-          "delta": 500,
+          "delta": 7000,
           "orientation": "RIGHT"
         }
       },
@@ -220,24 +220,6 @@
           ]
         }
       },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#0",
-        "pos": {
-          "x": 70.0,
-          "y": 347.5
-        },
-        "params": 1
-      },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#1",
-        "pos": {
-          "x": 70.0,
-          "y": 387.5
-        },
-        "params": 1
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -1286,8 +1268,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#42",
         "pos": {
-          "x": 364.0,
-          "y": 359.0
+          "x": 479.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1302,10 +1284,10 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#53",
+        "name": "WireCrossPoint#44",
         "pos": {
-          "x": 169.0,
-          "y": 359.0
+          "x": 364.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1374,14 +1356,6 @@
         },
         "params": 16
       },
-      {
-        "id": "mux1",
-        "name": "mux1#0",
-        "pos": {
-          "x": 100.0,
-          "y": 360.0
-        }
-      },
       {
         "id": "mux1_4",
         "name": "mux1_4#0",
@@ -3016,7 +2990,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#93",
@@ -3024,8 +2998,8 @@
       },
       {
         "pin1": {
-          "compName": "mux1#0",
-          "pinName": "Y"
+          "compName": "Clock#0",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#40",
@@ -3118,7 +3092,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "name": "unnamedWire#100",
@@ -6854,11 +6828,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "name": "unnamedWire#346",
@@ -6866,7 +6840,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
@@ -6892,10 +6866,6 @@
         },
         "name": "unnamedWire#348",
         "path": [
-          {
-            "x": 480.0,
-            "y": 360.0
-          },
           {
             "x": 480.0,
             "y": 170.0
@@ -6978,7 +6948,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -6990,68 +6960,14 @@
       },
       {
         "pin1": {
-          "compName": "ManualSwitch#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#355",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 355.0
-          },
-          {
-            "x": 95.0,
-            "y": 365.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#356",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 395.0
-          },
-          {
-            "x": 95.0,
-            "y": 385.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Clock#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I0"
-        },
-        "name": "unnamedWire#357",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#42",
           "pinName": ""
         },
-        "name": "unnamedWire#358",
+        "name": "unnamedWire#355",
         "path": []
       }
     ],
@@ -7142,7 +7058,17 @@
         }
       }
     },
-    "atomicHighLevelStates": {}
+    "atomicHighLevelStates": {
+      "mpm_address": {
+        "id": "wireForcing",
+        "params": {
+          "wiresToForce": [
+            "unnamedWire#163"
+          ],
+          "wiresToForceInverted": []
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file