X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMux.java;h=6ac32c6aa1d9a8b666ced232956c3173ccfed716;hb=f2cd90fa2b844507bc9697d3af1f3e18aac80b37;hp=4e09f9251db7d5ea68f28b8b3bc1b336d44067dc;hpb=f2284b0dcfb187ed6473d0a9903eb99ef31d49c5;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Mux.java b/era.mi/src/era/mi/logic/components/Mux.java
index 4e09f925..6ac32c6a 100644
--- a/era.mi/src/era/mi/logic/components/Mux.java
+++ b/era.mi/src/era/mi/logic/components/Mux.java
@@ -1,91 +1,93 @@
-package era.mi.logic.components;
-
-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.WireArrayInput;
-
-/**
- * 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 select;
-	private WireArrayInput outI;
-	private WireArray[] inputs;
-	private final int outputSize;
-	/**
-	 * 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 out, WireArray select, WireArray... inputs)
-	{
-		super(processTime);
-		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);
-		
-		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();
-	}
-	
-	public WireArray getOut()
-	{
-		return outI.owner;
-	}
-
-	public WireArray getSelect()
-	{
-		return select;
-	}
-
-	@Override
-	public void compute() {
-		int selectValue;
-		if(!select.hasNumericValue() || (selectValue = (int) select.getUnsignedValue()) >= inputs.length)
-		{
-			outI.clearSignals();
-			return;
-		}
-		
-		WireArray active = inputs[selectValue];
-		outI.feedSignals(active.getValues());
-	}
-
-	@Override
-	public List<WireArray> getAllInputs()
-	{
-		ArrayList<WireArray> wires = new ArrayList<WireArray>(Arrays.asList(inputs));
-		wires.add(select);
-		return Collections.unmodifiableList(wires);
-	}
-
-	@Override
-	public List<WireArray> getAllOutputs()
-	{
-		return Collections.unmodifiableList(Arrays.asList(outI.owner));
-	}
-}
+package era.mi.logic.components;
+
+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. 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 select;
+	private WireArrayEnd outI;
+	private WireArray[] inputs;
+	private final int outputSize;
+
+	/**
+	 * 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 out, WireArray select, WireArray... inputs)
+	{
+		super(processTime);
+		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);
+
+		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();
+	}
+
+	public WireArray getOut()
+	{
+		return outI.owner;
+	}
+
+	public WireArray getSelect()
+	{
+		return select;
+	}
+
+	@Override
+	public void compute()
+	{
+		int selectValue;
+		if (!select.hasNumericValue() || (selectValue = (int) select.getUnsignedValue()) >= inputs.length)
+		{
+			outI.clearSignals();
+			return;
+		}
+
+		WireArray active = inputs[selectValue];
+		outI.feedSignals(active.getValues());
+	}
+
+	@Override
+	public List<WireArray> getAllInputs()
+	{
+		ArrayList<WireArray> wires = new ArrayList<WireArray>(Arrays.asList(inputs));
+		wires.add(select);
+		return Collections.unmodifiableList(wires);
+	}
+
+	@Override
+	public List<WireArray> getAllOutputs()
+	{
+		return List.of(outI.owner);
+	}
+}