projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed BitVector#getUnsignedValue();It no longer returns negative numbers
[Mograsim.git]
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
types
/
BitVector.java
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
b907ce7
..
c223e81
100644
(file)
--- 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++)
{
Bit[] values = new Bit[bits];
for (int i = 0; i < bits; i++)
- {
values[bits - i - 1] = Bit.of(value.testBit(i));
values[bits - i - 1] = Bit.of(value.testBit(i));
- }
return new BitVector(values);
}
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");
{
if (!isBinary())
throw new NumberFormatException(this + " is not binary");
- byte[] bytes = new byte[(bits.length / 8) + 1];
+ byte[] bytes = new byte[(bits.length / 8
+ (bits.length % 8 == 0 ? 0 : 1)
) + 1];
for (int i = 0; i < bits.length; i++)
{
if (Bit.ONE == bits[i])
{
for (int i = 0; i < bits.length; i++)
{
if (Bit.ONE == bits[i])
{
- bytes[i / 8] |= 1 << (i % 8);
+ try
+ {
+ bytes[(i / 8) + 1] |= 1 << (i % 8);
+ }
+ catch (IndexOutOfBoundsException e)
+ {
+ e.printStackTrace();
+ }
}
}
return new BigInteger(bytes);
}
}
return new BigInteger(bytes);