Replaced more old SigChunk programming patterns

2 files changed, 10 insertions, 11 deletions

diff --git a/passes/proc/proc_dff.cc b/passes/proc/proc_dff.cc
index a8aba903a..5982fd8e4 100644
--- a/passes/proc/proc_dff.cc
+++ b/passes/proc/proc_dff.cc
@@ -382,7 +382,7 @@ static void proc_dff(RTLIL::Module *mod, RTLIL::Process *proc, ConstEval &ce)
 					sync_edge->signal, sync_level->signal, proc);
 		}
 		else
-			gen_dff(mod, insig, rstval.chunks()[0].data, sig,
+			gen_dff(mod, insig, rstval.as_const(), sig,
 					sync_edge->type == RTLIL::SyncType::STp,
 					sync_level && sync_level->type == RTLIL::SyncType::ST1,
 					sync_edge->signal, sync_level ? &sync_level->signal : NULL, proc);
diff --git a/passes/proc/proc_init.cc b/passes/proc/proc_init.cc
index 4c9b6bcd2..5976c2162 100644
--- a/passes/proc/proc_init.cc
+++ b/passes/proc/proc_init.cc
@@ -58,16 +58,15 @@ static void proc_init(RTLIL::Module *mod, RTLIL::Process *proc)
 					log_cmd_error("Failed to get a constant init value for %s: %s\n", log_signal(lhs), log_signal(rhs));
 
 				int offset = 0;
-				for (size_t i = 0; i < lhs.chunks().size(); i++) {
-					if (lhs.chunks()[i].wire == NULL)
-						continue;
-					RTLIL::Wire *wire = lhs.chunks()[i].wire;
-					RTLIL::SigSpec value = rhs.extract(offset, lhs.chunks()[i].width);
-					if (value.size() != wire->width)
-						log_cmd_error("Init value is not for the entire wire: %s = %s\n", log_signal(lhs.chunks()[i]), log_signal(value));
-					log("  Setting init value: %s = %s\n", log_signal(wire), log_signal(value));
-					wire->attributes["\\init"] = value.as_const();
-					offset += wire->width;
+				for (auto &lhs_c : lhs.chunks()) {
+					if (lhs_c.wire != NULL) {
+						RTLIL::SigSpec value = rhs.extract(offset, lhs_c.width);
+						if (value.size() != lhs_c.wire->width)
+							log_cmd_error("Init value is not for the entire wire: %s = %s\n", log_signal(lhs_c), log_signal(value));
+						log("  Setting init value: %s = %s\n", log_signal(lhs_c.wire), log_signal(value));
+						lhs_c.wire->attributes["\\init"] = value.as_const();
+					}
+					offset += lhs_c.width;
 				}
 			}
 		}