TnSb/radec
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add undefined logic to all gates

Browse Source
This commit is contained in:
Joel Beckmeyer 2017-04-25 10:10:07 -04:00
parent 93a176884d
commit fb0c023cf4
7 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/AndGate.cpp
View File

@ -11,11 +11,14 @@ AndGate::AndGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
Event AndGate::evaluate(int evTime) { Event AndGate::evaluate(int evTime) {
if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) { if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){ else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
else{
return Event(-1, -1, evTime + delay, out);
}
} }
int AndGate::getDelay() int AndGate::getDelay()

5
src/NandGate.cpp
View File

@ -13,9 +13,12 @@ Event NandGate::evaluate(int evTime)
if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) { if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
else { else if (in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
else{
return Event(-1, -1, evTime + delay, out);
}
} }
int NandGate::getDelay() int NandGate::getDelay()

3
src/NorGate.cpp
View File

@ -16,6 +16,9 @@ Event NorGate::evaluate(int evTime) {
else if (in1->getValue(evTime) == 0 && in2->getValue(evTime) == 0) { else if (in1->getValue(evTime) == 0 && in2->getValue(evTime) == 0) {
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
else{
return Event(-1, -1, evTime + delay, out);
}
} }
int NorGate::getDelay() int NorGate::getDelay()

8
src/NotGate.cpp
View File

@ -9,12 +9,14 @@ NotGate::NotGate(int d, Wire* wire1, Wire* wire2) {
} }
Event NotGate::evaluate(int evTime) { Event NotGate::evaluate(int evTime) {
if (in1->getValue(evTime) == 0) { if (in1->getValue(evTime) == 1) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }else if (in1->getValue(evTime) == 0) {
else{
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
else {
return Event(-1, -1, evTime + delay, out);
}
} }
int NotGate::getDelay() int NotGate::getDelay()

3
src/OrGate.cpp
View File

@ -16,6 +16,9 @@ Event OrGate::evaluate(int evTime) {
else if (in1->getValue(evTime) == 0 && in2->getValue(evTime) == 0) { else if (in1->getValue(evTime) == 0 && in2->getValue(evTime) == 0) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
else{
return Event(-1, -1, evTime + delay, out);
}
} }
int OrGate::getDelay() int OrGate::getDelay()

3
src/XnorGate.cpp
View File

@ -18,6 +18,9 @@ Event XnorGate::evaluate(int evTime) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
} }
else {
return Event(-1, -1, evTime + delay, out);
}
} }
int XnorGate::getDelay() int XnorGate::getDelay()

3
src/XorGate.cpp
View File

@ -18,6 +18,9 @@ Event XorGate::evaluate(int evTime) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
} }
else {
return Event(-1, -1, evTime + delay, out);
}
} }
int XorGate::getDelay() int XorGate::getDelay()