X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FWire.java;h=b0e96f1db97b1fd834a0c5fc4f27b1bf4a3191fb;hb=2f2269e36940705063adba3ff89ed7830c0b2edf;hp=8eff2efaf6bd189cb08c3cf90ac636a5bf318a6a;hpb=b37ba7609a925cc945bbac0f6ead619d07912238;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
index 8eff2efa..b0e96f1d 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
@@ -51,19 +51,6 @@ public class Wire
 		values = U.toVector(length);
 	}
 
-	private void recalculateSingleInput()
-	{
-		setNewValues(inputs.get(0).getInputValues());
-	}
-
-	private void recalculateMultipleInputs()
-	{
-		BitVectorMutator mutator = BitVectorMutator.empty();
-		for (ReadWriteEnd wireArrayEnd : inputs)
-			mutator.join(wireArrayEnd.getInputValues());
-		setNewValues(mutator.toBitVector());
-	}
-
 	private void setNewValues(BitVector newValues)
 	{
 		if (values.equals(newValues))
@@ -75,19 +62,28 @@ public class Wire
 
 	void recalculate()
 	{
-		switch (inputs.size())
-		{
-		case 0:
+		if (inputs.size() == 0)
 			setNewValues(BitVector.of(Bit.U, length));
-			break;
-		case 1:
-			recalculateSingleInput();
-			break;
-		default:
-			recalculateMultipleInputs();
+		else
+		{
+			BitVectorMutator mutator = BitVectorMutator.empty();
+			for (ReadWriteEnd wireArrayEnd : inputs)
+				mutator.join(wireArrayEnd.getInputValues());
+			setNewValues(mutator.toBitVector());
 		}
 	}
 
+	/**
+	 * Forces a Wire to take on specific values. If the new values differ from the old ones, the observers of the Wire will be notified.
+	 * WARNING! Use this with care! The preferred way of writing the values is ReadWriteEnd.feedSignals(BitVector)
+	 * 
+	 * @param values The values the <code>Wire</code> will have immediately after this method is called
+	 */
+	public void forceValues(BitVector values)
+	{
+		setNewValues(values);
+	}
+
 	/**
 	 * The {@link Wire} is interpreted as an unsigned integer with n bits.
 	 * 
@@ -154,14 +150,20 @@ public class Wire
 		return val;
 	}
 
+	/**
+	 * Returns the least significant bit (LSB)
+	 */
 	public Bit getValue()
 	{
 		return getValue(0);
 	}
 
+	/**
+	 * Returns the least significant bit (LSB) of the given index
+	 */
 	public Bit getValue(int index)
 	{
-		return values.getBit(index);
+		return values.getLSBit(index);
 	}
 
 	public BitVector getValues(int start, int end)
@@ -450,7 +452,8 @@ public class Wire
 		}
 
 		/**
-		 * @return The value (of bit 0) the {@link ReadEnd} is currently feeding into the associated {@link Wire}.
+		 * @return The value (of bit 0) the {@link ReadEnd} is currently feeding into the associated {@link Wire}.Returns the least
+		 *         significant bit (LSB)
 		 */
 		public Bit getInputValue()
 		{
@@ -459,10 +462,12 @@ public class Wire
 
 		/**
 		 * @return The value which the {@link ReadEnd} is currently feeding into the associated {@link Wire} at the indexed {@link Bit}.
+		 *         Returns the least significant bit (LSB)
+		 * 
 		 */
 		public Bit getInputValue(int index)
 		{
-			return inputValues.getBit(index);
+			return inputValues.getLSBit(index);
 		}
 
 		/**
@@ -470,7 +475,7 @@ public class Wire
 		 */
 		public BitVector getInputValues()
 		{
-			return getInputValues(0, length);
+			return inputValues;
 		}
 
 		public BitVector getInputValues(int start, int end)