summaryrefslogtreecommitdiff
path: root/kernel/satgen.h
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-07-23 16:09:27 +0200
committerClifford Wolf <clifford@clifford.at>2014-07-23 19:34:51 +0200
commita62c21c9c64ad5b3e0dae5d4ee4857425f73068e (patch)
tree81cbbd4bbd869af6290eb0e19e4cfdfbc9555c03 /kernel/satgen.h
parent54552f680938fd933b07fa38597937ba6d367be7 (diff)
Removed RTLIL::SigSpec::expand() method
Diffstat (limited to 'kernel/satgen.h')
-rw-r--r--kernel/satgen.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/satgen.h b/kernel/satgen.h
index 9e227707..ea04cb40 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -52,20 +52,18 @@ struct SatGen
{
log_assert(!undef_mode || model_undef);
sigmap->apply(sig);
- sig.expand();
std::vector<int> vec;
- vec.reserve(sig.chunks().size());
+ vec.reserve(SIZE(sig));
- for (auto &c : sig.chunks())
- if (c.wire == NULL) {
- RTLIL::State bit = c.data.bits.at(0);
+ for (auto &bit : sig)
+ if (bit.wire == NULL) {
if (model_undef && dup_undef && bit == RTLIL::State::Sx)
vec.push_back(ez->frozen_literal());
else
vec.push_back(bit == (undef_mode ? RTLIL::State::Sx : RTLIL::State::S1) ? ez->TRUE : ez->FALSE);
} else {
- std::string name = pf + stringf(c.wire->width == 1 ? "%s" : "%s [%d]", RTLIL::id2cstr(c.wire->name), c.offset);
+ std::string name = pf + stringf(bit.wire->width == 1 ? "%s" : "%s [%d]", RTLIL::id2cstr(bit.wire->name), bit.offset);
vec.push_back(ez->frozen_literal(name));
}
return vec;