X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=4e0fe0b78744b4325c21ef2d8beb0284cfab1553;hb=76fdc144f22b60491e61a32860fe2e6881751505;hp=aed0288d93b8efd0a660e3b9dc6b49248036ad1a;hpb=f37f1f93f2c1ceb780f1c7ecab888bcb8f4f8b89;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 aed0288d..4e0fe0b7 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,11 +50,11 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(bits.clone());
 	}
 
-	public static BitVector of(Bit bit, int width)
+	public static BitVector of(Bit bit, int length)
 	{
-		if (width == 1)
+		if (length == 1)
 			return SINGLE_BIT_MAPPING[bit.ordinal()];
-		return new BitVector(bit.makeArray(width));
+		return new BitVector(bit.makeArray(length));
 	}
 
 	public static BitVector from(long value, int bits)
@@ -66,9 +66,7 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	{
 		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);
 	}
 
@@ -157,21 +155,21 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(unOp(bits.clone(), Bit::not));
 	}
 
-	public int width()
+	public int length()
 	{
 		return bits.length;
 	}
 
 	public BitVector concat(BitVector other)
 	{
-		Bit[] newBits = Arrays.copyOf(bits, width() + other.width());
-		System.arraycopy(other.bits, 0, newBits, width(), other.width());
+		Bit[] newBits = Arrays.copyOf(bits, length() + other.length());
+		System.arraycopy(other.bits, 0, newBits, length(), other.length());
 		return new BitVector(newBits);
 	}
 
 	public BitVector subVector(int start)
 	{
-		return new BitVector(Arrays.copyOfRange(bits, start, width()));
+		return new BitVector(Arrays.copyOfRange(bits, start, length()));
 	}
 
 	public BitVector subVector(int start, int end)
@@ -181,8 +179,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 
 	private void checkCompatibility(BitVector bv)
 	{
-		if (width() != bv.width())
-			throw new IllegalArgumentException(format("BitVector width does not match: %d and %d", width(), bv.width()));
+		if (length() != bv.length())
+			throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", length(), bv.length()));
 	}
 
 	static Bit[] binOp(Bit[] dest, Bit[] second, BinaryOperator<Bit> op)
@@ -227,11 +225,11 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		}
 
 		/**
-		 * Returns a new mutator of the specified width, <b>with all bits set to <code>null</code></b>. Use with care!
+		 * Returns a new mutator of the specified length, <b>with all bits set to <code>null</code></b>. Use with care!
 		 */
-		public static BitVectorMutator ofWidth(int width)
+		public static BitVectorMutator ofLength(int length)
 		{
-			return new BitVectorMutator(new Bit[width]);
+			return new BitVectorMutator(new Bit[length]);
 		}
 
 		/**
@@ -344,17 +342,17 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			return bits[bits.length - bitIndex - 1];
 		}
 
-		public int width()
+		public int length()
 		{
 			if (bits == null)
-				throw new IllegalStateException("cannot obtain a width of an empty mutator");
+				throw new IllegalStateException("cannot obtain a length of an empty mutator");
 			return bits.length;
 		}
 
 		private void checkCompatibility(BitVector bv)
 		{
-			if (bits != null && bits.length != bv.width())
-				throw new IllegalArgumentException(format("BitVector width does not match: %d and %d", bits.length, bv.width()));
+			if (bits != null && bits.length != bv.length())
+				throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", bits.length, bv.length()));
 		}
 	}
 
@@ -385,9 +383,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.width() <= this.wdith()</code> needs to be true.
+	 * Therefore <code>offset + other.length() <= this.wdith()</code> needs to be true.
 	 * 
-	 * @throws ArrayIndexOutOfBoundsException if <code>offset + other.width() > this.width()</code>
+	 * @throws ArrayIndexOutOfBoundsException if <code>offset + other.length() > this.length()</code>
 	 * 
 	 * @see Object#equals(Object)
 	 */
@@ -395,7 +393,7 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	{
 		if (other == null)
 			return false;
-		return Arrays.equals(bits, offset, offset + other.width(), other.bits, 0, other.width());
+		return Arrays.equals(bits, offset, offset + other.length(), other.bits, 0, other.length());
 	}
 
 	/**
@@ -421,12 +419,19 @@ 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) + 1];
-		for (int i = 0; i < bits.length; i++)
+		byte[] bytes = new byte[(bits.length / 8 + (bits.length % 8 == 0 ? 0 : 1)) + 1];
+		for (int i = bits.length - 1; i >= 0; i--)
 		{
-			if (Bit.ONE == bits[i])
+			if (Bit.ONE == bits[bits.length - i - 1])
 			{
-				bytes[i / 8] |= 1 << (i % 8);
+				try
+				{
+					bytes[bytes.length - (i / 8) - 1] |= 1 << (i % 8);
+				}
+				catch (IndexOutOfBoundsException e)
+				{
+					e.printStackTrace();
+				}
 			}
 		}
 		return new BigInteger(bytes);
@@ -468,7 +473,7 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			@Override
 			public boolean hasNext()
 			{
-				return pos != width();
+				return pos != length();
 			}
 		};
 	}