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

Prepare for situation when port of the signal cannot be found

This commit is contained in:
Bogdan Vukobratovic 2019-06-14 11:39:24 +02:00
parent 291b36afeb
commit 53695e6729
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/algo.h
View File

@ -58,10 +58,14 @@ struct Netlist {
return sigbit_driver_map.at(sig); return sigbit_driver_map.at(sig);
} }
RTLIL::SigBit& driver_port(RTLIL::SigBit sig) RTLIL::SigSpec driver_port(RTLIL::SigBit sig)
{ {
RTLIL::Cell *cell = driver_cell(sig); RTLIL::Cell *cell = driver_cell(sig);
if (!cell) {
return RTLIL::SigSpec();
}
for (auto &port : cell->connections_) { for (auto &port : cell->connections_) {
if (ct.cell_output(cell->type, port.first)) { if (ct.cell_output(cell->type, port.first)) {
RTLIL::SigSpec port_sig = sigmap(port.second); RTLIL::SigSpec port_sig = sigmap(port.second);
@ -72,6 +76,8 @@ struct Netlist {
} }
} }
} }
return RTLIL::SigSpec();
} }
void setup_netlist(RTLIL::Module *module, const CellTypes &ct) void setup_netlist(RTLIL::Module *module, const CellTypes &ct)

2
passes/opt/opt_rmdff.cc
View File

@ -503,7 +503,7 @@ bool handle_dff(RTLIL::Module *mod, RTLIL::Cell *dff)
// If the register bit cannot change, we can replace it with a constant // If the register bit cannot change, we can replace it with a constant
if (!counter_example_found) { if (!counter_example_found) {
RTLIL::SigBit &driver_port = net.driver_port(q_sigbit); RTLIL::SigSpec driver_port = net.driver_port(q_sigbit);
RTLIL::Wire *dummy_wire = mod->addWire(NEW_ID, 1); RTLIL::Wire *dummy_wire = mod->addWire(NEW_ID, 1);
for (auto &conn : mod->connections_) for (auto &conn : mod->connections_)