X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=32841ab97e64ebbd0adad14b5affa588f25dbb21;hb=b7ce41467a2cbd9f45554982730741810e99feaa;hp=37e940157090ce93ff62679a8180c7e37baf21b0;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/era/mi/logic/components/Splitter.java
index 37e94015..32841ab9 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,45 +1,57 @@
 package era.mi.logic.components;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
-import era.mi.logic.wires.WireArrayObserver;
+import java.util.List;
 
-public class Splitter implements WireArrayObserver
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
+import era.mi.logic.wires.WireObserver;
+
+public class Splitter implements WireObserver, Component
 {
-	private WireArray input;
-	private WireArrayEnd[] outputs;
+	private ReadEnd input;
+	private ReadWriteEnd[] outputs;
 
-	public Splitter(WireArray input, WireArray... outputs)
+	public Splitter(ReadEnd input, ReadWriteEnd... outputs)
 	{
 		this.input = input;
-		this.outputs = WireArray.extractInputs(outputs);
+		this.outputs = outputs;
 		input.addObserver(this);
 		int length = 0;
-		for (WireArray out : outputs)
-			length += out.length;
+		for (ReadEnd out : outputs)
+			length += out.length();
 
-		if (input.length != length)
+		if (input.length() != length)
 			throw new IllegalArgumentException(
 					"The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");
 	}
 
 	protected void compute()
 	{
+		BitVector inputBits = input.getValues();
 		int startIndex = 0;
-		Bit[] inputBits = input.getValues();
 		for (int i = 0; i < outputs.length; i++)
 		{
-			Bit[] outputBits = new Bit[outputs[i].owner.length];
-			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);
-			outputs[i].feedSignals(outputBits);
-			startIndex += outputs[i].owner.length;
+			outputs[i].feedSignals(inputBits.subVector(startIndex, startIndex + outputs[i].length()));
+			startIndex += outputs[i].length();
 		}
 	}
 
 	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
+	public void update(ReadEnd initiator, BitVector oldValues)
 	{
 		compute();
 	}
+
+	@Override
+	public List<ReadEnd> getAllInputs()
+	{
+		return List.of(input);
+	}
+
+	@Override
+	public List<ReadWriteEnd> getAllOutputs()
+	{
+		return List.of(outputs);
+	}
 }