projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged logic into master
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
BitDisplay.java
diff --git
a/era.mi/src/era/mi/logic/components/BitDisplay.java
b/era.mi/src/era/mi/logic/components/BitDisplay.java
index
88a1053
..
971eb7a
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/BitDisplay.java
+++ b/
era.mi/src/era/mi/logic/components/BitDisplay.java
@@
-1,15
+1,15
@@
package era.mi.logic.components;
package era.mi.logic.components;
-import java.util.Arrays;
import java.util.List;
import java.util.List;
-import era.mi.logic.Bit;
+import era.mi.logic.types.Bit;
+import era.mi.logic.types.BitVector;
import era.mi.logic.wires.Wire.WireEnd;
public class BitDisplay extends BasicComponent
{
private final WireEnd in;
import era.mi.logic.wires.Wire.WireEnd;
public class BitDisplay extends BasicComponent
{
private final WireEnd in;
- private Bit
[]
displayedValue;
+ private Bit
Vector
displayedValue;
public BitDisplay(WireEnd in)
{
public BitDisplay(WireEnd in)
{
@@
-25,14
+25,14
@@
public class BitDisplay extends BasicComponent
displayedValue = in.getValues();
}
displayedValue = in.getValues();
}
- public Bit
[]
getDisplayedValue()
+ public Bit
Vector
getDisplayedValue()
{
return displayedValue;
}
public boolean isDisplaying(Bit... values)
{
{
return displayedValue;
}
public boolean isDisplaying(Bit... values)
{
- return
Arrays.equals(displayedValue, values
);
+ return
displayedValue.equals(BitVector.of(values)
);
}
@Override
}
@Override