Fusing Wires will no longer initialize Wires with value U

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
index cc170cb..9c5a615 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/tests/ComponentTest.java
@@ -101,6 +101,7 @@ class ComponentTest
                rB.feedSignals(Bit.ONE, Bit.ZERO);\r
                ReadWriteEnd rC = c.createReadWriteEnd();\r
                rC.feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
+\r
                t.executeAll();\r
                assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
                out.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
@@ -123,11 +124,39 @@ class ComponentTest
                t.reset();\r
                Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);\r
                Wire.fuse(a, b);\r
-               a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.U, Bit.Z);\r
+               ReadWriteEnd rw = a.createReadWriteEnd();\r
+               t.executeAll();\r
+               assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U);\r
+\r
+               rw.feedSignals(Bit.ONE, Bit.U, Bit.Z);\r
                t.executeAll();\r
                assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.U, Bit.Z);\r
        }\r
 \r
+       @Test\r
+       void fusionTest3()\r
+       {\r
+               t.reset();\r
+               Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);\r
+               a.createReadWriteEnd().feedSignals(Bit.Z, Bit.U, Bit.X);\r
+               t.executeAll();\r
+               Wire.fuse(a, b);\r
+               t.executeAll();\r
+               assertBitArrayEquals(b.getValues(), Bit.Z, Bit.U, Bit.X);\r
+       }\r
+\r
+//     @Test\r
+//     void connectorTest()\r
+//     {\r
+//             t.reset();\r
+//             Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1);\r
+//             new Connector(t, a.createReadWriteEnd(), b.createReadWriteEnd()).connect();\r
+////           b.createReadWriteEnd();\r
+//             a.createReadWriteEnd();\r
+//             t.executeAll();\r
+//             assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U);\r
+//     }\r
+\r
        @Test\r
        void triStateBufferTest()\r
        {\r

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 13e8359..a1361b0 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())\r
                {\r
                case 0:\r
-                       return;\r
+                       setNewValues(BitVector.of(Bit.U, length));\r
+                       break;\r
                case 1:\r
                        recalculateSingleInput();\r
                        break;\r
@@ -366,13 +367,14 @@ public class Wire
 \r
        public class ReadWriteEnd extends ReadEnd\r
        {\r
-               private boolean open;\r
+               private boolean open, isWriting;\r
                private BitVector inputValues;\r
 \r
                ReadWriteEnd()\r
                {\r
                        super();\r
                        open = true;\r
+                       isWriting = true;\r
                        initValues();\r
                        registerInput(this);\r
                }\r
@@ -501,6 +503,31 @@ public class Wire
                {\r
                        return inputValues.toString();\r
                }\r
+\r
+               @Override\r
+               public void close()\r
+               {\r
+                       super.close();\r
+                       open = false;\r
+               }\r
+\r
+               void setWriting(boolean isWriting)\r
+               {\r
+                       if (this.isWriting != isWriting)\r
+                       {\r
+                               this.isWriting = isWriting;\r
+                               if (isWriting)\r
+                                       inputs.add(this);\r
+                               else\r
+                                       inputs.remove(this);\r
+                               Wire.this.recalculate();\r
+                       }\r
+               }\r
+\r
+               boolean isWriting()\r
+               {\r
+                       return isWriting;\r
+               }\r
        }\r
 \r
        @Override\r
@@ -518,31 +545,36 @@ public class Wire
                return inputs;\r
        }\r
 \r
+       // TODO Fix ReadWriteEnd feeding signals to entire Wire (Z) instead of only selected Bits\r
        /**\r
-        * @formatter:off\r
-        * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately.\r
-        * Warning: The bits are permanently fused together.\r
-        * @formatter:on\r
-        * @param a The {@link Wire} to be (partially) fused with b\r
-        * @param b The {@link Wire} to be (partially) fused with a\r
-        * @param fromA The first bit of {@link Wire} a to be fused\r
-        * @param fromB The first bit of {@link Wire} b to be fused\r
+        * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning:\r
+        * The bits are permanently fused together.\r
+        * \r
+        * @param a      The {@link Wire} to be (partially) fused with b\r
+        * @param b      The {@link Wire} to be (partially) fused with a\r
+        * @param fromA  The first bit of {@link Wire} a to be fused\r
+        * @param fromB  The first bit of {@link Wire} b to be fused\r
         * @param length The amount of bits to fuse\r
         */\r
-       public static void fuse(Wire a, Wire b, int fromA, int fromB, int length)\r
+       private static void fuse(Wire a, Wire b, int fromA, int fromB, int length)\r
        {\r
                ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd();\r
+               rA.setWriting(false);\r
+               rB.setWriting(false);\r
                rA.setValues(BitVector.of(Bit.Z, a.length));\r
                rB.setValues(BitVector.of(Bit.Z, b.length));\r
-               rA.registerObserver(new Fusion(rB, fromA, fromB, length));\r
-               rB.registerObserver(new Fusion(rA, fromB, fromA, length));\r
+               Fusion aF = new Fusion(rB, fromA, fromB, length), bF = new Fusion(rA, fromB, fromA, length);\r
+               rA.registerObserver(aF);\r
+               rB.registerObserver(bF);\r
+               aF.update(rA);\r
+               bF.update(rB);\r
        }\r
 \r
        /**\r
-        * @formatter:off\r
-        * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately.\r
-        * Warning: The bits are permanently fused together.\r
-        * @formatter:on\r
+        * \r
+        * Fuses two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: The bits are\r
+        * permanently fused together.\r
+        * \r
         * @param a The {@link Wire} to be fused with b\r
         * @param b The {@link Wire} to be fused with a\r
         */\r
@@ -568,10 +600,14 @@ public class Wire
                public void update(LogicObservable initiator)\r
                {\r
                        ReadWriteEnd source = (ReadWriteEnd) initiator;\r
-                       BitVector targetInput = (source.getWire().inputs.size() > 1)\r
-                                       ? source.wireValuesExcludingMe().subVector(fromSource, fromSource + length)\r
-                                       : BitVector.of(Bit.Z, length);\r
-                       target.setValues(fromTarget, targetInput);\r
+                       if (source.getWire().inputs.size() - (source.isWriting() ? 1 : 0) == 0)\r
+                               target.setWriting(false);\r
+                       else\r
+                       {\r
+                               target.setWriting(true);\r
+                               BitVector targetInput = source.wireValuesExcludingMe().subVector(fromSource, fromSource + length);\r
+                               target.setValues(fromTarget, targetInput);\r
+                       }\r
                }\r
        }\r
 }
\ No newline at end of file