Removed RTLIL::SigSpec::expand() method

5 files changed, 86 insertions, 200 deletions

diff --git a/kernel/consteval.h b/kernel/consteval.h
index 5836cdd5b..3a8ef44a0 100644
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -71,11 +71,8 @@ struct ConstEval
 		assign_map.apply(sig);
 #ifndef NDEBUG
 		RTLIL::SigSpec current_val = values_map(sig);
-		current_val.expand();
-		for (size_t i = 0; i < current_val.chunks().size(); i++) {
-			const RTLIL::SigChunk &chunk = current_val.chunks()[i];
-			assert(chunk.wire != NULL || chunk.data.bits[0] == value.bits[i]);
-		}
+		for (int i = 0; i < SIZE(current_val); i++)
+			assert(current_val[i].wire != NULL || current_val[i] == value.bits[i]);
 #endif
 		values_map.add(sig, RTLIL::SigSpec(value));
 	}
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index f907ff642..7dcf32b7e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1548,18 +1548,6 @@ bool RTLIL::SigSpec::packed() const
 	return bits_.empty();
 }
 
-void RTLIL::SigSpec::expand()
-{
-	pack();
-	std::vector<RTLIL::SigChunk> new_chunks;
-	for (size_t i = 0; i < chunks_.size(); i++) {
-		for (int j = 0; j < chunks_[i].width; j++)
-			new_chunks.push_back(chunks_[i].extract(j, 1));
-	}
-	chunks_.swap(new_chunks);
-	check();
-}
-
 void RTLIL::SigSpec::optimize()
 {
 	pack();
@@ -1791,35 +1779,6 @@ void RTLIL::SigSpec::append_bit(const RTLIL::SigBit &bit)
 	// check();
 }
 
-bool RTLIL::SigSpec::combine(RTLIL::SigSpec signal, RTLIL::State freeState, bool do_override)
-{
-	pack();
-	signal.pack();
-
-	bool no_collisions = true;
-
-	assert(width_ == signal.width_);
-	expand();
-	signal.expand();
-
-	for (size_t i = 0; i < chunks_.size(); i++) {
-		bool self_free = chunks_[i].wire == NULL && chunks_[i].data.bits[0] == freeState;
-		bool other_free = signal.chunks_[i].wire == NULL && signal.chunks_[i].data.bits[0] == freeState;
-		if (!self_free && !other_free) {
-			if (do_override)
-				chunks_[i] = signal.chunks_[i];
-			else
-				chunks_[i] = RTLIL::SigChunk(RTLIL::State::Sx, 1);
-			no_collisions = false;
-		}
-		if (self_free && !other_free)
-			chunks_[i] = signal.chunks_[i];
-	}
-
-	optimize();
-	return no_collisions;
-}
-
 void RTLIL::SigSpec::extend(int width, bool is_signed)
 {
 	pack();
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index e1c5b1a6b..6c0a7b66f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -544,7 +544,6 @@ public:
 	inline RTLIL::SigSpecIterator begin() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = 0; return it; }
 	inline RTLIL::SigSpecIterator end() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = width_; return it; }
 
-	void expand();
 	void optimize();
 	RTLIL::SigSpec optimized() const;
 
@@ -567,8 +566,6 @@ public:
 	void append(const RTLIL::SigSpec &signal);
 	void append_bit(const RTLIL::SigBit &bit);
 
-	bool combine(RTLIL::SigSpec signal, RTLIL::State freeState = RTLIL::State::Sz, bool do_override = false);
-
 	void extend(int width, bool is_signed = false);
 	void extend_u0(int width, bool is_signed = false);
 
diff --git a/kernel/satgen.h b/kernel/satgen.h
index 9e2277076..ea04cb409 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;
diff --git a/kernel/sigtools.h b/kernel/sigtools.h
index cd179ebf0..1a84194ee 100644
--- a/kernel/sigtools.h
+++ b/kernel/sigtools.h
@@ -27,7 +27,11 @@
 
 struct SigPool
 {
-	typedef std::pair<RTLIL::Wire*,int> bitDef_t;
+	struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
+		bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
+		bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
+	};
+
 	std::set<bitDef_t> bits;
 
 	void clear()
@@ -37,14 +41,9 @@ struct SigPool
 
 	void add(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits.insert(bit);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits.insert(bit);
 	}
 
 	void add(const SigPool &other)
@@ -55,14 +54,9 @@ struct SigPool
 
 	void del(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits.erase(bit);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits.erase(bit);
 	}
 
 	void del(const SigPool &other)
@@ -73,15 +67,10 @@ struct SigPool
 
 	void expand(RTLIL::SigSpec from, RTLIL::SigSpec to)
 	{
-		from.expand();
-		to.expand();
-		assert(from.chunks().size() == to.chunks().size());
-		for (size_t i = 0; i < from.chunks().size(); i++) {
-			bitDef_t bit_from(from.chunks()[i].wire, from.chunks()[i].offset);
-			bitDef_t bit_to(to.chunks()[i].wire, to.chunks()[i].offset);
-			if (bit_from.first == NULL || bit_to.first == NULL)
-				continue;
-			if (bits.count(bit_from) > 0)
+		assert(SIZE(from) == SIZE(to));
+		for (int i = 0; i < SIZE(from); i++) {
+			bitDef_t bit_from(from[i]), bit_to(to[i]);
+			if (bit_from.first != NULL && bit_to.first != NULL && bits.count(bit_from) > 0)
 				bits.insert(bit_to);
 		}
 	}
@@ -89,73 +78,49 @@ struct SigPool
 	RTLIL::SigSpec extract(RTLIL::SigSpec sig)
 	{
 		RTLIL::SigSpec result;
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			bitDef_t bit(c.wire, c.offset);
-			if (bits.count(bit) > 0)
-				result.append(c);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL && bits.count(bit))
+				result.append_bit(bit);
 		return result;
 	}
 
 	RTLIL::SigSpec remove(RTLIL::SigSpec sig)
 	{
 		RTLIL::SigSpec result;
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			bitDef_t bit(c.wire, c.offset);
-			if (bits.count(bit) == 0)
-				result.append(c);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL && bits.count(bit) == 0)
+				result.append(bit);
 		return result;
 	}
 
 	bool check_any(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			bitDef_t bit(c.wire, c.offset);
-			if (bits.count(bit) != 0)
+		for (auto &bit : sig)
+			if (bit.wire != NULL && bits.count(bit))
 				return true;
-		}
 		return false;
 	}
 
 	bool check_all(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			bitDef_t bit(c.wire, c.offset);
-			if (bits.count(bit) == 0)
+		for (auto &bit : sig)
+			if (bit.wire != NULL && bits.count(bit) == 0)
 				return false;
-		}
 		return true;
 	}
 
 	RTLIL::SigSpec export_one()
 	{
-		RTLIL::SigSpec sig;
-		for (auto &bit : bits) {
-			sig.append(RTLIL::SigSpec(bit.first, bit.second));
-			break;
-		}
-		return sig;
+		for (auto &bit : bits)
+			return RTLIL::SigSpec(bit.first, bit.second);
+		return RTLIL::SigSpec();
 	}
 
 	RTLIL::SigSpec export_all()
 	{
-		RTLIL::SigSpec sig;
+		std::set<RTLIL::SigBit> sig;
 		for (auto &bit : bits)
-			sig.append(RTLIL::SigSpec(bit.first, bit.second));
-		sig.sort_and_unify();
+			sig.insert(RTLIL::SigBit(bit.first, bit.second));
 		return sig;
 	}
 
@@ -168,7 +133,11 @@ struct SigPool
 template <typename T, class Compare = std::less<T>>
 struct SigSet
 {
-	typedef std::pair<RTLIL::Wire*,int> bitDef_t;
+	struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
+		bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
+		bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
+	};
+
 	std::map<bitDef_t, std::set<T, Compare>> bits;
 
 	void clear()
@@ -178,75 +147,46 @@ struct SigSet
 
 	void insert(RTLIL::SigSpec sig, T data)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits[bit].insert(data);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits[bit].insert(data);
 	}
 
 	void insert(RTLIL::SigSpec sig, const std::set<T> &data)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits[bit].insert(data.begin(), data.end());
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits[bit].insert(data.begin(), data.end());
 	}
 
 	void erase(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits[bit].clear();
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits[bit].clear();
 	}
 
 	void erase(RTLIL::SigSpec sig, T data)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits[bit].erase(data);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits[bit].erase(data);
 	}
 
 	void erase(RTLIL::SigSpec sig, const std::set<T> &data)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			bits[bit].erase(data.begin(), data.end());
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL)
+				bits[bit].erase(data.begin(), data.end());
 	}
 
 	void find(RTLIL::SigSpec sig, std::set<T> &result)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			for (auto &data : bits[bit])
-				result.insert(data);
-		}
+		for (auto &bit : sig)
+			if (bit.wire != NULL) {
+				auto &data = bits[bit];
+				result.insert(data.begin(), data.end());
+			}
 	}
 
 	std::set<T> find(RTLIL::SigSpec sig)
@@ -258,22 +198,19 @@ struct SigSet
 
 	bool has(RTLIL::SigSpec sig)
 	{
-		sig.expand();
-		for (auto &c : sig.chunks()) {
-			if (c.wire == NULL)
-				continue;
-			assert(c.width == 1);
-			bitDef_t bit(c.wire, c.offset);
-			if (bits.count(bit))
+		for (auto &bit : sig)
+			if (bit.wire != NULL && bits.count(bit))
 				return true;
-		}
 		return false;
 	}
 };
 
 struct SigMap
 {
-	typedef std::pair<RTLIL::Wire*,int> bitDef_t;
+	struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
+		bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
+		bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
+	};
 
 	struct shared_bit_data_t {
 		RTLIL::SigBit map_to;
@@ -337,22 +274,20 @@ struct SigMap
 	}
 
 	// internal helper function
-	void register_bit(const RTLIL::SigBit &b)
+	void register_bit(const RTLIL::SigBit &bit)
 	{
-		bitDef_t bit(b.wire, b.offset);
-		if (b.wire && bits.count(bit) == 0) {
+		if (bit.wire && bits.count(bit) == 0) {
 			shared_bit_data_t *bd = new shared_bit_data_t;
-			bd->map_to = b;
+			bd->map_to = bit;
 			bd->bits.insert(bit);
 			bits[bit] = bd;
 		}
 	}
 
 	// internal helper function
-	void unregister_bit(const RTLIL::SigBit &b)
+	void unregister_bit(const RTLIL::SigBit &bit)
 	{
-		bitDef_t bit(b.wire, b.offset);
-		if (b.wire && bits.count(bit) > 0) {
+		if (bit.wire && bits.count(bit) > 0) {
 			shared_bit_data_t *bd = bits[bit];
 			bd->bits.erase(bit);
 			if (bd->bits.size() == 0)
@@ -366,11 +301,8 @@ struct SigMap
 	{
 		assert(bit1.wire != NULL && bit2.wire != NULL);
 
-		bitDef_t b1(bit1.wire, bit1.offset);
-		bitDef_t b2(bit2.wire, bit2.offset);
-
-		shared_bit_data_t *bd1 = bits[b1];
-		shared_bit_data_t *bd2 = bits[b2];
+		shared_bit_data_t *bd1 = bits[bit1];
+		shared_bit_data_t *bd2 = bits[bit2];
 		assert(bd1 != NULL && bd2 != NULL);
 
 		if (bd1 == bd2)
@@ -394,20 +326,18 @@ struct SigMap
 	}
 
 	// internal helper function
-	void set_bit(const RTLIL::SigBit &b1, const RTLIL::SigBit &b2)
+	void set_bit(const RTLIL::SigBit &bit1, const RTLIL::SigBit &bit2)
 	{
-		assert(b1.wire != NULL);
-		bitDef_t bit(b1.wire, b1.offset);
-		assert(bits.count(bit) > 0);
-		bits[bit]->map_to = b2;
+		assert(bit1.wire != NULL);
+		assert(bits.count(bit1) > 0);
+		bits[bit1]->map_to = bit2;
 	}
 
 	// internal helper function
-	void map_bit(RTLIL::SigBit &b) const
+	void map_bit(RTLIL::SigBit &bit) const
 	{
-		bitDef_t bit(b.wire, b.offset);
-		if (b.wire && bits.count(bit) > 0)
-			b = bits.at(bit)->map_to;
+		if (bit.wire && bits.count(bit) > 0)
+			bit = bits.at(bit)->map_to;
 	}
 
 	void add(RTLIL::SigSpec from, RTLIL::SigSpec to)
@@ -446,6 +376,11 @@ struct SigMap
 			unregister_bit(bit);
 	}
 
+	void apply(RTLIL::SigBit &bit) const
+	{
+		map_bit(bit);
+	}
+
 	void apply(RTLIL::SigSpec &sig) const
 	{
 		for (auto &bit : sig)