X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FWire.java;h=8feb3e1d3caad2c15510a63634ac8ef8d6a7620f;hb=a89919ed17e728953766d9d617e7db86fcf315ee;hp=8eff2efaf6bd189cb08c3cf90ac636a5bf318a6a;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;p=Mograsim.git diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java index 8eff2efa..8feb3e1d 100644 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java +++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java @@ -25,85 +25,73 @@ public class Wire private BitVector values; public final int travelTime; private List attached = new ArrayList<>(); - public final int length; + public final int width; List inputs = new ArrayList<>(); Timeline timeline; - public Wire(Timeline timeline, int length, int travelTime) + public Wire(Timeline timeline, int width, int travelTime) { - this(timeline, length, travelTime, null); + this(timeline, width, travelTime, null); } - public Wire(Timeline timeline, int length, int travelTime, String name) + public Wire(Timeline timeline, int width, int travelTime, String name) { - if (length < 1) + if (width < 1) throw new IllegalArgumentException( - String.format("Tried to create an array of wires with length %d, but a length of less than 1 makes no sense.", length)); + String.format("Tried to create an array of wires with width %d, but a width of less than 1 makes no sense.", width)); this.name = name; this.timeline = timeline; - this.length = length; + this.width = width; this.travelTime = travelTime; initValues(); } private void initValues() { - values = U.toVector(length); - } - - private void recalculateSingleInput() - { - setNewValues(inputs.get(0).getInputValues()); - } - - private void recalculateMultipleInputs() - { - BitVectorMutator mutator = BitVectorMutator.empty(); - for (ReadWriteEnd wireArrayEnd : inputs) - mutator.join(wireArrayEnd.getInputValues()); - setNewValues(mutator.toBitVector()); + values = U.toVector(width); } private void setNewValues(BitVector newValues) { - if (values.equals(newValues)) - return; -// BitVector oldValues = values; values = newValues; notifyObservers(); } void recalculate() { - switch (inputs.size()) + if (inputs.isEmpty()) + setNewValues(U.toVector(width)); + else { - case 0: - setNewValues(BitVector.of(Bit.U, length)); - break; - case 1: - recalculateSingleInput(); - break; - default: - recalculateMultipleInputs(); + BitVectorMutator mutator = BitVectorMutator.empty(); + for (ReadWriteEnd wireArrayEnd : inputs) + mutator.join(wireArrayEnd.getInputValues()); + setNewValues(mutator.toBitVector()); } } + /** + * Forces a Wire to take on specific values. If the new values differ from the old ones, the observers of the Wire will be notified. + * WARNING! Use this with care! The preferred way of writing the values is ReadWriteEnd.feedSignals(BitVector) + * + * @param values The values the Wire will have immediately after this method is called + */ + public void forceValues(BitVector values) + { + setNewValues(values); + } + /** * 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. + * value), not Bit.U, Bit.X or Bit.Z. false is returned otherwise. * * @author Fabian Stemmler */ public boolean hasNumericValue() { - for (Bit b : values) - { - if (b != Bit.ZERO && b != Bit.ONE) - return false; - } - return true; + return values.isBinary(); } /** @@ -145,23 +133,29 @@ public class Wire public long getSignedValue() { long val = getUnsignedValue(); - long mask = 1 << (length - 1); + long mask = 1 << (width - 1); if ((mask & val) != 0) { - int shifts = 64 - length; + int shifts = 64 - width; return (val << shifts) >> shifts; } return val; } + /** + * Returns the least significant bit (LSB) + */ public Bit getValue() { return getValue(0); } + /** + * Returns the least significant bit (LSB) of the given index + */ public Bit getValue(int index) { - return values.getBit(index); + return values.getLSBit(index); } public BitVector getValues(int start, int end) @@ -182,9 +176,9 @@ public class Wire * * @author Fabian Stemmler */ - void attachEnd(ReadEnd end) + boolean attachEnd(ReadEnd end) { - attached.add(end); + return attached.add(end); } void detachEnd(ReadEnd end) @@ -194,7 +188,7 @@ public class Wire private void notifyObservers() { - attached.forEach(r -> r.update()); + attached.forEach(ReadEnd::update); } /** @@ -216,6 +210,7 @@ public class Wire void registerInput(ReadWriteEnd toRegister) { inputs.add(toRegister); + recalculate(); } /** @@ -241,7 +236,7 @@ public class Wire } /** - * Included for convenient use on {@link Wire}s of length 1. + * Included for convenient use on {@link Wire}s of width 1. * * @return The value of bit 0. * @@ -263,12 +258,6 @@ public class Wire return Wire.this.getValue(index); } - /** - * @param index Index of the requested bit. - * @return The value of the indexed bit. - * - * @author Fabian Stemmler - */ public BitVector getValues() { return Wire.this.getValues(); @@ -336,9 +325,9 @@ public class Wire recalculate(); } - public int length() + public int width() { - return length; + return width; } public Wire getWire() @@ -358,6 +347,16 @@ public class Wire observers.remove(ob); } +// void registerCloseObserver(LogicObserver ob) +// { +// closeObserver.add(ob); +// } +// +// void deregisterCloseObserver(LogicObserver ob) +// { +// closeObserver.remove(ob); +// } + @Override public void notifyObservers() { @@ -367,7 +366,8 @@ public class Wire public class ReadWriteEnd extends ReadEnd { - private boolean open, isWriting; + private boolean open; + private boolean isWriting; private BitVector inputValues; ReadWriteEnd() @@ -381,7 +381,7 @@ public class Wire private void initValues() { - inputValues = U.toVector(length); + inputValues = U.toVector(width); } /** @@ -398,11 +398,11 @@ public class Wire public void feedSignals(BitVector newValues) { - if (newValues.length() != length) + if (newValues.length() != width) throw new IllegalArgumentException( - String.format("Attempted to input %d bits instead of %d bits.", newValues.length(), length)); + String.format("Attempted to input %d bits instead of %d bits.", newValues.length(), width)); if (!open) - throw new RuntimeException("Attempted to write to closed WireArrayEnd."); + throw new IllegalStateException("Attempted to write to closed WireArrayEnd."); timeline.addEvent(e -> setValues(newValues), travelTime); } @@ -417,7 +417,7 @@ public class Wire public void feedSignals(int startingBit, BitVector bitVector) { if (!open) - throw new RuntimeException("Attempted to write to closed WireArrayEnd."); + throw new IllegalStateException("Attempted to write to closed WireArrayEnd."); timeline.addEvent(e -> setValues(startingBit, bitVector), travelTime); } @@ -450,7 +450,8 @@ public class Wire } /** - * @return The value (of bit 0) the {@link ReadEnd} is currently feeding into the associated {@link Wire}. + * @return The value (of bit 0) the {@link ReadEnd} is currently feeding into the associated {@link Wire}.Returns the least + * significant bit (LSB) */ public Bit getInputValue() { @@ -459,10 +460,12 @@ public class Wire /** * @return The value which the {@link ReadEnd} is currently feeding into the associated {@link Wire} at the indexed {@link Bit}. + * Returns the least significant bit (LSB) + * */ public Bit getInputValue(int index) { - return inputValues.getBit(index); + return inputValues.getLSBit(index); } /** @@ -470,7 +473,7 @@ public class Wire */ public BitVector getInputValues() { - return getInputValues(0, length); + return inputValues; } public BitVector getInputValues(int start, int end) @@ -483,18 +486,22 @@ public class Wire */ public void clearSignals() { - feedSignals(Z.toVector(length)); + feedSignals(Z.toVector(width)); } public BitVector wireValuesExcludingMe() { BitVectorMutator mutator = BitVectorMutator.empty(); + boolean modified = false; for (ReadWriteEnd wireEnd : inputs) { if (wireEnd == this) continue; + modified = true; mutator.join(wireEnd.inputValues); } + if (!modified) + mutator.join(BitVector.of(Bit.Z, width)); return mutator.toBitVector(); } @@ -545,31 +552,6 @@ public class Wire return inputs; } - // TODO Fix ReadWriteEnd feeding signals to entire Wire (Z) instead of only selected Bits - /** - * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: - * The bits are permanently fused together. - * - * @param a The {@link Wire} to be (partially) fused with b - * @param b The {@link Wire} to be (partially) fused with a - * @param fromA The first bit of {@link Wire} a to be fused - * @param fromB The first bit of {@link Wire} b to be fused - * @param length The amount of bits to fuse - */ - public static void fuse(Wire a, Wire b, int fromA, int fromB, int length) - { - ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd(); - rA.setWriting(false); - rB.setWriting(false); - rA.setValues(BitVector.of(Bit.Z, a.length)); - rB.setValues(BitVector.of(Bit.Z, b.length)); - Fusion aF = new Fusion(rB, fromA, fromB, length), bF = new Fusion(rA, fromB, fromA, length); - rA.registerObserver(aF); - rB.registerObserver(bF); - aF.update(rA); - bF.update(rB); - } - /** * * Fuses two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: The bits are @@ -580,34 +562,31 @@ public class Wire */ public static void fuse(Wire a, Wire b) { - fuse(a, b, 0, 0, a.length); + fuse(a, b, 0, 0, a.width); } - private static class Fusion implements LogicObserver + /** + * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: + * The bits are permanently fused together. + * + * @param a The {@link Wire} to be (partially) fused with b + * @param b The {@link Wire} to be (partially) fused with a + * @param fromA The first bit of {@link Wire} a to be fused + * @param fromB The first bit of {@link Wire} b to be fused + * @param width The amount of bits to fuse + */ + public static void fuse(Wire a, Wire b, int fromA, int fromB, int width) { - private ReadWriteEnd target; - int fromSource, fromTarget, length; + ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd(); + rA.registerObserver(x -> rB.feedSignals(fromB, rA.wireValuesExcludingMe().subVector(fromA, fromA + width))); + rB.registerObserver(x -> rA.feedSignals(fromA, rB.wireValuesExcludingMe().subVector(fromB, fromB + width))); - public Fusion(ReadWriteEnd target, int fromSource, int fromTarget, int length) - { - this.target = target; - this.fromSource = fromSource; - this.fromTarget = fromTarget; - this.length = length; - } + rA.setValues(0, BitVector.of(Bit.Z, fromA)); + rB.setValues(0, BitVector.of(Bit.Z, fromB)); + rA.setValues(fromA + width, BitVector.of(Bit.Z, a.width - width - fromA)); + rB.setValues(fromB + width, BitVector.of(Bit.Z, b.width - width - fromB)); - @Override - public void update(LogicObservable initiator) - { - ReadWriteEnd source = (ReadWriteEnd) initiator; - if (source.getWire().inputs.size() - (source.isWriting() ? 1 : 0) == 0) - target.setWriting(false); - else - { - target.setWriting(true); - BitVector targetInput = source.wireValuesExcludingMe().subVector(fromSource, fromSource + length); - target.setValues(fromTarget, targetInput); - } - } + rA.notifyObservers(); + rB.notifyObservers(); } } \ No newline at end of file