X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fwires%2FWire.java;h=a7b96eeee1577fcceffbf66139c32cb041ae7572;hb=cc5749d29d0a2e37262ec10925676c812a2fa734;hp=4c24571263504f938019c1ce827a53de87f2f674;hpb=953984f215af2b455477d42db469b119c016439b;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/wires/Wire.java b/era.mi/src/era/mi/logic/wires/Wire.java index 4c245712..a7b96eee 100644 --- a/era.mi/src/era/mi/logic/wires/Wire.java +++ b/era.mi/src/era/mi/logic/wires/Wire.java @@ -1,13 +1,14 @@ package era.mi.logic.wires; +import static era.mi.logic.types.Bit.*; + import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; import java.util.List; -import era.mi.logic.Bit; import era.mi.logic.Simulation; -import era.mi.logic.Util; +import era.mi.logic.types.Bit; +import era.mi.logic.types.BitVector; +import era.mi.logic.types.BitVector.BitVectorMutator; /** * Represents an array of wires that can store n bits of information. @@ -17,7 +18,7 @@ import era.mi.logic.Util; */ public class Wire { - private Bit[] values; + private BitVector values; public final int travelTime; private List observers = new ArrayList(); public final int length; @@ -35,41 +36,29 @@ public class Wire private void initValues() { - values = Bit.U.makeArray(length); + values = U.toVector(length); } private void recalculateSingleInput() { - WireEnd input = inputs.get(0); - if (!Arrays.equals(input.getInputValues(), values)) - { - Bit[] oldValues = values.clone(); - System.arraycopy(input.getInputValues(), 0, values, 0, length); - notifyObservers(oldValues); - } + setNewValues(inputs.get(0).getInputValues()); } private void recalculateMultipleInputs() { - Iterator it = inputs.iterator(); - Bit[] newValues = it.next().inputValues.clone(); - - while (it.hasNext()) - { - WireEnd input = it.next(); - Bit[] bits = input.getInputValues(); - for (int i = 0; i < length; i++) - { - newValues[i] = newValues[i].combineWith(bits[i]); - } - } + BitVectorMutator mutator = BitVectorMutator.empty(); + for (WireEnd wireArrayEnd : inputs) + mutator.join(wireArrayEnd.getInputValues()); + setNewValues(mutator.get()); + } - if (!Arrays.equals(newValues, values)) - { - Bit[] oldValues = values; - values = newValues; - notifyObservers(oldValues); - } + private void setNewValues(BitVector newValues) + { + if (values.equals(newValues)) + return; + BitVector oldValues = values; + values = newValues; + notifyObservers(oldValues); } private void recalculate() @@ -115,9 +104,9 @@ public class Wire { long val = 0; long mask = 1; - for (int i = 0; i < length; i++) + for (Bit bit : values) { - switch (values[i]) + switch (bit) { default: case Z: @@ -160,20 +149,17 @@ public class Wire public Bit getValue(int index) { - return values[index]; + return values.getBit(index); } - public Bit[] getValues(int start, int end) + public BitVector getValues(int start, int end) { - int length = end - start; - Bit[] bits = new Bit[length]; - System.arraycopy(values, start, bits, 0, length); - return bits; + return values.subVector(start, end); } - public Bit[] getValues() + public BitVector getValues() { - return values.clone(); + return values; } /** @@ -189,7 +175,7 @@ public class Wire return observers.add(ob); } - private void notifyObservers(Bit[] oldValues) + private void notifyObservers(BitVector oldValues) { for (WireObserver o : observers) o.update(this, oldValues); @@ -200,7 +186,15 @@ public class Wire */ public WireEnd createEnd() { - return new WireEnd(); + return new WireEnd(false); + } + + /** + * Create a {@link WireEnd} object, which is tied to this {@link Wire}. This {@link WireEnd} cannot written to. + */ + public WireEnd createReadOnlyEnd() + { + return new WireEnd(true); } private void registerInput(WireEnd toRegister) @@ -218,19 +212,20 @@ public class Wire public class WireEnd { private boolean open; - private Bit[] inputValues; + private BitVector inputValues; - private WireEnd() + private WireEnd(boolean readOnly) { super(); - open = true; + open = !readOnly; // TODO: that makes sense, doesn't it? initValues(); - registerInput(this); + if (!readOnly) + registerInput(this); } private void initValues() { - inputValues = Bit.Z.makeArray(length); + inputValues = U.toVector(length); } /** @@ -242,41 +237,54 @@ public class Wire */ public void feedSignals(Bit... newValues) { - if (newValues.length != length) + feedSignals(BitVector.of(newValues)); + } + + public void feedSignals(BitVector newValues) + { + if (newValues.length() != length) throw new IllegalArgumentException( - String.format("Attempted to input %d bits instead of %d bits.", newValues.length, length)); - feedSignals(0, newValues); + String.format("Attempted to input %d bits instead of %d bits.", newValues.length(), length)); + if (!open) + throw new RuntimeException("Attempted to write to closed WireArrayEnd."); + Simulation.TIMELINE.addEvent(e -> setValues(newValues), travelTime); } /** * Sets values of a subarray of wires. This takes up time, as specified by the {@link Wire}s travel time. * - * @param newValues The new values the wires should take on. + * @param bitVector The new values the wires should take on. * @param startingBit The first index of the subarray of wires. * * @author Fabian Stemmler */ - public void feedSignals(int startingBit, Bit... newValues) + public void feedSignals(int startingBit, BitVector bitVector) { if (!open) throw new RuntimeException("Attempted to write to closed WireArrayEnd."); - Simulation.TIMELINE.addEvent((e) -> setValues(startingBit, newValues), travelTime); + Simulation.TIMELINE.addEvent(e -> setValues(startingBit, bitVector), travelTime); } - private void setValues(int startingBit, Bit... newValues) + private void setValues(int startingBit, BitVector newValues) { - int exclLastIndex = startingBit + newValues.length; - if (length < exclLastIndex) - throw new ArrayIndexOutOfBoundsException( - String.format("Attempted to input bits from index %d to %d when there are only %d wires.", startingBit, - exclLastIndex - 1, length)); - if (!Arrays.equals(inputValues, startingBit, exclLastIndex, newValues, 0, newValues.length)) + // index check covered in equals + if (!inputValues.equalsWithOffset(newValues, startingBit)) { - System.arraycopy(newValues, 0, inputValues, startingBit, newValues.length); + Bit[] vals = inputValues.getBits(); + System.arraycopy(newValues.getBits(), 0, vals, startingBit, newValues.length()); + inputValues = BitVector.of(vals); Wire.this.recalculate(); } } + private void setValues(BitVector newValues) + { + if (inputValues.equals(newValues)) + return; + inputValues = newValues; + Wire.this.recalculate(); + } + /** * @return The value (of bit 0) the {@link WireEnd} is currently feeding into the associated {@link Wire}. */ @@ -290,23 +298,20 @@ public class Wire */ public Bit getInputValue(int index) { - return inputValues[index]; + return inputValues.getBit(index); } /** * @return A copy (safe to modify) of the values the {@link WireEnd} is currently feeding into the associated {@link Wire}. */ - public Bit[] getInputValues() + public BitVector getInputValues() { return getInputValues(0, length); } - public Bit[] getInputValues(int start, int end) + public BitVector getInputValues(int start, int end) { - int length = end - start; - Bit[] bits = new Bit[length]; - System.arraycopy(inputValues, start, bits, 0, length); - return bits; + return inputValues.subVector(start, end); } /** @@ -314,19 +319,19 @@ public class Wire */ public void clearSignals() { - feedSignals(Bit.Z.makeArray(length)); + feedSignals(Z.toVector(length)); } - public Bit[] wireValuesExcludingMe() + public BitVector wireValuesExcludingMe() { - Bit[] bits = Bit.Z.makeArray(length); - for (WireEnd wai : inputs) + BitVectorMutator mutator = BitVectorMutator.empty(); + for (WireEnd wireEnd : inputs) { - if (wai == this) + if (wireEnd == this) continue; - Util.combineInto(bits, wai.getInputValues()); + mutator.join(wireEnd.inputValues); } - return bits; + return mutator.get(); } /** @@ -358,7 +363,7 @@ public class Wire * * @author Fabian Stemmler */ - public Bit[] getValues() + public BitVector getValues() { return Wire.this.getValues(); } @@ -370,7 +375,7 @@ public class Wire * * @author Fabian Stemmler */ - public Bit[] getValues(int start, int end) + public BitVector getValues(int start, int end) { return Wire.this.getValues(start, end); } @@ -415,11 +420,11 @@ public class Wire @Override public String toString() { - return Arrays.toString(values); + return inputValues.toString(); // return String.format("%s \nFeeding: %s", WireArray.this.toString(), Arrays.toString(inputValues)); } - public void disconnect() + public void close() { inputs.remove(this); open = false; @@ -444,7 +449,7 @@ public class Wire @Override public String toString() { - return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), Arrays.toString(values), inputs); + return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), values, inputs); // Arrays.toString(values), inputs.stream().map(i -> Arrays.toString(i.inputValues)).reduce((s1, s2) -> s1 + s2) }