From: Fabian Stemmler Date: Mon, 20 May 2019 14:31:09 +0000 (+0200) Subject: new WireEnds as in/outputs are now initialized with U again X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=2ccdd5a2ed812bc4eb864ab4fbb1adb1c723a1c9;p=Mograsim.git new WireEnds as in/outputs are now initialized with U again added method createReadOnlyEnd() to Wire updated ComponentTest accordingly --- diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/era/mi/logic/tests/ComponentTest.java index c14fd01d..f6d801fd 100644 --- a/era.mi/src/era/mi/logic/tests/ComponentTest.java +++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java @@ -35,11 +35,11 @@ class ComponentTest Simulation.TIMELINE.reset(); Wire a = new Wire(1, 1), b = new Wire(1, 1), c = new Wire(1, 10), d = new Wire(2, 1), e = new Wire(1, 1), f = new Wire(1, 1), g = new Wire(1, 1), h = new Wire(2, 1), i = new Wire(2, 1), j = new Wire(1, 1), k = new Wire(1, 1); - new AndGate(1, f.createEnd(), a.createEnd(), b.createEnd()); - new NotGate(1, f.createEnd(), g.createEnd()); - new Merger(h.createEnd(), c.createEnd(), g.createEnd()); - new Mux(1, i.createEnd(), e.createEnd(), h.createEnd(), d.createEnd()); - new Splitter(i.createEnd(), k.createEnd(), j.createEnd()); + new AndGate(1, f.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); + new NotGate(1, f.createReadOnlyEnd(), g.createEnd()); + new Merger(h.createEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd()); + new Mux(1, i.createEnd(), e.createReadOnlyEnd(), h.createReadOnlyEnd(), d.createReadOnlyEnd()); + new Splitter(i.createReadOnlyEnd(), k.createEnd(), j.createEnd()); a.createEnd().feedSignals(Bit.ZERO); b.createEnd().feedSignals(Bit.ONE); @@ -59,7 +59,7 @@ class ComponentTest Simulation.TIMELINE.reset(); Wire a = new Wire(3, 1), b = new Wire(2, 1), c = new Wire(3, 1), in = new Wire(8, 1); in.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - new Splitter(in.createEnd(), a.createEnd(), b.createEnd(), c.createEnd()); + new Splitter(in.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd()); Simulation.TIMELINE.executeAll(); @@ -77,7 +77,7 @@ class ComponentTest b.createEnd().feedSignals(Bit.ONE, Bit.ZERO); c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - new Merger(out.createEnd(), a.createEnd(), b.createEnd(), c.createEnd()); + new Merger(out.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); Simulation.TIMELINE.executeAll(); @@ -89,9 +89,9 @@ class ComponentTest void triStateBufferTest() { Wire a = new Wire(1, 1), b = new Wire(1, 1), en = new Wire(1, 1), notEn = new Wire(1, 1); - new NotGate(1, en.createEnd(), notEn.createEnd()); - new TriStateBuffer(1, a.createEnd(), b.createEnd(), en.createEnd()); - new TriStateBuffer(1, b.createEnd(), a.createEnd(), notEn.createEnd()); + new NotGate(1, en.createReadOnlyEnd(), notEn.createEnd()); + new TriStateBuffer(1, a.createReadOnlyEnd(), b.createEnd(), en.createReadOnlyEnd()); + new TriStateBuffer(1, b.createReadOnlyEnd(), a.createEnd(), notEn.createReadOnlyEnd()); WireEnd enI = en.createEnd(), aI = a.createEnd(), bI = b.createEnd(); enI.feedSignals(Bit.ONE); @@ -129,7 +129,7 @@ class ComponentTest a.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); c.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - new Mux(1, out.createEnd(), select.createEnd(), a.createEnd(), b.createEnd(), c.createEnd()); + new Mux(1, out.createEnd(), select.createReadOnlyEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); Simulation.TIMELINE.executeAll(); assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); @@ -155,7 +155,7 @@ class ComponentTest selectIn.feedSignals(Bit.ZERO, Bit.ZERO); in.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - new Demux(1, in.createEnd(), select.createEnd(), a.createEnd(), b.createEnd(), c.createEnd()); + new Demux(1, in.createReadOnlyEnd(), select.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd()); Simulation.TIMELINE.executeAll(); assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); @@ -182,7 +182,7 @@ class ComponentTest { Simulation.TIMELINE.reset(); Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1); - new AndGate(1, c.createEnd(), a.createEnd(), b.createEnd()); + new AndGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); @@ -196,7 +196,7 @@ class ComponentTest { Simulation.TIMELINE.reset(); Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1); - new OrGate(1, c.createEnd(), a.createEnd(), b.createEnd()); + new OrGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); @@ -210,7 +210,7 @@ class ComponentTest { Simulation.TIMELINE.reset(); Wire a = new Wire(3, 1), b = new Wire(3, 2), c = new Wire(3, 1), d = new Wire(3, 1); - new XorGate(1, d.createEnd(), a.createEnd(), b.createEnd(), c.createEnd()); + new XorGate(1, d.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); b.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); @@ -225,7 +225,7 @@ class ComponentTest { Simulation.TIMELINE.reset(); Wire a = new Wire(3, 1), b = new Wire(3, 2); - new NotGate(1, a.createEnd(), b.createEnd()); + new NotGate(1, a.createReadOnlyEnd(), b.createEnd()); a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); Simulation.TIMELINE.executeAll(); @@ -239,10 +239,10 @@ class ComponentTest Simulation.TIMELINE.reset(); Wire r = new Wire(1, 1), s = new Wire(1, 1), t1 = new Wire(1, 15), t2 = new Wire(1, 1), q = new Wire(1, 1), nq = new Wire(1, 1); - new OrGate(1, t2.createEnd(), r.createEnd(), nq.createEnd()); - new OrGate(1, t1.createEnd(), s.createEnd(), q.createEnd()); - new NotGate(1, t2.createEnd(), q.createEnd()); - new NotGate(1, t1.createEnd(), nq.createEnd()); + new OrGate(1, t2.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd()); + new OrGate(1, t1.createEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd()); + new NotGate(1, t2.createReadOnlyEnd(), q.createEnd()); + new NotGate(1, t1.createReadOnlyEnd(), nq.createEnd()); WireEnd sIn = s.createEnd(), rIn = r.createEnd(); @@ -321,8 +321,8 @@ class ComponentTest WireEnd bI = b.createEnd(); WireEnd cI = c.createEnd(); - TestBitDisplay test = new TestBitDisplay(c.createEnd()); - TestBitDisplay test2 = new TestBitDisplay(a.createEnd()); + TestBitDisplay test = new TestBitDisplay(c.createReadOnlyEnd()); + TestBitDisplay test2 = new TestBitDisplay(a.createReadOnlyEnd()); LongConsumer print = time -> System.out.format("Time %2d\n a: %s\n b: %s\n c: %s\n", time, a, b, c); cI.feedSignals(Bit.ONE); diff --git a/era.mi/src/era/mi/logic/tests/Connector.java b/era.mi/src/era/mi/logic/tests/Connector.java deleted file mode 100644 index 39645bfc..00000000 --- a/era.mi/src/era/mi/logic/tests/Connector.java +++ /dev/null @@ -1,39 +0,0 @@ -package era.mi.logic.tests; - -import era.mi.logic.Bit; -import era.mi.logic.Simulation; -import era.mi.logic.wires.Wire; -import era.mi.logic.wires.Wire.WireEnd; -import era.mi.logic.wires.WireObserver; - -public class Connector implements WireObserver -{ - private final Wire a; -// private final WireArray b; - private final WireEnd aI; - private final WireEnd bI; - - public Connector(Wire a, Wire b) - { - if (a.length != b.length) - throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length, b.length)); - this.a = a; -// this.b = b; - a.addObserver(this); - b.addObserver(this); - aI = a.createEnd(); - bI = b.createEnd(); - } - - @Override - public void update(Wire initiator, Bit[] oldValues) - { - Simulation.TIMELINE.addEvent((e) -> - { - if (initiator == a) - bI.feedSignals(aI.wireValuesExcludingMe()); - else - aI.feedSignals(bI.wireValuesExcludingMe()); - }, 1); - } -} diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/era/mi/logic/tests/GUITest.java index b8c4937d..b93d4b6b 100644 --- a/era.mi/src/era/mi/logic/tests/GUITest.java +++ b/era.mi/src/era/mi/logic/tests/GUITest.java @@ -282,7 +282,7 @@ public class GUITest extends JPanel gt.repaint(12); try { - Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0)); + Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0)); } catch (Exception e) { diff --git a/era.mi/src/era/mi/logic/wires/Wire.java b/era.mi/src/era/mi/logic/wires/Wire.java index 4c245712..1b26a15d 100644 --- a/era.mi/src/era/mi/logic/wires/Wire.java +++ b/era.mi/src/era/mi/logic/wires/Wire.java @@ -200,7 +200,15 @@ public class Wire */ public WireEnd createEnd() { - return new WireEnd(); + return new WireEnd(false); + } + + /** + * Create a {@link WireEnd} object, which is tied to this {@link Wire}. This {@link WireEnd} cannot written to. + */ + public WireEnd createReadOnlyEnd() + { + return new WireEnd(true); } private void registerInput(WireEnd toRegister) @@ -220,17 +228,18 @@ public class Wire private boolean open; private Bit[] inputValues; - private WireEnd() + private WireEnd(boolean readOnly) { super(); open = true; initValues(); - registerInput(this); + if (!readOnly) + registerInput(this); } private void initValues() { - inputValues = Bit.Z.makeArray(length); + inputValues = Bit.U.makeArray(length); } /** @@ -415,11 +424,11 @@ public class Wire @Override public String toString() { - return Arrays.toString(values); + return Arrays.toString(inputValues); // return String.format("%s \nFeeding: %s", WireArray.this.toString(), Arrays.toString(inputValues)); } - public void disconnect() + public void close() { inputs.remove(this); open = false;