projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WireArray(Input) is now Wire(End); all in-/outputs are now WireEnds
[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
1efcf8a
..
225a35a
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Merger.java
+++ b/
era.mi/src/era/mi/logic/components/Merger.java
@@
-5,70
+5,80
@@
import java.util.Collections;
import java.util.List;
import era.mi.logic.Bit;
import java.util.List;
import era.mi.logic.Bit;
-import era.mi.logic.wires.Wire
Array
;
-import era.mi.logic.wires.Wire
Array.WireArrayInput
;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire
.WireEnd
;
import era.mi.logic.wires.WireArrayObserver;
import era.mi.logic.wires.WireArrayObserver;
-public class Merger implements WireArrayObserver, Component {
- private WireArrayInput outI;
- private WireArray[] inputs;
+public class Merger implements WireArrayObserver, Component
+{
+ private WireEnd out;
+ private WireEnd[] inputs;
private int[] beginningIndex;
/**
*
private int[] beginningIndex;
/**
*
- * @param union The output of merging n {@link Wire
Array
}s into one. Must have length = a1.length() + a2.length() + ... + an.length().
+ * @param union The output of merging n {@link Wire}s into one. Must have length = a1.length() + a2.length() + ... + an.length().
* @param inputs The inputs to be merged into the union
*/
* @param inputs The inputs to be merged into the union
*/
- public Merger(WireArray union, WireArray... inputs) {
+ public Merger(WireEnd union, WireEnd... inputs)
+ {
this.inputs = inputs;
this.inputs = inputs;
- this.out
I = union.createInput()
;
+ this.out
= union
;
this.beginningIndex = new int[inputs.length];
int length = 0;
this.beginningIndex = new int[inputs.length];
int length = 0;
- for (int i = 0; i < inputs.length; i++) {
+ for (int i = 0; i < inputs.length; i++)
+ {
beginningIndex[i] = length;
beginningIndex[i] = length;
- length += inputs[i].length;
+ length += inputs[i].length
()
;
inputs[i].addObserver(this);
}
inputs[i].addObserver(this);
}
- if (length != union.length)
+ if (length != union.length
()
)
throw new IllegalArgumentException(
"The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");
}
throw new IllegalArgumentException(
"The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");
}
- public WireArray getInput(int index) {
+ public WireEnd getInput(int index)
+ {
return inputs[index];
}
return inputs[index];
}
- public WireArray getUnion() {
- return outI.owner;
+ public WireEnd getUnion()
+ {
+ return out;
}
@Override
}
@Override
- public void update(WireArray initiator, Bit[] oldValues) {
+ public void update(Wire initiator, Bit[] oldValues)
+ {
int index = find(initiator);
int beginning = beginningIndex[index];
int index = find(initiator);
int beginning = beginningIndex[index];
- out
I.feedSignals(beginning, initiator
.getValues());
+ out
.feedSignals(beginning, inputs[index]
.getValues());
}
}
- private int find(WireArray w) {
+ private int find(Wire w)
+ {
for (int i = 0; i < inputs.length; i++)
for (int i = 0; i < inputs.length; i++)
- if (inputs[i] == w)
+ if (inputs[i]
.getWire()
== w)
return i;
return -1;
}
return i;
return -1;
}
- public WireArray[] getInputs() {
+ public WireEnd[] getInputs()
+ {
return inputs.clone();
}
@Override
return inputs.clone();
}
@Override
- public List<WireArray> getAllInputs() {
+ public List<WireEnd> getAllInputs()
+ {
return Collections.unmodifiableList(Arrays.asList(inputs));
}
@Override
return Collections.unmodifiableList(Arrays.asList(inputs));
}
@Override
- public List<WireArray> getAllOutputs() {
- return Collections.unmodifiableList(Arrays.asList(outI.owner));
+ public List<WireEnd> getAllOutputs()
+ {
+ return Collections.unmodifiableList(Arrays.asList(out));
}
}
}
}