X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMux.java;h=b7cb674436b38f4545ac3758b4308fb8ca6a9056;hb=b7ce41467a2cbd9f45554982730741810e99feaa;hp=0fd7fd465c4e0bc8628d224f040e8e3e02c7d0ed;hpb=49f569b513c36e8ad421fd5a547bf34bd830652a;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 0fd7fd46..b7cb6744 100644
--- a/era.mi/src/era/mi/logic/components/Mux.java
+++ b/era.mi/src/era/mi/logic/components/Mux.java
@@ -1,72 +1,94 @@
 package era.mi.logic.components;
 
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 
 /**
- * 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.
+ * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}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 ReadEnd select;
+	private ReadWriteEnd out;
+	private ReadEnd[] 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.
+	 * Input {@link Wire}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)
+	public Mux(int processTime, ReadWriteEnd out, ReadEnd select, ReadEnd... inputs)
 	{
 		super(processTime);
-		outputSize = out.length;
-		
+		outputSize = out.length();
+
 		this.inputs = inputs.clone();
-		for(int i = 0; i < this.inputs.length; i++)
+		for (int i = 0; i < this.inputs.length; i++)
 		{
-			if(inputs[i].length != outputSize)
+			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();
+
+		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 + ").");
+
+		this.out = out;
 	}
-	
-	public WireArray getOut()
+
+	public ReadEnd getOut()
 	{
-		return outI.owner;
+		return out;
 	}
 
-	public WireArray getSelect()
+	public ReadEnd getSelect()
 	{
 		return select;
 	}
 
 	@Override
-	public void compute() {
+	public void compute()
+	{
 		int selectValue;
-		if(!select.hasNumericValue() || (selectValue = (int) select.getUnsignedValue()) >= inputs.length)
+		if (!select.hasNumericValue() || (selectValue = (int) select.getUnsignedValue()) >= inputs.length)
 		{
-			outI.clearSignals();
+			out.clearSignals();
 			return;
 		}
-		
-		WireArray active = inputs[selectValue];
-		outI.feedSignals(active.getValues());
+
+		ReadEnd active = inputs[selectValue];
+		out.feedSignals(active.getValues());
+	}
+
+	@Override
+	public List<ReadEnd> getAllInputs()
+	{
+		ArrayList<ReadEnd> wires = new ArrayList<ReadEnd>(Arrays.asList(inputs));
+		wires.add(select);
+		return Collections.unmodifiableList(wires);
+	}
+
+	@Override
+	public List<ReadWriteEnd> getAllOutputs()
+	{
+		return List.of(out);
 	}
 }