X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=8f53a36b3f8971a47886840f826f410a21533f88;hb=df83f4650c28208e1cafff0742189fda97410a5a;hp=b907ce7ed83c141e154003d8acef33ffed87a081;hpb=4d7f92457692ef00a591084390dc191f84c99628;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 b907ce7e..8f53a36b 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);
 	}
 
@@ -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);
@@ -472,4 +477,12 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 			}
 		};
 	}
+
+	public static void main(String[] args)
+	{
+//		System.out.println(new BigInteger(new byte[] { 0b1000000, 0b00000000 }).toString(2));
+//		System.out.println(BitVector.SINGLE_1.concat(BitVector.of(Bit.ZERO, 14)).getUnsignedValue().toString(2));
+		System.out.println(new BigInteger(new byte[] { 0b0000000, 0b00000101 }).toString(2));
+		System.out.println(BitVector.of(Bit.ZERO, 7).concat(BitVector.of(Bit.ONE, Bit.ZERO, Bit.ONE)).getUnsignedValue().toString(2));
+	}
 }