From 30fd86ce69fa65e89dec119e23b5bccb54de70a3 Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 16 Feb 2022 13:53:47 +0000 Subject: refactor: New NetInfo and CellInfo constructors --- common/design_utils.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'common/design_utils.cc') diff --git a/common/design_utils.cc b/common/design_utils.cc index da5decf9..9432b6cd 100644 --- a/common/design_utils.cc +++ b/common/design_utils.cc @@ -129,12 +129,8 @@ void connect_ports(Context *ctx, CellInfo *cell1, IdString port1_name, CellInfo PortInfo &port1 = cell1->ports.at(port1_name); if (port1.net == nullptr) { // No net on port1; need to create one - std::unique_ptr p1net(new NetInfo()); - p1net->name = ctx->id(cell1->name.str(ctx) + "$conn$" + port1_name.str(ctx)); - connect_port(ctx, p1net.get(), cell1, port1_name); - IdString p1name = p1net->name; - NPNR_ASSERT(!ctx->cells.count(p1name)); - ctx->nets[p1name] = std::move(p1net); + NetInfo *p1net = ctx->createNet(ctx->id(cell1->name.str(ctx) + "$conn$" + port1_name.str(ctx))); + connect_port(ctx, p1net, cell1, port1_name); } connect_port(ctx, port1.net, cell2, port2_name); } -- cgit v1.2.3