projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wire_array_inputs_update'
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
gates
/
XorGate.java
diff --git
a/era.mi/src/era/mi/logic/components/gates/XorGate.java
b/era.mi/src/era/mi/logic/components/gates/XorGate.java
index
9287f3f
..
c7a9455
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/gates/XorGate.java
+++ b/
era.mi/src/era/mi/logic/components/gates/XorGate.java
@@
-1,12
+1,14
@@
package era.mi.logic.components.gates;
import era.mi.logic.Util;
package era.mi.logic.components.gates;
import era.mi.logic.Util;
-import era.mi.logic.WireArray;
import era.mi.logic.components.BasicComponent;
import era.mi.logic.components.BasicComponent;
+import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArray.WireArrayInput;
public class XorGate extends BasicComponent
{
private WireArray a, b, out;
public class XorGate extends BasicComponent
{
private WireArray a, b, out;
+ private WireArrayInput outI;
public XorGate(int processTime, WireArray a, WireArray b, WireArray out)
{
public XorGate(int processTime, WireArray a, WireArray b, WireArray out)
{
@@
-20,7
+22,7
@@
public class XorGate extends BasicComponent
protected void compute()
{
protected void compute()
{
- out.feedSignals(Util.xor(a.getValues(), b.getValues()));
+ out
I
.feedSignals(Util.xor(a.getValues(), b.getValues()));
}
public WireArray getA()
}
public WireArray getA()