projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed getCurrentMicroInstructionAddress to use HighLevelStates
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
am2900
/
machine
/
Am2900Machine.java
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
759fda9
..
ab0643f
100644
(file)
--- 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()
{
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;
}
return vector.isBinary() ? vector.getUnsignedValueLong() : -1;
}