X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FConnector.java;h=7887ff2573663eed3d4264d4e2fcc6ceb31ca972;hb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;hp=d59ee8c0f59a2001643e87f87c20a7f9642956b3;hpb=d31f9734d6aa233682ef80d7e9322dd500123bfd;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/tests/Connector.java b/era.mi/src/era/mi/logic/tests/Connector.java index d59ee8c0..7887ff25 100644 --- a/era.mi/src/era/mi/logic/tests/Connector.java +++ b/era.mi/src/era/mi/logic/tests/Connector.java @@ -1,5 +1,6 @@ package era.mi.logic.tests; +import era.mi.logic.Bit; import era.mi.logic.Simulation; import era.mi.logic.wires.WireArray; import era.mi.logic.wires.WireArray.WireArrayInput; @@ -15,7 +16,7 @@ public class Connector implements WireArrayObserver public Connector(WireArray a, WireArray b) { if (a.length != b.length) - throw new IllegalArgumentException("WireArray width does not match: " + a.length + ", " + b.length); + throw new IllegalArgumentException(String.format("WireArray width does not match: %o, %o", a.length, b.length)); this.a = a; this.b = b; a.addObserver(this); @@ -25,14 +26,14 @@ public class Connector implements WireArrayObserver } @Override - public void update(WireArray initiator) + public void update(WireArray initiator, Bit[] oldValues) { Simulation.TIMELINE.addEvent((e) -> { if (initiator == a) - bI.feedSignals(a.getValues()); + bI.feedSignals(aI.wireValuesExcludingMe()); else - aI.feedSignals(b.getValues()); + aI.feedSignals(bI.wireValuesExcludingMe()); }, 1); } }