projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some work on improving BitVector<->String conversions
[Mograsim.git]
/
tests
/
net.mograsim.logic.model.am2900.tests
/
src
/
net
/
mograsim
/
logic
/
model
/
am2900
/
am2910
/
TestableAm2910Impl.java
diff --git
a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
index
ef763df
..
a4eb5ed
100644
(file)
--- a/
tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
+++ b/
tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java
@@
-55,79
+55,79
@@
public class TestableAm2910Impl implements TestableAm2910
@Override
public void set_CCEN(String val_1_bit)
{
@Override
public void set_CCEN(String val_1_bit)
{
- _CCEN.setState(BitVector.parse(val_1_bit));
+ _CCEN.setState(BitVector.parse
Bitstring
(val_1_bit));
}
@Override
public void setD(String val_12_bit)
{
}
@Override
public void setD(String val_12_bit)
{
- D.setState(BitVector.parse(val_12_bit));
+ D.setState(BitVector.parse
Bitstring
(val_12_bit));
}
@Override
public void set_CC(String val_1_bit)
{
}
@Override
public void set_CC(String val_1_bit)
{
- _CC.setState(BitVector.parse(val_1_bit));
+ _CC.setState(BitVector.parse
Bitstring
(val_1_bit));
}
@Override
public void setCI(String val_1_bit)
{
}
@Override
public void setCI(String val_1_bit)
{
- CI.setState(BitVector.parse(val_1_bit));
+ CI.setState(BitVector.parse
Bitstring
(val_1_bit));
}
@Override
public void set_RLD(String val_1_bit)
{
}
@Override
public void set_RLD(String val_1_bit)
{
- _RLD.setState(BitVector.parse(val_1_bit));
+ _RLD.setState(BitVector.parse
Bitstring
(val_1_bit));
}
@Override
public void set_OE(String val_1_bit)
{
}
@Override
public void set_OE(String val_1_bit)
{
- _OE.setState(BitVector.parse(val_1_bit));
+ _OE.setState(BitVector.parse
Bitstring
(val_1_bit));
}
@Override
public void setDirectly(Register r, String val_X_bit)
{
}
@Override
public void setDirectly(Register r, String val_X_bit)
{
- am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_X_bit));
+ am2901.setHighLevelState(regToStateID(r), BitVector.parse
Bitstring
(val_X_bit));
}
@Override
public String getY()
{
}
@Override
public String getY()
{
- return Y.getDisplayedValue().to
S
tring();
+ return Y.getDisplayedValue().to
Bits
tring();
}
@Override
public String get_FULL()
{
}
@Override
public String get_FULL()
{
- return _FULL.getDisplayedValue().to
S
tring();
+ return _FULL.getDisplayedValue().to
Bits
tring();
}
@Override
public String get_PL()
{
}
@Override
public String get_PL()
{
- return _PL.getDisplayedValue().to
S
tring();
+ return _PL.getDisplayedValue().to
Bits
tring();
}
@Override
public String get_MAP()
{
}
@Override
public String get_MAP()
{
- return _MAP.getDisplayedValue().to
S
tring();
+ return _MAP.getDisplayedValue().to
Bits
tring();
}
@Override
public String get_VECT()
{
}
@Override
public String get_VECT()
{
- return _VECT.getDisplayedValue().to
S
tring();
+ return _VECT.getDisplayedValue().to
Bits
tring();
}
@Override
public String getDirectly(Register r)
{
}
@Override
public String getDirectly(Register r)
{
- return
am2901.getHighLevelState(regToStateID(r)).toS
tring();
+ return
((BitVector) am2901.getHighLevelState(regToStateID(r))).toBits
tring();
}
private static String regToStateID(Register r)
}
private static String regToStateID(Register r)