projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged SampleERCP into master
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
Merger.java
diff --git
a/era.mi/src/era/mi/logic/components/Merger.java
b/era.mi/src/era/mi/logic/components/Merger.java
index
613d523
..
34ba217
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Merger.java
+++ b/
era.mi/src/era/mi/logic/components/Merger.java
@@
-2,7
+2,7
@@
package era.mi.logic.components;
import java.util.List;
import java.util.List;
-import era.mi.logic.
Bit
;
+import era.mi.logic.
types.BitVector
;
import era.mi.logic.wires.Wire;
import era.mi.logic.wires.Wire.WireEnd;
import era.mi.logic.wires.WireObserver;
import era.mi.logic.wires.Wire;
import era.mi.logic.wires.Wire.WireEnd;
import era.mi.logic.wires.WireObserver;
@@
-48,7
+48,7
@@
public class Merger implements WireObserver, Component
}
@Override
}
@Override
- public void update(Wire initiator, Bit
[]
oldValues)
+ public void update(Wire initiator, Bit
Vector
oldValues)
{
int index = find(initiator);
int beginning = beginningIndex[index];
{
int index = find(initiator);
int beginning = beginningIndex[index];