X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=6a36403475c1ef7a2f5d5296b98d9a5268f046b8;hb=add92039f433cd315f2087da9c1a0de899927d96;hp=3e5c17702fd8e35c124ac3cea3e4dbc6e091728a;hpb=0f1250077e745deb7cabbfb4c77d393d3d937f70;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 3e5c1770..6a364034 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
@@ -57,6 +57,52 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(bit.makeArray(length));
 	}
 
+	public BigInteger getUnsignedValue()
+	{
+		if (!isBinary())
+			throw new NumberFormatException("BitVector is non binary: " + toString());
+		byte[] bytes = new byte[(bits.length / 8) + 1];
+		for (int i = 0; i < bits.length; i++)
+		{
+			if (Bit.ONE == bits[i])
+			{
+				bytes[i / 8] |= 1 << (i % 8);
+			}
+		}
+		return new BigInteger(bytes);
+	}
+
+	public static BitVector from(BigInteger b, int length)
+	{
+		int bitLength = b.bitLength();
+		int actualLength = Integer.min(bitLength, length);
+		Bit[] bits = new Bit[length];
+		for (int i = 0; i < actualLength; i++)
+			bits[i] = b.testBit(i) ? Bit.ONE : Bit.ZERO;
+		if (b.signum() < 0)
+			for (int i = actualLength; i < length; i++)
+				bits[i] = Bit.ONE;
+		else
+			for (int i = actualLength; i < length; i++)
+				bits[i] = Bit.ZERO;
+		return BitVector.of(bits);
+	}
+
+	public static BitVector of(long value, int bits)
+	{
+		return of(BigInteger.valueOf(value), bits);
+	}
+
+	public static BitVector of(BigInteger value, int bits)
+	{
+		Bit[] values = new Bit[bits];
+		for (int i = 0; i < bits; i++)
+		{
+			values[bits - i - 1] = Bit.of(value.testBit(i));
+		}
+		return new BitVector(values);
+	}
+
 	public BitVectorMutator mutator()
 	{
 		return BitVectorMutator.of(this);
@@ -216,12 +262,23 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 
 		/**
 		 * Returns an empty mutator which has no bits set and will simply copy the values from the first binary operation performed.
+		 * <p>
+		 * An empty BitVectorMutator <b>must not</b> be converted to BitVector or used to manipulate single bits until at least one two
+		 * operand logic operation is performed.
 		 */
 		public static BitVectorMutator empty()
 		{
 			return new BitVectorMutator(null);
 		}
 
+		/**
+		 * @see #empty()
+		 */
+		public boolean isEmpty()
+		{
+			return bits == null;
+		}
+
 		/**
 		 * Produces the resulting, immutable {@link BitVector}<br>
 		 * 
@@ -278,6 +335,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		 */
 		public void setMSBit(int bitIndex, Bit bit)
 		{
+			if (bits == null)
+				throw new IllegalStateException("cannot set a bit of an empty mutator");
 			bits[bitIndex] = bit;
 		}
 
@@ -286,6 +345,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		 */
 		public void setLSBit(int bitIndex, Bit bit)
 		{
+			if (bits == null)
+				throw new IllegalStateException("cannot set a bit of an empty mutator");
 			bits[bits.length - bitIndex - 1] = bit;
 		}
 
@@ -294,6 +355,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		 */
 		public Bit getMSBit(int bitIndex)
 		{
+			if (bits == null)
+				throw new IllegalStateException("cannot get a bit of an empty mutator");
 			return bits[bitIndex];
 		}
 
@@ -302,11 +365,15 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		 */
 		public Bit getLSBit(int bitIndex)
 		{
+			if (bits == null)
+				throw new IllegalStateException("cannot get a bit of an empty mutator");
 			return bits[bits.length - bitIndex - 1];
 		}
 
 		public int length()
 		{
+			if (bits == null)
+				throw new IllegalStateException("cannot obtain a length of an empty mutator");
 			return bits.length;
 		}
 
@@ -371,6 +438,23 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return sb.toString();
 	}
 
+	/**
+	 * Returns the value of the BitVector as BigInteger either unsigned or as two-complement.
+	 * 
+	 * @param signed if true and the BitVector represents a negative two-complement integer, an equivalent BigInteger is returned
+	 * @return the value of this BitVector as BigInteger
+	 * 
+	 */
+	public BigInteger toBigInteger(boolean signed)
+	{
+		if (!isBinary())
+			throw new NumberFormatException(this + " is not binary");
+		BigInteger val = new BigInteger(toString(), 2);
+		if (signed && bits[0] == Bit.ONE)
+			val = val.not().setBit(val.bitLength()).add(BigInteger.ONE);
+		return val;
+	}
+
 	/**
 	 * Parses a String containing solely {@link Bit} symbols (MSB first)
 	 * 
@@ -386,21 +470,6 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(values);
 	}
 
-	public static BitVector of(long value, int bits)
-	{
-		return of(BigInteger.valueOf(value), bits);
-	}
-
-	public static BitVector of(BigInteger value, int bits)
-	{
-		Bit[] values = new Bit[bits];
-		for (int i = 0; i < bits; i++)
-		{
-			values[bits - i - 1] = Bit.of(value.testBit(i));
-		}
-		return new BitVector(values);
-	}
-
 	/**
 	 * Iterate over the {@link Bit}s of the BitVector <b>from MSB to LSB</b> (left to right).
 	 */