X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fwires%2FWire.java;h=1b26a15d0ae5c379c4c60e5b73c00350667b7856;hb=2ccdd5a2ed812bc4eb864ab4fbb1adb1c723a1c9;hp=5eac8894371b687fc7f7102a507ee3ff46a5c12c;hpb=c1d0ddc342c482051fa6c455bb286617135bd3c3;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 5eac8894..1b26a15d 100644 --- a/era.mi/src/era/mi/logic/wires/Wire.java +++ b/era.mi/src/era/mi/logic/wires/Wire.java @@ -19,7 +19,7 @@ public class Wire { private Bit[] values; public final int travelTime; - private List observers = new ArrayList(); + private List observers = new ArrayList(); public final int length; private List inputs = new ArrayList(); @@ -60,12 +60,7 @@ public class Wire Bit[] bits = input.getInputValues(); for (int i = 0; i < length; i++) { - if (Bit.Z.equals(bits[i]) || newValues[i].equals(bits[i])) - continue; - else if (Bit.Z.equals(newValues[i])) - newValues[i] = bits[i]; - else - newValues[i] = Bit.X; + newValues[i] = newValues[i].combineWith(bits[i]); } } @@ -182,21 +177,21 @@ public class Wire } /** - * Adds an {@link WireArrayObserver}, who will be notified when the value of the {@link Wire} is updated. + * Adds an {@link WireObserver}, who will be notified when the value of the {@link Wire} is updated. * - * @param ob The {@link WireArrayObserver} to be notified of changes. - * @return true if the given {@link WireArrayObserver} was not already registered, false otherwise + * @param ob The {@link WireObserver} to be notified of changes. + * @return true if the given {@link WireObserver} was not already registered, false otherwise * * @author Fabian Stemmler */ - public boolean addObserver(WireArrayObserver ob) + public boolean addObserver(WireObserver ob) { return observers.add(ob); } private void notifyObservers(Bit[] oldValues) { - for (WireArrayObserver o : observers) + for (WireObserver o : observers) o.update(this, oldValues); } @@ -205,7 +200,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) @@ -215,8 +218,8 @@ public class Wire /** * A {@link WireEnd} feeds a constant signal into the {@link Wire} it is tied to. The combination of all inputs determines the - * {@link Wire}s final value. X dominates all other inputs Z does not affect the final value, unless there are no other inputs than - * Z 0 and 1 turn into X when they are mixed + * {@link Wire}s final value. X dominates all other inputs Z does not affect the final value, unless there are no other inputs than Z 0 + * and 1 turn into X when they are mixed * * @author Fabian Stemmler */ @@ -225,17 +228,18 @@ public class Wire private boolean open; private Bit[] inputValues; - private WireEnd() + private WireEnd(boolean readOnly) { super(); open = true; initValues(); - registerInput(this); + if (!readOnly) + registerInput(this); } private void initValues() { - inputValues = Bit.Z.makeArray(length); + inputValues = Bit.U.makeArray(length); } /** @@ -247,12 +251,10 @@ public class Wire */ public void feedSignals(Bit... newValues) { - if (newValues.length == length) - { - feedSignals(0, newValues); - } else + if (newValues.length != length) throw new IllegalArgumentException( String.format("Attempted to input %d bits instead of %d bits.", newValues.length, length)); + feedSignals(0, newValues); } /** @@ -299,16 +301,15 @@ public class Wire { return inputValues[index]; } - + /** - * @return A copy (safe to modify) of the values the {@link WireEnd} is currently feeding into the associated - * {@link Wire}. + * @return A copy (safe to modify) of the values the {@link WireEnd} is currently feeding into the associated {@link Wire}. */ public Bit[] getInputValues() { return getInputValues(0, length); } - + public Bit[] getInputValues(int start, int end) { int length = end - start; @@ -359,7 +360,7 @@ public class Wire { return Wire.this.getValue(index); } - + /** * @param index Index of the requested bit. * @return The value of the indexed bit. @@ -373,8 +374,8 @@ public class Wire /** * @param start Start of the wanted segment. (inclusive) - * @param end End of the wanted segment. (exclusive) - * @return The values of the segment of {@link Bit}s indexed. + * @param end End of the wanted segment. (exclusive) + * @return The values of the segment of {@link Bit}s indexed. * * @author Fabian Stemmler */ @@ -382,13 +383,12 @@ public class Wire { return Wire.this.getValues(start, end); } - /** * The {@link Wire} is interpreted as an unsigned integer with n bits. * - * @return true if all bits are either Bit.ONE or Bit.ZERO (they do not all have to have the same - * value), not Bit.X or Bit.Z. false is returned otherwise. + * @return true if all bits are either Bit.ONE or Bit.ZERO (they do not all have to have the + * same value), not Bit.X or Bit.Z. false is returned otherwise. * * @author Fabian Stemmler */ @@ -420,15 +420,15 @@ public class Wire { return Wire.this.getSignedValue(); } - + @Override public String toString() { - return Arrays.toString(values); - //return String.format("%s \nFeeding: %s", WireArray.this.toString(), Arrays.toString(inputValues)); + return Arrays.toString(inputValues); + // return String.format("%s \nFeeding: %s", WireArray.this.toString(), Arrays.toString(inputValues)); } - public void disconnect() + public void close() { inputs.remove(this); open = false; @@ -439,22 +439,22 @@ public class Wire return length; } - public boolean addObserver(WireArrayObserver ob) + public boolean addObserver(WireObserver ob) { return Wire.this.addObserver(ob); } - + public Wire getWire() { return Wire.this; } } - + @Override public String toString() { return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), Arrays.toString(values), inputs); - //Arrays.toString(values), inputs.stream().map(i -> Arrays.toString(i.inputValues)).reduce((s1, s2) -> s1 + s2) + // Arrays.toString(values), inputs.stream().map(i -> Arrays.toString(i.inputValues)).reduce((s1, s2) -> s1 + s2) } public static WireEnd[] extractEnds(Wire[] w)