mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

RTLIL::S{0,1} -> State::S{0,1}

Browse source
This commit is contained in:
Eddie Hung 2019-08-06 16:23:37 -07:00
parent 046e1a5214
commit a6bc9265fb
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backends/aiger/xaiger.cc
View file

@ -388,11 +388,11 @@ struct XAigerWriter
RTLIL::SigSpec rhs; RTLIL::SigSpec rhs;
if (it != cell->connections_.end()) { if (it != cell->connections_.end()) {
if (GetSize(it->second) < GetSize(w)) if (GetSize(it->second) < GetSize(w))
it->second.append(RTLIL::SigSpec(RTLIL::S0, GetSize(w)-GetSize(it->second))); it->second.append(RTLIL::SigSpec(State::S0, GetSize(w)-GetSize(it->second)));
rhs = it->second; rhs = it->second;
} }
else { else {
rhs = RTLIL::SigSpec(RTLIL::S0, GetSize(w)); rhs = RTLIL::SigSpec(State::S0, GetSize(w));
cell->setPort(port_name, rhs); cell->setPort(port_name, rhs);
} }
@ -400,10 +400,10 @@ struct XAigerWriter
for (auto b : rhs.bits()) { for (auto b : rhs.bits()) {
SigBit I = sigmap(b); SigBit I = sigmap(b);
if (b == RTLIL::Sx) if (b == RTLIL::Sx)
b = RTLIL::S0; b = State::S0;
else if (I != b) { else if (I != b) {
if (I == RTLIL::Sx) if (I == RTLIL::Sx)
alias_map[b] = RTLIL::S0; alias_map[b] = State::S0;
else else
alias_map[b] = I; alias_map[b] = I;
} }
@ -672,7 +672,7 @@ struct XAigerWriter
if (holes_cell) if (holes_cell)
port_wire.append(holes_wire); port_wire.append(holes_wire);
else else
holes_module->connect(holes_wire, RTLIL::S0); holes_module->connect(holes_wire, State::S0);
} }
if (!port_wire.empty()) if (!port_wire.empty())
holes_cell->setPort(w->name, port_wire); holes_cell->setPort(w->name, port_wire);

32
frontends/aiger/aigerparse.cc
View file

@ -151,12 +151,12 @@ struct ConstEvalAig
RTLIL::State eval_ret = RTLIL::Sx; RTLIL::State eval_ret = RTLIL::Sx;
if (cell->type == "$_NOT_") { if (cell->type == "$_NOT_") {
if (sig_a == RTLIL::S0) eval_ret = RTLIL::S1; if (sig_a == State::S0) eval_ret = State::S1;
else if (sig_a == RTLIL::S1) eval_ret = RTLIL::S0; else if (sig_a == State::S1) eval_ret = State::S0;
} }
else if (cell->type == "$_AND_") { else if (cell->type == "$_AND_") {
if (sig_a == RTLIL::S0) { if (sig_a == State::S0) {
eval_ret = RTLIL::S0; eval_ret = State::S0;
goto eval_end; goto eval_end;
} }
@ -164,15 +164,15 @@ struct ConstEvalAig
RTLIL::SigBit sig_b = cell->getPort("\\B"); RTLIL::SigBit sig_b = cell->getPort("\\B");
if (!eval(sig_b)) if (!eval(sig_b))
return false; return false;
if (sig_b == RTLIL::S0) { if (sig_b == State::S0) {
eval_ret = RTLIL::S0; eval_ret = State::S0;
goto eval_end; goto eval_end;
} }
if (sig_a != RTLIL::S1 || sig_b != RTLIL::S1) if (sig_a != State::S1 || sig_b != State::S1)
goto eval_end; goto eval_end;
eval_ret = RTLIL::S1; eval_ret = State::S1;
} }
} }
else log_abort(); else log_abort();
@ -256,7 +256,7 @@ end_of_header:
RTLIL::Wire* n0 = module->wire("\\__0__"); RTLIL::Wire* n0 = module->wire("\\__0__");
if (n0) if (n0)
module->connect(n0, RTLIL::S0); module->connect(n0, State::S0);
// Parse footer (symbol table, comments, etc.) // Parse footer (symbol table, comments, etc.)
unsigned l1; unsigned l1;
@ -371,7 +371,7 @@ void AigerReader::parse_xaiger()
RTLIL::Wire* n0 = module->wire("\\__0__"); RTLIL::Wire* n0 = module->wire("\\__0__");
if (n0) if (n0)
module->connect(n0, RTLIL::S0); module->connect(n0, State::S0);
dict<int,IdString> box_lookup; dict<int,IdString> box_lookup;
for (auto m : design->modules()) { for (auto m : design->modules()) {
@ -535,9 +535,9 @@ void AigerReader::parse_aiger_ascii()
log_error("Line %u cannot be interpreted as a latch!\n", line_count); log_error("Line %u cannot be interpreted as a latch!\n", line_count);
if (l3 == 0) if (l3 == 0)
q_wire->attributes["\\init"] = RTLIL::S0; q_wire->attributes["\\init"] = State::S0;
else if (l3 == 1) else if (l3 == 1)
q_wire->attributes["\\init"] = RTLIL::S1; q_wire->attributes["\\init"] = State::S1;
else if (l3 == l1) { else if (l3 == l1) {
//q_wire->attributes["\\init"] = RTLIL::Sx; //q_wire->attributes["\\init"] = RTLIL::Sx;
} }
@ -546,7 +546,7 @@ void AigerReader::parse_aiger_ascii()
} }
else { else {
// AIGER latches are assumed to be initialized to zero // AIGER latches are assumed to be initialized to zero
q_wire->attributes["\\init"] = RTLIL::S0; q_wire->attributes["\\init"] = State::S0;
} }
latches.push_back(q_wire); latches.push_back(q_wire);
} }
@ -660,9 +660,9 @@ void AigerReader::parse_aiger_binary()
log_error("Line %u cannot be interpreted as a latch!\n", line_count); log_error("Line %u cannot be interpreted as a latch!\n", line_count);
if (l3 == 0) if (l3 == 0)
q_wire->attributes["\\init"] = RTLIL::S0; q_wire->attributes["\\init"] = State::S0;
else if (l3 == 1) else if (l3 == 1)
q_wire->attributes["\\init"] = RTLIL::S1; q_wire->attributes["\\init"] = State::S1;
else if (l3 == l1) { else if (l3 == l1) {
//q_wire->attributes["\\init"] = RTLIL::Sx; //q_wire->attributes["\\init"] = RTLIL::Sx;
} }
@ -671,7 +671,7 @@ void AigerReader::parse_aiger_binary()
} }
else { else {
// AIGER latches are assumed to be initialized to zero // AIGER latches are assumed to be initialized to zero
q_wire->attributes["\\init"] = RTLIL::S0; q_wire->attributes["\\init"] = State::S0;
} }
latches.push_back(q_wire); latches.push_back(q_wire);
} }