X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FWire.java;h=4063d78fe24c85e05672d272fd47b5e32744b380;hb=178c7c941b932bb2119eb924f096e49f816a3691;hp=b0e96f1db97b1fd834a0c5fc4f27b1bf4a3191fb;hpb=2f2269e36940705063adba3ff89ed7830c0b2edf;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 b0e96f1d..4063d78f 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 @@ -4,6 +4,7 @@ import static net.mograsim.logic.core.types.Bit.U; import static net.mograsim.logic.core.types.Bit.Z; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.mograsim.logic.core.LogicObservable; @@ -22,55 +23,95 @@ import net.mograsim.logic.core.types.BitVector.BitVectorMutator; public class Wire { public final String name; - private BitVector values; + private BitVector cachedValues; public final int travelTime; private List attached = new ArrayList<>(); - public final int length; + public final int width; List inputs = new ArrayList<>(); Timeline timeline; + private Bit[] bitsWithoutFusions; + FusedBit[] fusedBits; - 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); + cachedValues = U.toVector(width); + bitsWithoutFusions = cachedValues.getBits(); } private void setNewValues(BitVector newValues) { - if (values.equals(newValues)) - return; -// BitVector oldValues = values; - values = newValues; + cachedValues = newValues; notifyObservers(); } - void recalculate() + private void invalidateCachedValuesForAllFusedWires() { - if (inputs.size() == 0) - setNewValues(BitVector.of(Bit.U, length)); + invalidateCachedValues(); + if (fusedBits != null) + for (FusedBit fusion : fusedBits) + if (fusion != null) + fusion.invalidateCachedValuesForAllParticipatingWires(); + } + + private void invalidateCachedValues() + { + cachedValues = null; + notifyObservers(); + } + + void recalculateValuesWithoutFusions() + { + Bit[] bits = new Bit[width]; + if (inputs.isEmpty()) + Arrays.fill(bits, U); else { - BitVectorMutator mutator = BitVectorMutator.empty(); - for (ReadWriteEnd wireArrayEnd : inputs) - mutator.join(wireArrayEnd.getInputValues()); - setNewValues(mutator.toBitVector()); + System.arraycopy(inputs.get(0).getInputValues().getBits(), 0, bits, 0, width); + for (int i = 1; i < inputs.size(); i++) + Bit.join(bits, inputs.get(i).getInputValues().getBits()); + } + bitsWithoutFusions = bits; + if (fusedBits == null) + setNewValues(BitVector.of(bits)); + else + invalidateCachedValuesForAllFusedWires(); + } + + private void recalculatedCachedValues() + { + Bit[] bits; + if (fusedBits == null) + bits = bitsWithoutFusions; + else + { + bits = new Bit[width]; + for (int i = 0; i < width; i++) + { + FusedBit fusion = fusedBits[i]; + if (fusion == null) + bits[i] = bitsWithoutFusions[i]; + else + bits[i] = fusion.getValue(); + } } + cachedValues = BitVector.of(bits); } /** @@ -88,18 +129,13 @@ public class Wire * 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 getValues().isBinary(); } /** @@ -113,7 +149,7 @@ public class Wire { long val = 0; long mask = 1; - for (Bit bit : values) + for (Bit bit : getValues()) { switch (bit) { @@ -141,10 +177,10 @@ 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; @@ -163,17 +199,19 @@ public class Wire */ public Bit getValue(int index) { - return values.getLSBit(index); + return getValues().getLSBit(index); } public BitVector getValues(int start, int end) { - return values.subVector(start, end); + return getValues().subVector(start, end); } public BitVector getValues() { - return values; + if (cachedValues == null) + recalculatedCachedValues(); + return cachedValues; } /** @@ -184,9 +222,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) @@ -196,7 +234,7 @@ public class Wire private void notifyObservers() { - attached.forEach(r -> r.update()); + attached.forEach(ReadEnd::update); } /** @@ -218,6 +256,7 @@ public class Wire void registerInput(ReadWriteEnd toRegister) { inputs.add(toRegister); + recalculateValuesWithoutFusions(); } /** @@ -243,7 +282,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. * @@ -265,12 +304,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(); @@ -335,12 +368,12 @@ public class Wire { inputs.remove(this); detachEnd(this); - recalculate(); + recalculateValuesWithoutFusions(); } - public int length() + public int width() { - return length; + return width; } public Wire getWire() @@ -360,6 +393,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() { @@ -369,7 +412,8 @@ public class Wire public class ReadWriteEnd extends ReadEnd { - private boolean open, isWriting; + private boolean open; + private boolean isWriting; private BitVector inputValues; ReadWriteEnd() @@ -383,7 +427,7 @@ public class Wire private void initValues() { - inputValues = U.toVector(length); + inputValues = U.toVector(width); } /** @@ -400,11 +444,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); } @@ -419,7 +463,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); } @@ -435,7 +479,7 @@ public class Wire Bit[] vals = inputValues.getBits(); System.arraycopy(newValues.getBits(), 0, vals, startingBit, newValues.length()); inputValues = BitVector.of(vals); - Wire.this.recalculate(); + Wire.this.recalculateValuesWithoutFusions(); } } @@ -448,7 +492,7 @@ public class Wire if (inputValues.equals(newValues)) return; inputValues = newValues; - Wire.this.recalculate(); + Wire.this.recalculateValuesWithoutFusions(); } /** @@ -488,18 +532,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(); } @@ -525,7 +573,7 @@ public class Wire inputs.add(this); else inputs.remove(this); - Wire.this.recalculate(); + Wire.this.recalculateValuesWithoutFusions(); } } @@ -539,7 +587,7 @@ public class Wire public String toString() { String name = this.name == null ? String.format("0x%08x", hashCode()) : this.name; - return String.format("wire %s value: %s inputs: %s", name, values, inputs); + return String.format("wire %s value: %s inputs: %s", name, getValues(), inputs); } public static ReadEnd[] extractEnds(Wire[] w) @@ -550,69 +598,126 @@ public class Wire return inputs; } - // TODO Fix ReadWriteEnd feeding signals to entire Wire (Z) instead of only selected Bits + /** + * + * Fuses 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 fused with b + * @param b The {@link Wire} to be fused with a + */ + public static void fuse(Wire a, Wire b) + { + fuse(a, b, 0, 0, a.width); + } + /** * 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 + * @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 length) + public static void fuse(Wire a, Wire b, int fromA, int fromB, int width) { - 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); + // iterate in this direction to be fail-fast (rely on the checks in fuse(Wire, Wire, int, int) + for (int i = width - 1; i >= 0; i--) + fuse(a, b, fromA + i, fromB + i); } /** + * Fuses one bit of two wires together. If this bit changes in one Wire, the other is changed accordingly immediately. Warning: The bits + * are permanently fused together. * - * Fuses 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 fused with b - * @param b The {@link Wire} to be fused with a + * @param a The {@link Wire} to be (partially) fused with b + * @param b The {@link Wire} to be (partially) fused with a + * @param bitA The bit of {@link Wire} a to be fused + * @param bitB The bit of {@link Wire} b to be fused */ - public static void fuse(Wire a, Wire b) + private static void fuse(Wire a, Wire b, int bitA, int bitB) { - fuse(a, b, 0, 0, a.length); + if (bitA >= a.width) + throw new IllegalArgumentException("No bit " + bitA + " in " + a + " (width " + a.width + ")"); + if (bitB >= b.width) + throw new IllegalArgumentException("No bit " + bitB + " in " + b + " (width " + b.width + ")"); + if (a.fusedBits == null) + a.fusedBits = new FusedBit[a.width]; + if (b.fusedBits == null) + b.fusedBits = new FusedBit[b.width]; + FusedBit oldFusionA = a.fusedBits[bitA]; + FusedBit oldFusionB = b.fusedBits[bitB]; + if (oldFusionA == null) + if (oldFusionB == null) + { + FusedBit fusion = new FusedBit(); + fusion.addParticipatingWireBit(a, bitA); + fusion.addParticipatingWireBit(b, bitB); + } else + oldFusionB.addParticipatingWireBit(a, bitA); + else if (oldFusionB == null) + oldFusionA.addParticipatingWireBit(b, bitB); + else + oldFusionA.mergeOtherIntoThis(oldFusionB); } - private static class Fusion implements LogicObserver + private static class FusedBit { - private ReadWriteEnd target; - int fromSource, fromTarget, length; + private final List participatingWireBits; - public Fusion(ReadWriteEnd target, int fromSource, int fromTarget, int length) + public FusedBit() { - this.target = target; - this.fromSource = fromSource; - this.fromTarget = fromTarget; - this.length = length; + this.participatingWireBits = new ArrayList<>(); } - @Override - public void update(LogicObservable initiator) + public void addParticipatingWireBit(Wire w, int bit) { - 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); - } + addParticipatingWireBit(new WireBit(w, bit)); + } + + private void addParticipatingWireBit(WireBit wb) + { + wb.wire.fusedBits[wb.bit] = this; + participatingWireBits.add(wb); + wb.wire.invalidateCachedValuesForAllFusedWires(); + } + + public void mergeOtherIntoThis(FusedBit other) + { + for (WireBit wb : other.participatingWireBits) + addParticipatingWireBit(wb); + } + + public void invalidateCachedValuesForAllParticipatingWires() + { + for (WireBit wb : participatingWireBits) + wb.wire.invalidateCachedValues(); + } + + public Bit getValue() + { + Bit result = null; + for (WireBit wb : participatingWireBits) + if (!wb.wire.inputs.isEmpty()) + { + Bit bit = wb.wire.bitsWithoutFusions[wb.bit]; + result = result == null ? bit : result.join(bit); + } + return result == null ? U : result; + } + } + + private static class WireBit + { + public final Wire wire; + public final int bit; + + public WireBit(Wire wire, int bit) + { + this.wire = wire; + this.bit = bit; } } } \ No newline at end of file