From 4166a936aca1d531e799d2920ec472952b76d0e3 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Tue, 1 Oct 2019 16:35:04 +0200
Subject: [PATCH] Changed getCurrentMicroInstructionAddress to use
 HighLevelStates

---
 .../logic/model/am2900/components/Am2900.json      | 14 ++++++++++++--
 .../logic/model/am2900/machine/Am2900Machine.java  |  3 +--
 2 files changed, 13 insertions(+), 4 deletions(-)

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 a83e7ad8..37f08e58 100644
--- 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
@@ -4159,7 +4159,7 @@
           "compName": "WireCrossPoint#43",
           "pinName": ""
         },
-        "name": "wire_mpm_address",
+        "name": "unnamedWire#163",
         "path": [
           {
             "x": 205.0,
@@ -7058,7 +7058,17 @@
         }
       }
     },
-    "atomicHighLevelStates": {}
+    "atomicHighLevelStates": {
+      "mpm_address": {
+        "id": "wireForcing",
+        "params": {
+          "wiresToForce": [
+            "unnamedWire#163"
+          ],
+          "wiresToForceInverted": []
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file
diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index 759fda98..ab0643f1 100644
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@ -165,8 +165,7 @@ public class Am2900Machine implements Machine
 
 	private long getCurrentMicroInstructionAddress()
 	{
-		// TODO: replace with highlevelstate
-		BitVector vector = logicModel.getWireBySubmodelPath("Am2900.wire_mpm_address").getWireValues();
+		BitVector vector = (BitVector) am2900.getHighLevelState("mpm_address");
 		return vector.isBinary() ? vector.getUnsignedValueLong() : -1;
 	}
 
-- 
2.17.1