riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not assume inst_module is always present

This commit is contained in:
Eddie Hung 2019-04-19 08:44:53 -07:00
parent 3544a7cd7b
commit 35f44f3ae8
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backends/aiger/xaiger.cc
View File

@ -193,13 +193,14 @@ struct XAigerWriter
continue; continue;
} }
log_assert(inst_module); if (inst_module) {
RTLIL::Wire* inst_module_port = inst_module->wire(conn.first); RTLIL::Wire* inst_module_port = inst_module->wire(conn.first);
log_assert(inst_module_port); log_assert(inst_module_port);
if (inst_module_port->attributes.count("\\abc_flop_q")) if (inst_module_port->attributes.count("\\abc_flop_q"))
continue; continue;
} }
}
if (cell->input(conn.first)) { if (cell->input(conn.first)) {
// Ignore inout for the sake of topographical ordering // Ignore inout for the sake of topographical ordering
@ -254,7 +255,6 @@ struct XAigerWriter
// continue; // continue;
//} //}
log_assert(inst_module);
if (inst_flop) { if (inst_flop) {
SigBit d, q; SigBit d, q;
for (const auto &c : cell->connections()) { for (const auto &c : cell->connections()) {
@ -279,7 +279,7 @@ struct XAigerWriter
ff_bits.emplace_back(d, q); ff_bits.emplace_back(d, q);
undriven_bits.erase(q); undriven_bits.erase(q);
} }
else if (!inst_module->attributes.count("\\abc_box_id")) { else if (inst_module && !inst_module->attributes.count("\\abc_box_id")) {
for (const auto &c : cell->connections()) { for (const auto &c : cell->connections()) {
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
for (auto b : c.second.bits()) { for (auto b : c.second.bits()) {
@ -386,15 +386,12 @@ struct XAigerWriter
} }
// Do some CI/CO post-processing: // Do some CI/CO post-processing:
// Erase all POs and COs that are undriven // Erase all POs that are undriven
for (auto bit : undriven_bits) { for (auto bit : undriven_bits)
//co_bits.erase(bit);
output_bits.erase(bit); output_bits.erase(bit);
}
// CIs cannot be undriven // CIs cannot be undriven
for (const auto &c : ci_bits) for (const auto &c : ci_bits)
undriven_bits.erase(c.first); undriven_bits.erase(c.first);
for (auto bit : unused_bits) for (auto bit : unused_bits)
undriven_bits.erase(bit); undriven_bits.erase(bit);