X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=aed0288d93b8efd0a660e3b9dc6b49248036ad1a;hb=153f81323a215691a0477af3fd1dd4a9d5b02958;hp=6a36403475c1ef7a2f5d5296b98d9a5268f046b8;hpb=fb17fab5f3a145173dcd0b4b7d6e6553dbcd2e54;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 6a364034..aed0288d 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
@@ -50,50 +50,19 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(bits.clone());
 	}
 
-	public static BitVector of(Bit bit, int length)
+	public static BitVector of(Bit bit, int width)
 	{
-		if (length == 1)
+		if (width == 1)
 			return SINGLE_BIT_MAPPING[bit.ordinal()];
-		return new BitVector(bit.makeArray(length));
+		return new BitVector(bit.makeArray(width));
 	}
 
-	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)
+	public static BitVector from(long value, int bits)
 	{
-		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);
+		return from(BigInteger.valueOf(value), bits);
 	}
 
-	public static BitVector of(long value, int bits)
-	{
-		return of(BigInteger.valueOf(value), bits);
-	}
-
-	public static BitVector of(BigInteger value, int bits)
+	public static BitVector from(BigInteger value, int bits)
 	{
 		Bit[] values = new Bit[bits];
 		for (int i = 0; i < bits; i++)
@@ -129,6 +98,11 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return bits.clone();
 	}
 
+	/**
+	 * Checks if all bits are {@link Bit#isBinary() binary}.
+	 * 
+	 * @see Bit#isBinary()
+	 */
 	public boolean isBinary()
 	{
 		for (int i = 0; i < bits.length; i++)
@@ -183,21 +157,21 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(unOp(bits.clone(), Bit::not));
 	}
 
-	public int length()
+	public int width()
 	{
 		return bits.length;
 	}
 
 	public BitVector concat(BitVector other)
 	{
-		Bit[] newBits = Arrays.copyOf(bits, length() + other.length());
-		System.arraycopy(other.bits, 0, newBits, length(), other.length());
+		Bit[] newBits = Arrays.copyOf(bits, width() + other.width());
+		System.arraycopy(other.bits, 0, newBits, width(), other.width());
 		return new BitVector(newBits);
 	}
 
 	public BitVector subVector(int start)
 	{
-		return new BitVector(Arrays.copyOfRange(bits, start, length()));
+		return new BitVector(Arrays.copyOfRange(bits, start, width()));
 	}
 
 	public BitVector subVector(int start, int end)
@@ -207,8 +181,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 
 	private void checkCompatibility(BitVector bv)
 	{
-		if (length() != bv.length())
-			throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", length(), bv.length()));
+		if (width() != bv.width())
+			throw new IllegalArgumentException(format("BitVector width does not match: %d and %d", width(), bv.width()));
 	}
 
 	static Bit[] binOp(Bit[] dest, Bit[] second, BinaryOperator<Bit> op)
@@ -253,11 +227,11 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		}
 
 		/**
-		 * Returns a new mutator of the specified length, <b>with all bits set to <code>null</code></b>. Use with care!
+		 * Returns a new mutator of the specified width, <b>with all bits set to <code>null</code></b>. Use with care!
 		 */
-		public static BitVectorMutator ofLength(int length)
+		public static BitVectorMutator ofWidth(int width)
 		{
-			return new BitVectorMutator(new Bit[length]);
+			return new BitVectorMutator(new Bit[width]);
 		}
 
 		/**
@@ -370,17 +344,17 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			return bits[bits.length - bitIndex - 1];
 		}
 
-		public int length()
+		public int width()
 		{
 			if (bits == null)
-				throw new IllegalStateException("cannot obtain a length of an empty mutator");
+				throw new IllegalStateException("cannot obtain a width of an empty mutator");
 			return bits.length;
 		}
 
 		private void checkCompatibility(BitVector bv)
 		{
-			if (bits != null && bits.length != bv.length())
-				throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", bits.length, bv.length()));
+			if (bits != null && bits.length != bv.width())
+				throw new IllegalArgumentException(format("BitVector width does not match: %d and %d", bits.length, bv.width()));
 		}
 	}
 
@@ -411,9 +385,9 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 
 	/**
 	 * Does test for equality of values/content, shifting the other BitVector by <code>offset</code> to the right.<br>
-	 * Therefore <code>offset + other.length() <= this.length()</code> needs to be true.
+	 * Therefore <code>offset + other.width() <= this.wdith()</code> needs to be true.
 	 * 
-	 * @throws ArrayIndexOutOfBoundsException if <code>offset + other.length() > this.length()</code>
+	 * @throws ArrayIndexOutOfBoundsException if <code>offset + other.width() > this.width()</code>
 	 * 
 	 * @see Object#equals(Object)
 	 */
@@ -421,7 +395,7 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	{
 		if (other == null)
 			return false;
-		return Arrays.equals(bits, offset, offset + other.length(), other.bits, 0, other.length());
+		return Arrays.equals(bits, offset, offset + other.width(), other.bits, 0, other.width());
 	}
 
 	/**
@@ -439,20 +413,23 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	}
 
 	/**
-	 * 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
+	 * Returns the value of the BitVector as BigInteger.
 	 * 
+	 * @throws NumberFormatException if the BitVector is not {@link #isBinary() binary}.
 	 */
-	public BigInteger toBigInteger(boolean signed)
+	public BigInteger getUnsignedValue()
 	{
 		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;
+		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);
 	}
 
 	/**
@@ -491,7 +468,7 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			@Override
 			public boolean hasNext()
 			{
-				return pos != length();
+				return pos != width();
 			}
 		};
 	}