diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-05-03 08:05:37 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-05-03 08:05:37 -0700 |
| commit | fc349de0338db3831e7156a5dc60f028382bcab1 (patch) | |
| tree | e5de47541bfba54b3f700c5b978274d318370a0f | |
| parent | 1f62dc9081feb4852b1848d01951f631853edb38 (diff) | |
| download | yosys-fc349de0338db3831e7156a5dc60f028382bcab1.tar.gz yosys-fc349de0338db3831e7156a5dc60f028382bcab1.tar.bz2 yosys-fc349de0338db3831e7156a5dc60f028382bcab1.zip | |
Revert "dffinit -noreinit to silently continue when init value is 1'bx"
This reverts commit aa081f83c791b1d666214776aaf744a80ce6a690.
| -rw-r--r-- | passes/techmap/dffinit.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/passes/techmap/dffinit.cc b/passes/techmap/dffinit.cc index 37479da65..48390488e 100644 --- a/passes/techmap/dffinit.cc +++ b/passes/techmap/dffinit.cc @@ -135,18 +135,10 @@ struct DffinitPass : public Pass { continue; while (GetSize(value.bits) <= i) value.bits.push_back(State::S0); - if (noreinit && value.bits[i] != State::Sx && value.bits[i] != init_bits.at(sig[i])) { - if (init_bits.at(sig[i]) != State::Sx) { - log_error("Trying to assign a different init value for %s.%s.%s which technically " - "have a conflicted init value.\n", - log_id(module), log_id(cell), log_id(it.second)); - } - else { - // Trying to overwrite an existing INIT value with 1'bx, - // silently ignore? - continue; - } - } + if (noreinit && value.bits[i] != State::Sx && value.bits[i] != init_bits.at(sig[i])) + log_error("Trying to assign a different init value for %s.%s.%s which technically " + "have a conflicted init value.\n", + log_id(module), log_id(cell), log_id(it.second)); value.bits[i] = init_bits.at(sig[i]); cleanup_bits.insert(sig[i]); } |