summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-07-24 04:46:36 +0200
committerClifford Wolf <clifford@clifford.at>2014-07-24 04:46:36 +0200
commit22ede43b3f5016784b2e22c0ea95b7f718d7598e (patch)
treedfa6d5c20d3efa5dff08e19f7a9c8b3a6a5a5109 /kernel
parent3a2c5357771df05f80bff55e8ab3e467308c57d1 (diff)
Small changes regarding cover() and check() in SigSpec
Diffstat (limited to 'kernel')
-rw-r--r--kernel/rtlil.cc15
-rw-r--r--kernel/rtlil.h4
2 files changed, 9 insertions, 10 deletions
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index ca8e9b6d..5194b5f7 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1594,10 +1594,7 @@ void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec
void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec &with, RTLIL::SigSpec *other) const
{
- if (other)
- cover("kernel.rtlil.sigspec.replace_other");
- else
- cover("kernel.rtlil.sigspec.replace");
+ cover("kernel.rtlil.sigspec.replace");
unpack();
pattern.unpack();
@@ -1797,8 +1794,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
bits_.insert(bits_.end(), signal.bits_.begin(), signal.bits_.end());
width_ += signal.width_;
-
- check();
+ // check();
}
void RTLIL::SigSpec::append_bit(const RTLIL::SigBit &bit)
@@ -1829,8 +1825,7 @@ void RTLIL::SigSpec::append_bit(const RTLIL::SigBit &bit)
}
width_++;
-
- check();
+ // check();
}
void RTLIL::SigSpec::extend(int width, bool is_signed)
@@ -1881,9 +1876,9 @@ RTLIL::SigSpec RTLIL::SigSpec::repeat(int num) const
return sig;
}
+#ifndef NDEBUG
void RTLIL::SigSpec::check() const
{
-#ifndef NDEBUG
if (packed())
{
cover("kernel.rtlil.sigspec.check.packed");
@@ -1916,8 +1911,8 @@ void RTLIL::SigSpec::check() const
assert(width_ == SIZE(bits_));
assert(chunks_.empty());
}
-#endif
}
+#endif
bool RTLIL::SigSpec::operator <(const RTLIL::SigSpec &other) const
{
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index c25f7185..68eee46e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -599,7 +599,11 @@ public:
operator std::vector<RTLIL::SigChunk>() const { return chunks(); }
operator std::vector<RTLIL::SigBit>() const { return bits(); }
+#ifndef NDEBUG
void check() const;
+#else
+ inline void check() const { }
+#endif
};
inline RTLIL::SigBit &RTLIL::SigSpecIterator::operator*() const {