diff options
| author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-30 09:46:07 +0100 |
|---|---|---|
| committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-30 09:46:07 +0100 |
| commit | 412c920e94b44451fab15069fa220a82025971b3 (patch) | |
| tree | 5a291cce3831b5ca1aea9fa412438643e2834a6f /common | |
| parent | 3b9bde533a6a86f6ae5b3902e55a6f649d092608 (diff) | |
| parent | 44726a1785ff060e4ce32da53418ccc03b6d5932 (diff) | |
| download | nextpnr-412c920e94b44451fab15069fa220a82025971b3.tar.gz nextpnr-412c920e94b44451fab15069fa220a82025971b3.tar.bz2 nextpnr-412c920e94b44451fab15069fa220a82025971b3.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into treemodel
Diffstat (limited to 'common')
| -rw-r--r-- | common/nextpnr.cc | 2 | ||||
| -rw-r--r-- | common/router1.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/nextpnr.cc b/common/nextpnr.cc index 2c50c9a1..cf1b5982 100644 --- a/common/nextpnr.cc +++ b/common/nextpnr.cc @@ -91,6 +91,8 @@ WireId Context::getNetinfoSinkWire(NetInfo *net_info, int user_idx) const delay_t Context::getNetinfoRouteDelay(NetInfo *net_info, int user_idx) const { WireId src_wire = getNetinfoSourceWire(net_info); + if (src_wire == WireId()) + return 0; WireId cursor = getNetinfoSinkWire(net_info, user_idx); delay_t delay = 0; diff --git a/common/router1.cc b/common/router1.cc index 8a05236f..4ef7df64 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -216,7 +216,7 @@ struct Router next_qw.pip = pip; next_qw.delay = next_delay; next_qw.togo = ctx->estimateDelay(next_wire, dst_wire); - qw.randtag = ctx->rng(); + next_qw.randtag = ctx->rng(); visited[next_qw.wire] = next_qw; queue.push(next_qw); |