Made Wire.fuse(Wire, Wire, int, int int) public

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / wires / Wire.java

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 bae4cb4..fc7d346 100644 (file)
--- 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
@@ -78,7 +78,8 @@ public class Wire
                switch (inputs.size())
                {
                case 0:
-                       return;
+                       setNewValues(BitVector.of(Bit.U, length));
+                       break;
                case 1:
                        recalculateSingleInput();
                        break;
@@ -366,13 +367,14 @@ public class Wire
 
        public class ReadWriteEnd extends ReadEnd
        {
-               private boolean open;
+               private boolean open, isWriting;
                private BitVector inputValues;
 
                ReadWriteEnd()
                {
                        super();
                        open = true;
+                       isWriting = true;
                        initValues();
                        registerInput(this);
                }
@@ -419,7 +421,11 @@ public class Wire
                        timeline.addEvent(e -> setValues(startingBit, bitVector), travelTime);
                }
 
-               private void setValues(int startingBit, BitVector newValues)
+               /**
+                * Sets the values that are being fed into the {@link Wire}. The preferred way of setting {@link ReadWriteEnd} values is via
+                * feedValues(...) with a delay.
+                */
+               void setValues(int startingBit, BitVector newValues)
                {
                        // index check covered in equals
                        if (!inputValues.equalsWithOffset(newValues, startingBit))
@@ -431,7 +437,11 @@ public class Wire
                        }
                }
 
-               private void setValues(BitVector newValues)
+               /**
+                * Sets the values that are being fed into the {@link Wire}. The preferred way of setting {@link ReadWriteEnd} values is via
+                * feedValues(...) with a delay.
+                */
+               void setValues(BitVector newValues)
                {
                        if (inputValues.equals(newValues))
                                return;
@@ -493,6 +503,31 @@ public class Wire
                {
                        return inputValues.toString();
                }
+
+               @Override
+               public void close()
+               {
+                       super.close();
+                       open = false;
+               }
+
+               void setWriting(boolean isWriting)
+               {
+                       if (this.isWriting != isWriting)
+                       {
+                               this.isWriting = isWriting;
+                               if (isWriting)
+                                       inputs.add(this);
+                               else
+                                       inputs.remove(this);
+                               Wire.this.recalculate();
+                       }
+               }
+
+               boolean isWriting()
+               {
+                       return isWriting;
+               }
        }
 
        @Override
@@ -509,4 +544,70 @@ public class Wire
                        inputs[i] = w[i].createReadWriteEnd();
                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
+        * 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.length);
+       }
+
+       private static class Fusion implements LogicObserver
+       {
+               private ReadWriteEnd target;
+               int fromSource, fromTarget, length;
+
+               public Fusion(ReadWriteEnd target, int fromSource, int fromTarget, int length)
+               {
+                       this.target = target;
+                       this.fromSource = fromSource;
+                       this.fromTarget = fromTarget;
+                       this.length = length;
+               }
+
+               @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);
+                       }
+               }
+       }
 }
\ No newline at end of file