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=a89919ed17e728953766d9d617e7db86fcf315ee;hp=e17ae6e1a233cbf7af23c3c68ac52cf37e002e13;hpb=91969fbb8e1a846c21cdfe6dc7e2b20534d86119;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 e17ae6e1..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
@@ -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);
 	}
 
@@ -385,7 +383,7 @@ 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.length() <= this.wdith()</code> needs to be true.
 	 * 
 	 * @throws ArrayIndexOutOfBoundsException if <code>offset + other.length() > this.length()</code>
 	 * 
@@ -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);