projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added MSB first versions of parse() and toString()
[Mograsim.git]
/
net.mograsim.logic.ui.am2900
/
test
/
net
/
mograsim
/
logic
/
ui
/
am2900
/
TestableAm2901Impl.java
diff --git
a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
index
41b441c
..
c06fcd4
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
+++ b/
net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
@@
-181,8
+181,7
@@
public class TestableAm2901Impl implements TestableAm2901
@Override
\r
public void setReg_A(String val_4_bit)
\r
{
\r
@Override
\r
public void setReg_A(String val_4_bit)
\r
{
\r
- // reverse because the BitVector.parse() expects the LSBit at the beginning and the MSBit at the end
\r
- var bits = BitVector.parse(new StringBuilder(val_4_bit).reverse().toString());
\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);
\r
A3.setToValueOf(bits.getBit(3));
\r
A2.setToValueOf(bits.getBit(2));
\r
A1.setToValueOf(bits.getBit(1));
\r
A3.setToValueOf(bits.getBit(3));
\r
A2.setToValueOf(bits.getBit(2));
\r
A1.setToValueOf(bits.getBit(1));
\r
@@
-192,8
+191,7
@@
public class TestableAm2901Impl implements TestableAm2901
@Override
\r
public void setReg_B(String val_4_bit)
\r
{
\r
@Override
\r
public void setReg_B(String val_4_bit)
\r
{
\r
- // reverse because the BitVector.parse() expects the LSBit at the beginning and the MSBit at the end
\r
- var bits = BitVector.parse(new StringBuilder(val_4_bit).reverse().toString());
\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);
\r
B3.setToValueOf(bits.getBit(3));
\r
B2.setToValueOf(bits.getBit(2));
\r
B1.setToValueOf(bits.getBit(1));
\r
B3.setToValueOf(bits.getBit(3));
\r
B2.setToValueOf(bits.getBit(2));
\r
B1.setToValueOf(bits.getBit(1));
\r
@@
-215,8
+213,7
@@
public class TestableAm2901Impl implements TestableAm2901
@Override
\r
public void setD(String val_4_bit)
\r
{
\r
@Override
\r
public void setD(String val_4_bit)
\r
{
\r
- // reverse because the BitVector.parse() expects the LSBit at the beginning and the MSBit at the end
\r
- var bits = BitVector.parse(new StringBuilder(val_4_bit).reverse().toString());
\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);
\r
D4.setToValueOf(bits.getBit(3));
\r
D3.setToValueOf(bits.getBit(2));
\r
D2.setToValueOf(bits.getBit(1));
\r
D4.setToValueOf(bits.getBit(3));
\r
D3.setToValueOf(bits.getBit(2));
\r
D2.setToValueOf(bits.getBit(1));
\r
@@
-320,8
+317,7
@@
public class TestableAm2901Impl implements TestableAm2901
var y2 = Y3.getDisplayedValue();
\r
var y1 = Y2.getDisplayedValue();
\r
var y0 = Y1.getDisplayedValue();
\r
var y2 = Y3.getDisplayedValue();
\r
var y1 = Y2.getDisplayedValue();
\r
var y0 = Y1.getDisplayedValue();
\r
- // reverse because BitVector.toString() returns the LSBit at the beginning and the MSBit at the end
\r
- return new StringBuilder(y0.concat(y1).concat(y2).concat(y3).toString()).reverse().toString();
\r
+ return y0.concat(y1).concat(y2).concat(y3).toBitStringMSBFirst();
\r
}
\r
\r
private void setField(String name, Object value)
\r
}
\r
\r
private void setField(String name, Object value)
\r
@@
-353,15
+349,13
@@
public class TestableAm2901Impl implements TestableAm2901
@Override
\r
public void setDirectly(Register r, String val_4_bit)
\r
{
\r
@Override
\r
public void setDirectly(Register r, String val_4_bit)
\r
{
\r
- // reverse because the BitVector.parse() expects the LSBit at the beginning and the MSBit at the end
\r
- am2901.setHighLevelState(regToStateID(r), BitVector.parse(new StringBuilder(val_4_bit).reverse().toString()));
\r
+ am2901.setHighLevelState(regToStateID(r), BitVector.parseMSBFirst(val_4_bit));
\r
}
\r
\r
@Override
\r
public String getDirectly(Register r)
\r
{
\r
}
\r
\r
@Override
\r
public String getDirectly(Register r)
\r
{
\r
- // reverse because BitVector.toString() returns the LSBit at the beginning and the MSBit at the end
\r
- return new StringBuilder(am2901.getHighLevelState(regToStateID(r)).toString()).reverse().toString();
\r
+ return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toBitStringMSBFirst();
\r
}
\r
\r
private static String regToStateID(Register r)
\r
}
\r
\r
private static String regToStateID(Register r)
\r