X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FConnector.java;h=89fb96eb4d6737ec44548f19458c8edc4d20e513;hb=70afb26181aba8de30ea6f796ea5c2a573d9ecab;hp=2a9d5ae38adb6753cebc2377c70560a43b37ea63;hpb=fb957af9f642560f3a97bcab0d9d09c233291baa;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Connector.java b/era.mi/src/era/mi/logic/components/Connector.java
index 2a9d5ae3..89fb96eb 100644
--- a/era.mi/src/era/mi/logic/components/Connector.java
+++ b/era.mi/src/era/mi/logic/components/Connector.java
@@ -1,79 +1,75 @@
-package era.mi.logic.components;
-
-import java.util.List;
-
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
-import era.mi.logic.wires.WireArrayObserver;
-
-public class Connector implements WireArrayObserver, Component
-{
-	private boolean connected;
-	private final WireArray a;
-	private final WireArray b;
-	private final WireArrayEnd aI;
-	private final WireArrayEnd bI;
-
-	public Connector(WireArray a, WireArray 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.createInput();
-		bI = b.createInput();
-	}
-
-	public void connect()
-	{
-		connected = true;
-		update(a);
-		update(b);
-	}
-
-	public void disconnect()
-	{
-		connected = false;
-		aI.clearSignals();
-		bI.clearSignals();
-	}
-
-	public void setConnection(boolean connected)
-	{
-		if (connected)
-			connect();
-		else
-			disconnect();
-	}
-
-	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
-	{
-		if (connected)
-			Simulation.TIMELINE.addEvent(e -> update(initiator), 1);
-	}
-
-	private void update(WireArray initiator)
-	{
-		if (initiator == a)
-			bI.feedSignals(aI.wireValuesExcludingMe());
-		else
-			aI.feedSignals(bI.wireValuesExcludingMe());
-	}
-
-	@Override
-	public List<WireArray> getAllInputs()
-	{
-		return List.of(a, b);
-	}
-
-	@Override
-	public List<WireArray> getAllOutputs()
-	{
-		return List.of(a, b);
-	}
-}
+package era.mi.logic.components;
+
+import java.util.List;
+
+import era.mi.logic.Simulation;
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.WireObserver;
+
+public class Connector implements WireObserver, Component
+{
+	private boolean connected;
+	private final WireEnd a;
+	private final WireEnd b;
+
+	public Connector(WireEnd a, WireEnd 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);
+	}
+
+	public void connect()
+	{
+		connected = true;
+		update(a.getWire());
+		update(b.getWire());
+	}
+
+	public void disconnect()
+	{
+		connected = false;
+		a.clearSignals();
+		b.clearSignals();
+	}
+
+	public void setConnection(boolean connected)
+	{
+		if (connected)
+			connect();
+		else
+			disconnect();
+	}
+
+	@Override
+	public void update(Wire initiator, BitVector oldValues)
+	{
+		if (connected)
+			Simulation.TIMELINE.addEvent(e -> update(initiator), 1);
+	}
+
+	private void update(Wire initiator)
+	{
+		if (initiator == a.getWire())
+			b.feedSignals(a.wireValuesExcludingMe());
+		else
+			a.feedSignals(b.wireValuesExcludingMe());
+	}
+
+	@Override
+	public List<WireEnd> getAllInputs()
+	{
+		return List.of(a, b);
+	}
+
+	@Override
+	public List<WireEnd> getAllOutputs()
+	{
+		return List.of(a, b);
+	}
+}