mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 19:52:31 +00:00
Code Activity

Fixed memory corruption in "splice" command

Browse source
This commit is contained in:
Clifford Wolf 2014-12-29 20:23:22 +01:00
parent 29a555ec7e
commit ed8f1b42fc
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
passes/cmds/splice.cc
View file

@ -182,11 +182,13 @@ struct SpliceWorker
if (design->selected(module, it.second)) if (design->selected(module, it.second))
selected_bits.add(sigmap(it.second)); selected_bits.add(sigmap(it.second));
for (auto &it : module->cells_) { std::vector<Cell*> mod_cells = module->cells();
if (!sel_by_wire && !design->selected(module, it.second))
for (auto cell : mod_cells) {
if (!sel_by_wire && !design->selected(module, cell))
continue; continue;
for (auto &conn : it.second->connections_) for (auto &conn : cell->connections_)
if (ct.cell_input(it.second->type, conn.first)) { if (ct.cell_input(cell->type, conn.first)) {
if (ports.size() > 0 && !ports.count(conn.first)) if (ports.size() > 0 && !ports.count(conn.first))
continue; continue;
if (no_ports.size() > 0 && no_ports.count(conn.first)) if (no_ports.size() > 0 && no_ports.count(conn.first))
@ -205,24 +207,25 @@ struct SpliceWorker
} }
std::vector<std::pair<RTLIL::Wire*, RTLIL::SigSpec>> rework_wires; std::vector<std::pair<RTLIL::Wire*, RTLIL::SigSpec>> rework_wires;
std::vector<Wire*> mod_wires = module->wires();
for (auto &it : module->wires_) for (auto mod : mod_wires)
if (!no_outputs && it.second->port_output) { if (!no_outputs && mod->port_output) {
if (!design->selected(module, it.second)) if (!design->selected(module, mod))
continue; continue;
RTLIL::SigSpec sig = sigmap(it.second); RTLIL::SigSpec sig = sigmap(mod);
if (driven_chunks.count(sig) > 0) if (driven_chunks.count(sig) > 0)
continue; continue;
RTLIL::SigSpec new_sig = get_spliced_signal(sig); RTLIL::SigSpec new_sig = get_spliced_signal(sig);
if (new_sig != sig) if (new_sig != sig)
rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, new_sig)); rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(mod, new_sig));
} else } else
if (!it.second->port_input) { if (!mod->port_input) {
RTLIL::SigSpec sig = sigmap(it.second); RTLIL::SigSpec sig = sigmap(mod);
if (spliced_signals_cache.count(sig) && spliced_signals_cache.at(sig) != sig) if (spliced_signals_cache.count(sig) && spliced_signals_cache.at(sig) != sig)
rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, spliced_signals_cache.at(sig))); rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(mod, spliced_signals_cache.at(sig)));
else if (sliced_signals_cache.count(sig) && sliced_signals_cache.at(sig) != sig) else if (sliced_signals_cache.count(sig) && sliced_signals_cache.at(sig) != sig)
rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, sliced_signals_cache.at(sig))); rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(mod, sliced_signals_cache.at(sig)));
} }
for (auto &it : rework_wires) for (auto &it : rework_wires)