X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FDemux.java;fp=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FDemux.java;h=ec36b88ecfed29660553eb9792eabcc8353d0f67;hb=3e6ac3d7fd389191d02c1c6982fbf093421ce4f2;hp=704fa9bdfa2b2a126e68a7c0c28c7fd9b5795d79;hpb=2e7dc40f788b00146f2d0805fecd9d23adbda363;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
index 704fa9bd..ec36b88e 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
@@ -22,7 +22,7 @@ public class Demux extends BasicComponent
 	private int selected = -1;
 
 	/**
-	 * Output {@link Wire}s and in must be of uniform length
+	 * Output {@link Wire}s and in must be of uniform width
 	 * 
 	 * @param in      Must be of uniform length with all outputs.
 	 * @param select  Indexes the output array to which the input is mapped. Must have enough bits to index all outputs.
@@ -31,24 +31,24 @@ public class Demux extends BasicComponent
 	public Demux(Timeline timeline, int processTime, ReadEnd in, ReadEnd select, ReadWriteEnd... outputs)
 	{
 		super(timeline, processTime);
-		outputSize = in.length();
+		outputSize = in.width();
 
 		this.in = in;
 		this.outputs = outputs;
 		for (int i = 0; i < this.outputs.length; i++)
 		{
-			if (outputs[i].length() != outputSize)
-				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform length!");
+			if (outputs[i].width() != outputSize)
+				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform width!");
 			this.outputs[i] = outputs[i];
 		}
 
 		this.select = select;
 		select.registerObserver(this);
 
-		int maxInputs = 1 << select.length();
+		int maxInputs = 1 << select.width();
 		if (this.outputs.length > maxInputs)
 			throw new IllegalArgumentException("There are more outputs (" + this.outputs.length + ") to the DEMUX than supported by "
-					+ select.length() + " select bits (" + maxInputs + ").");
+					+ select.width() + " select bits (" + maxInputs + ").");
 		in.registerObserver(this);
 	}