X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=134669494852256df8868924a63aa687e8b1fb00;hb=9c98bb5456a7ead6d92fcc6acd9d1497688b244d;hp=c223e819b5740af02e11d631a46f07053320da04;hpb=9d4faa3eb431c46f0064c2f2a67fc369cf38dfdb;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
index c223e819..13466949 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
@@ -420,13 +420,13 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		if (!isBinary())
 			throw new NumberFormatException(this + " is not binary");
 		byte[] bytes = new byte[(bits.length / 8 + (bits.length % 8 == 0 ? 0 : 1)) + 1];
-		for (int i = 0; i < bits.length; i++)
+		for (int i = bits.length - 1; i >= 0; i--)
 		{
-			if (Bit.ONE == bits[i])
+			if (Bit.ONE == bits[bits.length - i - 1])
 			{
 				try
 				{
-					bytes[(i / 8) + 1] |= 1 << (i % 8);
+					bytes[bytes.length - (i / 8) - 1] |= 1 << (i % 8);
 				}
 				catch (IndexOutOfBoundsException e)
 				{
@@ -437,6 +437,31 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BigInteger(bytes);
 	}
 
+	public long getUnsignedValueLong()
+	{
+		return getUnsignedValue().longValue();
+	}
+
+	/**
+	 * Returns the value of the BitVector as BigInteger interpreted as a two's complement number.
+	 * 
+	 * @throws NumberFormatException if the BitVector is not {@link #isBinary() binary}.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public BigInteger getSignedValue()
+	{
+		BigInteger unsignedValue = getUnsignedValue();
+		if (bits[bits.length - 1] == Bit.ZERO)
+			return unsignedValue;
+		return unsignedValue.subtract(BitVector.of(Bit.ONE, bits.length).getUnsignedValue()).subtract(BigInteger.ONE);// TODO speed this up!
+	}
+
+	public long getSignedValueLong()
+	{
+		return getSignedValue().longValue();
+	}
+
 	/**
 	 * Parses a String containing solely {@link Bit} symbols (MSB first)
 	 * 
@@ -452,6 +477,20 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(values);
 	}
 
+	/**
+	 * Changes a single Bit using the given operation. This can be used to set, clear or flip bits.
+	 * 
+	 * @param msbIndex           index of the MSB to be changed
+	 * @param singleBitOperation the operation to perform on that Bit
+	 * @return the resulting, new BitVektor
+	 */
+	public BitVector withBitChanged(int msbIndex, UnaryOperator<Bit> singleBitOperation)
+	{
+		Bit[] newBits = bits.clone();
+		newBits[msbIndex] = singleBitOperation.apply(newBits[msbIndex]);
+		return new BitVector(newBits);
+	}
+
 	/**
 	 * Iterate over the {@link Bit}s of the BitVector <b>from MSB to LSB</b> (left to right).
 	 */
@@ -477,4 +516,15 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			}
 		};
 	}
+
+	public BitVector reverse()
+	{
+		int length = length();
+		Bit[] other = new Bit[length];
+		for (int i = 0, j = length - 1; i < length; i++, j--)
+		{
+			other[i] = bits[j];
+		}
+		return new BitVector(other);
+	}
 }