diff options
| author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 11:46:32 +0100 |
|---|---|---|
| committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 11:46:32 +0100 |
| commit | 3352ff4abbcac563e08d78ed8aa77728d00284a8 (patch) | |
| tree | b8746b46f4d5f0e28ed86d0963647f6664a93d90 /common | |
| parent | f333a68753655a4ccf7da9a4da96e7fdd19f9d08 (diff) | |
| download | nextpnr-3352ff4abbcac563e08d78ed8aa77728d00284a8.tar.gz nextpnr-3352ff4abbcac563e08d78ed8aa77728d00284a8.tar.bz2 nextpnr-3352ff4abbcac563e08d78ed8aa77728d00284a8.zip | |
Move read methods to ReadMethods, remove some legacy access to Arch
Diffstat (limited to 'common')
| -rw-r--r-- | common/nextpnr.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/nextpnr.cc b/common/nextpnr.cc index 33230db0..01c1397e 100644 --- a/common/nextpnr.cc +++ b/common/nextpnr.cc @@ -170,20 +170,21 @@ uint32_t Context::checksum() const void Context::check() const { + auto &&proxy = rproxy(); for (auto &n : nets) { auto ni = n.second.get(); NPNR_ASSERT(n.first == ni->name); for (auto &w : ni->wires) { - NPNR_ASSERT(n.first == getBoundWireNet(w.first)); + NPNR_ASSERT(n.first == proxy.getBoundWireNet(w.first)); if (w.second.pip != PipId()) { NPNR_ASSERT(w.first == getPipDstWire(w.second.pip)); - NPNR_ASSERT(n.first == getBoundPipNet(w.second.pip)); + NPNR_ASSERT(n.first == proxy.getBoundPipNet(w.second.pip)); } } } for (auto w : getWires()) { - IdString net = getBoundWireNet(w); + IdString net = proxy.getBoundWireNet(w); if (net != IdString()) { NPNR_ASSERT(nets.at(net)->wires.count(w)); } @@ -192,7 +193,7 @@ void Context::check() const for (auto &c : cells) { NPNR_ASSERT(c.first == c.second->name); if (c.second->bel != BelId()) - NPNR_ASSERT(getBoundBelCell(c.second->bel) == c.first); + NPNR_ASSERT(proxy.getBoundBelCell(c.second->bel) == c.first); for (auto &port : c.second->ports) { NetInfo *net = port.second.net; if (net != nullptr) { |