private BitVector values;
public final int travelTime;
private List<ReadEnd> attached = new ArrayList<>();
- public final int length;
+ public final int width;
List<ReadWriteEnd> 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);
+ values = U.toVector(width);
}
private void setNewValues(BitVector newValues)
{
- if (values.equals(newValues))
- return;
-// BitVector oldValues = values;
values = newValues;
notifyObservers();
}
void recalculate()
{
- if (inputs.size() == 0)
- setNewValues(BitVector.of(Bit.U, length));
+ if (inputs.isEmpty())
+ setNewValues(U.toVector(width));
else
{
BitVectorMutator mutator = BitVectorMutator.empty();
* The {@link Wire} is interpreted as an unsigned integer with n bits.
*
* @return <code>true</code> if all bits are either <code>Bit.ONE</code> or <code>Bit.ZERO</code> (they do not all have to have the same
- * value), not <code>Bit.X</code> or <code>Bit.Z</code>. <code>false</code> is returned otherwise.
+ * value), not <code>Bit.U</code>, <code>Bit.X</code> or <code>Bit.Z</code>. <code>false</code> 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();
}
/**
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;
*
* @author Fabian Stemmler
*/
- void attachEnd(ReadEnd end)
+ boolean attachEnd(ReadEnd end)
{
- attached.add(end);
+ return attached.add(end);
}
void detachEnd(ReadEnd end)
private void notifyObservers()
{
- attached.forEach(r -> r.update());
+ attached.forEach(ReadEnd::update);
}
/**
void registerInput(ReadWriteEnd toRegister)
{
inputs.add(toRegister);
+ recalculate();
}
/**
}
/**
- * 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.
*
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();
recalculate();
}
- public int length()
+ public int width()
{
- return length;
+ return width;
}
public Wire getWire()
observers.remove(ob);
}
+// void registerCloseObserver(LogicObserver ob)
+// {
+// closeObserver.add(ob);
+// }
+//
+// void deregisterCloseObserver(LogicObserver ob)
+// {
+// closeObserver.remove(ob);
+// }
+
@Override
public void notifyObservers()
{
public class ReadWriteEnd extends ReadEnd
{
- private boolean open, isWriting;
+ private boolean open;
+ private boolean isWriting;
private BitVector inputValues;
ReadWriteEnd()
private void initValues()
{
- inputValues = U.toVector(length);
+ inputValues = U.toVector(width);
}
/**
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);
}
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);
}
*/
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();
}
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
*/
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
projects / Mograsim.git / blobdiff