mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 05:19:11 +00:00
Code Activity

Bugfix in "techmap -extern"

Browse source
This commit is contained in:
Clifford Wolf 2014-08-02 20:54:30 +02:00
parent 8e7361f128
commit b6acbc82e6
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/rtlil.cc
View file

@ -815,25 +815,34 @@ namespace {
void RTLIL::Module::check() void RTLIL::Module::check()
{ {
#ifndef NDEBUG #ifndef NDEBUG
std::vector<bool> ports_declared;
for (auto &it : wires_) { for (auto &it : wires_) {
log_assert(this == it.second->module); log_assert(this == it.second->module);
log_assert(it.first == it.second->name); log_assert(it.first == it.second->name);
log_assert(!it.first.empty()); log_assert(!it.first.empty());
log_assert(it.second->width >= 0); log_assert(it.second->width >= 0);
log_assert(it.second->port_id >= 0); log_assert(it.second->port_id >= 0);
for (auto &it2 : it.second->attributes) { for (auto &it2 : it.second->attributes)
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
} if (it.second->port_id) {
log_assert(it.second->port_input || it.second->port_output);
if (SIZE(ports_declared) < it.second->port_id)
ports_declared.resize(it.second->port_id);
log_assert(ports_declared[it.second->port_id-1] == false);
ports_declared[it.second->port_id-1] = true;
} else
log_assert(!it.second->port_input && !it.second->port_output);
} }
for (auto port_declared : ports_declared)
log_assert(port_declared == true);
for (auto &it : memories) { for (auto &it : memories) {
log_assert(it.first == it.second->name); log_assert(it.first == it.second->name);
log_assert(!it.first.empty()); log_assert(!it.first.empty());
log_assert(it.second->width >= 0); log_assert(it.second->width >= 0);
log_assert(it.second->size >= 0); log_assert(it.second->size >= 0);
for (auto &it2 : it.second->attributes) { for (auto &it2 : it.second->attributes)
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
}
} }
for (auto &it : cells_) { for (auto &it : cells_) {
@ -845,12 +854,10 @@ void RTLIL::Module::check()
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
it2.second.check(); it2.second.check();
} }
for (auto &it2 : it.second->attributes) { for (auto &it2 : it.second->attributes)
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
} for (auto &it2 : it.second->parameters)
for (auto &it2 : it.second->parameters) {
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
}
InternalCellChecker checker(this, it.second); InternalCellChecker checker(this, it.second);
checker.check(); checker.check();
} }
@ -867,9 +874,8 @@ void RTLIL::Module::check()
it.second.check(); it.second.check();
} }
for (auto &it : attributes) { for (auto &it : attributes)
log_assert(!it.first.empty()); log_assert(!it.first.empty());
}
#endif #endif
} }

1
passes/techmap/techmap.cc
View file

@ -504,6 +504,7 @@ struct TechmapWorker
RTLIL::Wire *new_wire = tpl->addWire(port_name, wire); RTLIL::Wire *new_wire = tpl->addWire(port_name, wire);
wire->port_input = false; wire->port_input = false;
wire->port_id = 0;
for (int i = 0; i < wire->width; i++) { for (int i = 0; i < wire->width; i++) {
port_new2old_map[RTLIL::SigBit(new_wire, i)] = RTLIL::SigBit(wire, i); port_new2old_map[RTLIL::SigBit(new_wire, i)] = RTLIL::SigBit(wire, i);