projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed logic to core where appropiate
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
snippets
/
highlevelstatehandlers
/
standard
/
atomic
/
WireForcingAtomicHighLevelStateHandler.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java
index
cd09bd8
..
ecf3a4d
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java
@@
-80,11
+80,11
@@
public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt
{
BitVector result = BitVector.of(Bit.ZERO, logicWidth);
for (ModelWire wire : wiresToForceInverted)
{
BitVector result = BitVector.of(Bit.ZERO, logicWidth);
for (ModelWire wire : wiresToForceInverted)
- if (wire.has
Logic
ModelBinding())
+ if (wire.has
Core
ModelBinding())
result = result.or(wire.getWireValues());
result = result.not();
for (ModelWire wire : wiresToForce)
result = result.or(wire.getWireValues());
result = result.not();
for (ModelWire wire : wiresToForce)
- if (wire.has
Logic
ModelBinding())
+ if (wire.has
Core
ModelBinding())
result = result.and(wire.getWireValues());
return result;
}
result = result.and(wire.getWireValues());
return result;
}
@@
-98,11
+98,11
@@
public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt
else
vector = (BitVector) newState;
for (ModelWire wire : wiresToForce)
else
vector = (BitVector) newState;
for (ModelWire wire : wiresToForce)
- if (wire.has
Logic
ModelBinding())
+ if (wire.has
Core
ModelBinding())
wire.forceWireValues(vector);
vector = vector.not();
for (ModelWire wire : wiresToForceInverted)
wire.forceWireValues(vector);
vector = vector.not();
for (ModelWire wire : wiresToForceInverted)
- if (wire.has
Logic
ModelBinding())
+ if (wire.has
Core
ModelBinding())
wire.forceWireValues(vector);
}
wire.forceWireValues(vector);
}