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

Merge pull request #3001 from YosysHQ/claire/sigcheck 

Add additional check to SigSpec
This commit is contained in:
Miodrag Milanović 2021-09-10 17:32:04 +02:00 committed by GitHub
parent 33749f1e3a 4708907be8
commit 396918cc30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/rtlil.cc
View File

@ -1753,7 +1753,7 @@ void RTLIL::Module::check()
log_assert(!it.second->type.empty()); log_assert(!it.second->type.empty());
for (auto &it2 : it.second->connections()) { for (auto &it2 : it.second->connections()) {
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
it2.second.check(); it2.second.check(this);
} }
for (auto &it2 : it.second->attributes) for (auto &it2 : it.second->attributes)
log_assert(!it2.first.empty()); log_assert(!it2.first.empty());
@ -1799,8 +1799,8 @@ void RTLIL::Module::check()
for (auto &it : connections_) { for (auto &it : connections_) {
log_assert(it.first.size() == it.second.size()); log_assert(it.first.size() == it.second.size());
log_assert(!it.first.has_const()); log_assert(!it.first.has_const());
it.first.check(); it.first.check(this);
it.second.check(); it.second.check(this);
} }
for (auto &it : attributes) for (auto &it : attributes)
@ -4130,7 +4130,7 @@ RTLIL::SigSpec RTLIL::SigSpec::repeat(int num) const
} }
#ifndef NDEBUG #ifndef NDEBUG
void RTLIL::SigSpec::check() const void RTLIL::SigSpec::check(Module *mod) const
{ {
if (width_ > 64) if (width_ > 64)
{ {
@ -4156,6 +4156,8 @@ void RTLIL::SigSpec::check() const
log_assert(chunk.width >= 0); log_assert(chunk.width >= 0);
log_assert(chunk.offset + chunk.width <= chunk.wire->width); log_assert(chunk.offset + chunk.width <= chunk.wire->width);
log_assert(chunk.data.size() == 0); log_assert(chunk.data.size() == 0);
if (mod != nullptr)
log_assert(chunk.wire->module == mod);
} }
w += chunk.width; w += chunk.width;
} }
@ -4166,6 +4168,12 @@ void RTLIL::SigSpec::check() const
{ {
cover("kernel.rtlil.sigspec.check.unpacked"); cover("kernel.rtlil.sigspec.check.unpacked");
if (mod != nullptr) {
for (size_t i = 0; i < bits_.size(); i++)
if (bits_[i].wire != nullptr)
log_assert(bits_[i].wire->module == mod);
}
log_assert(width_ == GetSize(bits_)); log_assert(width_ == GetSize(bits_));
log_assert(chunks_.empty()); log_assert(chunks_.empty());
} }

4
kernel/rtlil.h
View File

@ -965,9 +965,9 @@ public:
unsigned int hash() const { if (!hash_) updhash(); return hash_; }; unsigned int hash() const { if (!hash_) updhash(); return hash_; };
#ifndef NDEBUG #ifndef NDEBUG
void check() const; void check(Module *mod = nullptr) const;
#else #else
void check() const { } void check(Module *mod = nullptr) const { }
#endif #endif
}; };