Fixed calculations concerning U, tests work now just like before

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

diff --git a/era.mi/src/era/mi/logic/components/Mux.java b/era.mi/src/era/mi/logic/components/Mux.java
index 0b19e7c..d6307f9 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Mux.java
+++ b/era.mi/src/era/mi/logic/components/Mux.java
@@ -1,77 +1,93 @@
 package era.mi.logic.components;
 
-import era.mi.logic.Bit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArray.WireArrayEnd;
 
 /**
- * Models a Multiplexer. A is selected when select bit is 1, B when select bit is 0. Outputs X otherwise.
- * @author Fabian
+ * Models a multiplexer. Takes an arbitrary amount of input {@link WireArray}s, one of which, as determined by select, is put through to the
+ * output.
+ * 
+ * @author Fabian Stemmler
  *
  */
 public class Mux extends BasicComponent
 {
-       private WireArray a, b, out;
        private WireArray select;
-       private final int size;
-       
+       private WireArrayEnd outI;
+       private WireArray[] inputs;
+       private final int outputSize;
+
        /**
-        * {@link WireArray}s a, b and out must be of uniform length, select
-        * @param a Must be of uniform length with b and out.
-        * @param b Must be of uniform length with a and out.
-        * @param select C
-        * @param out Must be of uniform length with a and b.
+        * Input {@link WireArray}s and out must be of uniform length
+        * 
+        * @param out    Must be of uniform length with all inputs.
+        * @param select Indexes the input array which is to be mapped to the output. Must have enough bits to index all inputs.
+        * @param inputs One of these inputs is mapped to the output, depending on the select bits
         */
-       public Mux(int processTime, WireArray a, WireArray b, WireArray select, WireArray out)
+       public Mux(int processTime, WireArray out, WireArray select, WireArray... inputs)
        {
                super(processTime);
-               size = a.length;
-               if(b.length != out.length || b.length != size)
-                       throw new IllegalArgumentException("All MUX wire arrays must be of uniform length!");
-               this.a = a;
-               a.addObserver(this);
-               this.b = b;
-               b.addObserver(this);
+               outputSize = out.length;
+
+               this.inputs = inputs.clone();
+               for (int i = 0; i < this.inputs.length; i++)
+               {
+                       if (inputs[i].length != outputSize)
+                               throw new IllegalArgumentException("All MUX wire arrays must be of uniform length!");
+                       inputs[i].addObserver(this);
+               }
+
                this.select = select;
                select.addObserver(this);
-               this.out = out;
+
+               int maxInputs = 1 << select.length;
+               if (this.inputs.length > maxInputs)
+                       throw new IllegalArgumentException("There are more inputs (" + this.inputs.length + ") to the MUX than supported by "
+                                       + select.length + " select bits (" + maxInputs + ").");
+
+               outI = out.createInput();
        }
 
-       @Override
-       protected void compute()
+       public WireArray getOut()
        {
-               WireArray active = b;
-               switch(select.getValue())
-               {
-               case ONE:
-                       active = a;
-               case ZERO:
-                       out.feedSignals(active.getValues());
-                       break;
-               default:
-                       Bit[] newValues = new Bit[size];
-                       for(int i = 0; i < size; i++)
-                               newValues[i] = Bit.X;
-                       out.feedSignals(newValues);
-               }
+               return outI.owner;
        }
 
-       public WireArray getA()
+       public WireArray getSelect()
        {
-               return a;
+               return select;
        }
 
-       public WireArray getB()
+       @Override
+       public void compute()
        {
-               return b;
+               int selectValue;
+               if (!select.hasNumericValue() || (selectValue = (int) select.getUnsignedValue()) >= inputs.length)
+               {
+                       outI.clearSignals();
+                       return;
+               }
+
+               WireArray active = inputs[selectValue];
+               outI.feedSignals(active.getValues());
        }
 
-       public WireArray getOut()
+       @Override
+       public List<WireArray> getAllInputs()
        {
-               return out;
+               ArrayList<WireArray> wires = new ArrayList<WireArray>(Arrays.asList(inputs));
+               wires.add(select);
+               return Collections.unmodifiableList(wires);
        }
 
-       public WireArray getSelect()
+       @Override
+       public List<WireArray> getAllOutputs()
        {
-               return select;
+               return Collections.unmodifiableList(Arrays.asList(outI.owner));
        }
 }