Manual fixes for new cell connections API

2 files changed, 13 insertions, 6 deletions

diff --git a/passes/proc/proc_dff.cc b/passes/proc/proc_dff.cc
index 2e2d4701f..cfd2eb7a7 100644
--- a/passes/proc/proc_dff.cc
+++ b/passes/proc/proc_dff.cc
@@ -160,15 +160,15 @@ static void gen_dffsr(RTLIL::Module *mod, RTLIL::SigSpec sig_in, RTLIL::SigSpec
 
 	RTLIL::Cell *mux_sr_set = mod->addCell(NEW_ID, "$mux");
 	mux_sr_set->parameters["\\WIDTH"] = RTLIL::Const(sig_in.size());
-	mux_sr_set->connections()[set_polarity ? "\\A" : "\\B"] = RTLIL::Const(0, sig_in.size());
-	mux_sr_set->connections()[set_polarity ? "\\B" : "\\A"] = sig_set;
+	mux_sr_set->set(set_polarity ? "\\A" : "\\B", RTLIL::Const(0, sig_in.size()));
+	mux_sr_set->set(set_polarity ? "\\B" : "\\A", sig_set);
 	mux_sr_set->set("\\Y", sig_sr_set);
 	mux_sr_set->set("\\S", set);
 
 	RTLIL::Cell *mux_sr_clr = mod->addCell(NEW_ID, "$mux");
 	mux_sr_clr->parameters["\\WIDTH"] = RTLIL::Const(sig_in.size());
-	mux_sr_clr->connections()[set_polarity ? "\\A" : "\\B"] = RTLIL::Const(0, sig_in.size());
-	mux_sr_clr->connections()[set_polarity ? "\\B" : "\\A"] = sig_set_inv;
+	mux_sr_clr->set(set_polarity ? "\\A" : "\\B", RTLIL::Const(0, sig_in.size()));
+	mux_sr_clr->set(set_polarity ? "\\B" : "\\A", sig_set_inv);
 	mux_sr_clr->set("\\Y", sig_sr_clr);
 	mux_sr_clr->set("\\S", set);
 
diff --git a/passes/proc/proc_mux.cc b/passes/proc/proc_mux.cc
index 2ff755aef..30e7b748b 100644
--- a/passes/proc/proc_mux.cc
+++ b/passes/proc/proc_mux.cc
@@ -174,8 +174,15 @@ static void append_pmux(RTLIL::Module *mod, const RTLIL::SigSpec &signal, const
 	RTLIL::SigSpec ctrl_sig = gen_cmp(mod, signal, compare, sw);
 	assert(ctrl_sig.size() == 1);
 	last_mux_cell->type = "$pmux";
-	last_mux_cell->get("\\S").append(ctrl_sig);
-	last_mux_cell->get("\\B").append(when_signal);
+
+	RTLIL::SigSpec new_s = last_mux_cell->get("\\S");
+	new_s.append(ctrl_sig);
+	last_mux_cell->set("\\S", new_s);
+
+	RTLIL::SigSpec new_b = last_mux_cell->get("\\B");
+	new_b.append(when_signal);
+	last_mux_cell->set("\\B", new_b);
+
 	last_mux_cell->parameters["\\S_WIDTH"] = last_mux_cell->get("\\S").size();
 }