From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 3 May 2019 15:05:37 +0000 (-0700)
Subject: Revert "dffinit -noreinit to silently continue when init value is 1'bx"
X-Git-Tag: yosys-0.9~156^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc349de0338db3831e7156a5dc60f028382bcab1;p=yosys.git

Revert "dffinit -noreinit to silently continue when init value is 1'bx"

This reverts commit aa081f83c791b1d666214776aaf744a80ce6a690.
---

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]);
 					}