mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-07-28 23:17:57 +00:00
Code Activity

Using new obj iterator API in a few places

Browse source
This commit is contained in:
Clifford Wolf 2014-07-27 10:41:42 +02:00
parent 675cb93da9
commit 49f72421d5
10 changed files with 85 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

20
passes/techmap/simplemap.cc
View file

@ -435,21 +435,19 @@ struct SimplemapPass : public Pass {
std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> mappers;
simplemap_get_mappers(mappers);
for (auto &mod_it : design->modules_) {
if (!design->selected(mod_it.second))
for (auto mod : design->modules()) {
if (!design->selected(mod))
continue;
std::vector<RTLIL::Cell*> delete_cells;
for (auto &cell_it : mod_it.second->cells_) {
if (mappers.count(cell_it.second->type) == 0)
std::vector<RTLIL::Cell*> cells = mod->cells();
for (auto cell : cells) {
if (mappers.count(cell->type) == 0)
continue;
if (!design->selected(mod_it.second, cell_it.second))
if (!design->selected(mod, cell))
continue;
log("Mapping %s.%s (%s).\n", RTLIL::id2cstr(mod_it.first), RTLIL::id2cstr(cell_it.first), RTLIL::id2cstr(cell_it.second->type));
mappers.at(cell_it.second->type)(mod_it.second, cell_it.second);
delete_cells.push_back(cell_it.second);
log("Mapping %s.%s (%s).\n", log_id(mod), log_id(cell), log_id(cell->type));
mappers.at(cell->type)(mod, cell);
mod->remove(cell);
}
for (auto c : delete_cells)
mod_it.second->remove(c);
}
}
} SimplemapPass;

20
passes/techmap/techmap.cc
View file

@ -658,9 +658,9 @@ struct FlattenPass : public Pass {
RTLIL::Module *top_mod = NULL;
if (design->full_selection())
for (auto &mod_it : design->modules_)
if (mod_it.second->get_bool_attribute("\\top"))
top_mod = mod_it.second;
for (auto mod : design->modules())
if (mod->get_bool_attribute("\\top"))
top_mod = mod;
bool did_something = true;
std::set<RTLIL::Cell*> handled_cells;
@ -670,8 +670,8 @@ struct FlattenPass : public Pass {
if (worker.techmap_module(design, top_mod, design, handled_cells, celltypeMap, true))
did_something = true;
} else {
for (auto &mod_it : design->modules_)
if (worker.techmap_module(design, mod_it.second, design, handled_cells, celltypeMap, true))
for (auto mod : design->modules())
if (worker.techmap_module(design, mod, design, handled_cells, celltypeMap, true))
did_something = true;
}
}
@ -680,12 +680,12 @@ struct FlattenPass : public Pass {
if (top_mod != NULL) {
std::map<RTLIL::IdString, RTLIL::Module*> new_modules;
for (auto &mod_it : design->modules_)
if (mod_it.second == top_mod || mod_it.second->get_bool_attribute("\\blackbox")) {
new_modules[mod_it.first] = mod_it.second;
for (auto mod : design->modules())
if (mod == top_mod || mod->get_bool_attribute("\\blackbox")) {
new_modules[mod->name] = mod;
} else {
log("Deleting now unused module %s.\n", RTLIL::id2cstr(mod_it.first));
delete mod_it.second;
log("Deleting now unused module %s.\n", log_id(mod));
delete mod;
}
design->modules_.swap(new_modules);
}