X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FWire.java;h=8eff2efaf6bd189cb08c3cf90ac636a5bf318a6a;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=479054a7e6af77dff0b3863f4c185f93ae9e11f5;hpb=edc380bf3089885d78653b4a5da5439558e4795c;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 479054a7..8eff2efa 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 @@ -61,7 +61,7 @@ public class Wire BitVectorMutator mutator = BitVectorMutator.empty(); for (ReadWriteEnd wireArrayEnd : inputs) mutator.join(wireArrayEnd.getInputValues()); - setNewValues(mutator.get()); + setNewValues(mutator.toBitVector()); } private void setNewValues(BitVector newValues) @@ -495,7 +495,7 @@ public class Wire continue; mutator.join(wireEnd.inputValues); } - return mutator.get(); + return mutator.toBitVector(); } @Override @@ -556,7 +556,7 @@ public class Wire * @param fromB The first bit of {@link Wire} b to be fused * @param length The amount of bits to fuse */ - private 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 length) { ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd(); rA.setWriting(false);