projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed old and incorrect CoreWire#get(Un)SignedValue
[Mograsim.git]
/
net.mograsim.machine
/
src
/
net
/
mograsim
/
machine
/
mi
/
components
/
CoreMicroInstructionMemory.java
diff --git
a/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
b/net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
index
12b44dd
..
7394028
100644
(file)
--- a/
net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
+++ b/
net.mograsim.machine/src/net/mograsim/machine/mi/components/CoreMicroInstructionMemory.java
@@
-47,11
+47,11
@@
public class CoreMicroInstructionMemory extends BasicCoreComponent
@Override
protected TimelineEventHandler compute()
{
@Override
protected TimelineEventHandler compute()
{
- if (!address.
hasNumericValue
())
+ if (!address.
getValues().isBinary
())
{
return e -> data.feedSignals(Bit.U.toVector(data.width()));// TODO don't always feed U, but decide to feed X or U.
}
{
return e -> data.feedSignals(Bit.U.toVector(data.width()));// TODO don't always feed U, but decide to feed X or U.
}
- long addressed = address.get
UnsignedValue
();
+ long addressed = address.get
Values().getUnsignedValueLong
();
BitVector storedData = memory.getCell(addressed).toBitVector();
return e -> data.feedSignals(storedData);
}
BitVector storedData = memory.getCell(addressed).toBitVector();
return e -> data.feedSignals(storedData);
}