From df83f4650c28208e1cafff0742189fda97410a5a Mon Sep 17 00:00:00 2001
From: Fabian Stemmler <stemmler@in.tum.de>
Date: Wed, 28 Aug 2019 21:34:40 +0200
Subject: [PATCH] Fixed getUnsignedValue() in BitVector

Fixed getUnsignedValue() for good this time; Bit order MSB to LSB is now
correctly incorporated.
---
 .../net/mograsim/logic/core/types/BitVector.java   | 14 +++++++++++---
 .../mograsim/logic/core/types/BitVectorTest.java   |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

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 c223e819..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
@@ -420,13 +420,13 @@ 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 + (bits.length % 8 == 0 ? 0 : 1)) + 1];
-		for (int i = 0; i < bits.length; i++)
+		for (int i = bits.length - 1; i >= 0; i--)
 		{
-			if (Bit.ONE == bits[i])
+			if (Bit.ONE == bits[bits.length - i - 1])
 			{
 				try
 				{
-					bytes[(i / 8) + 1] |= 1 << (i % 8);
+					bytes[bytes.length - (i / 8) - 1] |= 1 << (i % 8);
 				}
 				catch (IndexOutOfBoundsException e)
 				{
@@ -477,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));
+	}
 }
diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java
index 11b5febf..2b46a6c7 100644
--- a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java
+++ b/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java
@@ -44,9 +44,10 @@ class BitVectorTest
 		assertEquals(BigInteger.valueOf(0b101), BitVector.parse("101").getUnsignedValue());
 		assertEquals(BigInteger.valueOf(0b01010), BitVector.parse("01010").getUnsignedValue());
 		assertEquals(BigInteger.valueOf(0), BitVector.parse("0000").getUnsignedValue());
+		assertEquals(BigInteger.valueOf(0b0000000101), BitVector.parse("0000000101").getUnsignedValue());
+		assertEquals(BigInteger.valueOf(0b1010000000), BitVector.parse("1010000000").getUnsignedValue());
 
 		assertThrows(NumberFormatException.class, () -> BitVector.parse("00X1").getUnsignedValue());
-
 	}
 
 	@Test
-- 
2.17.1