Merged logic into master

[Mograsim.git] / era.mi / src / era / mi / logic / components / Splitter.java

diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/era/mi/logic/components/Splitter.java
index 1264aa3..4764c27 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,45 +1,43 @@
-package era.mi.logic.components;\r
-\r
-import era.mi.logic.Bit;\r
-import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayEnd;\r
-import era.mi.logic.wires.WireArrayObserver;\r
-\r
-public class Splitter implements WireArrayObserver\r
-{\r
-       private WireArray input;\r
-       private WireArrayEnd[] outputs;\r
-\r
-       public Splitter(WireArray input, WireArray... outputs)\r
-       {\r
-               this.input = input;\r
-               this.outputs = WireArray.extractInputs(outputs);\r
-               input.addObserver(this);\r
-               int length = 0;\r
-               for (WireArray out : outputs)\r
-                       length += out.length;\r
-\r
-               if (input.length != length)\r
-                       throw new IllegalArgumentException(\r
-                                       "The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");\r
-       }\r
-\r
-       protected void compute()\r
-       {\r
-               int startIndex = 0;\r
-               Bit[] inputBits = input.getValues();\r
-               for (int i = 0; i < outputs.length; i++)\r
-               {\r
-                       Bit[] outputBits = new Bit[outputs[i].owner.length];\r
-                       System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);\r
-                       outputs[i].feedSignals(outputBits);\r
-                       startIndex += outputs[i].owner.length;\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public void update(WireArray initiator, Bit[] oldValues)\r
-       {\r
-               compute();\r
-       }\r
-}\r
+package era.mi.logic.components;
+
+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 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()
+       {
+               BitVector inputBits = input.getValues();
+               int startIndex = 0;
+               for (int i = 0; i < outputs.length; i++)
+               {
+                       outputs[i].feedSignals(inputBits.subVector(startIndex, startIndex + outputs[i].length()));
+                       startIndex += outputs[i].length();
+               }
+       }
+
+       @Override
+       public void update(Wire initiator, BitVector oldValues)
+       {
+               compute();
+       }
+}