X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=760da8fb903facf3969b4b4385dbe2e7f492150f;hb=2427bceeaf96fefbd92ea04d7ebbb52606a7b2ff;hp=2a52327a3b4f998eeb02a0950e5976e01d26fa4c;hpb=f2284b0dcfb187ed6473d0a9903eb99ef31d49c5;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 2a52327a..760da8fb 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,44 +1,45 @@
-package era.mi.logic.components;
-
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
-import era.mi.logic.wires.WireArrayObserver;
-
-public class Splitter implements WireArrayObserver
-{
-	private WireArray input;
-	private WireArrayInput[] outputs;
-	
-	public Splitter(WireArray input, WireArray... outputs)
-	{
-		this.input = input;
-		this.outputs = WireArray.extractInputs(outputs);
-		input.addObserver(this);
-		int length = 0;
-		for(WireArray out : outputs)
-			length += out.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()
-	{
-		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;
-		}
-	}
-	
-	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
-	{
-		compute();
-	}
-}
+package era.mi.logic.components;
+
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.WireObserver;
+
+public class Splitter implements WireObserver
+{
+	private WireEnd input;
+	private WireEnd[] outputs;
+
+	public Splitter(WireEnd input, WireEnd... outputs)
+	{
+		this.input = input;
+		this.outputs = outputs;
+		input.addObserver(this);
+		int length = 0;
+		for (WireEnd out : outputs)
+			length += out.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()
+	{
+		int startIndex = 0;
+		Bit[] inputBits = input.getValues();
+		for (int i = 0; i < outputs.length; i++)
+		{
+			Bit[] outputBits = new Bit[outputs[i].length()];
+			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());
+			outputs[i].feedSignals(outputBits);
+			startIndex += outputs[i].length();
+		}
+	}
+
+	@Override
+	public void update(Wire initiator, Bit[] oldValues)
+	{
+		compute();
+	}
+}