projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed calculations concerning U, tests work now just like before
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
wires
/
WireArray.java
diff --git
a/era.mi/src/era/mi/logic/wires/WireArray.java
b/era.mi/src/era/mi/logic/wires/WireArray.java
index
39af936
..
033d1d4
100644
(file)
--- a/
era.mi/src/era/mi/logic/wires/WireArray.java
+++ b/
era.mi/src/era/mi/logic/wires/WireArray.java
@@
-61,12
+61,7
@@
public class WireArray
Bit[] bits = input.getValues();
\r
for (int i = 0; i < length; i++)
\r
{
\r
Bit[] bits = input.getValues();
\r
for (int i = 0; i < length; i++)
\r
{
\r
- if (Bit.Z.equals(bits[i]) || newValues[i].equals(bits[i]))
\r
- continue;
\r
- else if (Bit.Z.equals(newValues[i]))
\r
- newValues[i] = bits[i];
\r
- else
\r
- newValues[i] = Bit.X;
\r
+ newValues[i] = newValues[i].combineWith(bits[i]);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r