caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[interchange] Fix invalid use of local variables due to refactoring.

Browse Source 
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2021-04-02 16:20:12 -07:00
parent 8773c645ca
commit c2a6f6ce62
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fpga_interchange/site_arch.cc
View File

@ -269,6 +269,9 @@ SiteArch::SiteArch(const SiteInformation *site_info) : ctx(site_info->ctx), site
NPNR_ASSERT(result.second);
}
}
blocking_net.name = ctx->id("$nextpnr_blocked_net");
blocking_site_net.net = &blocking_net;
}
const char *SiteArch::nameOfWire(const SiteWire &wire) const

3
fpga_interchange/site_arch.h
View File

@ -279,6 +279,9 @@ struct SiteArch
HashTables::HashMap<NetInfo *, SiteNetInfo> nets;
HashTables::HashMap<SiteWire, SiteNetMap> wire_to_nets;
NetInfo blocking_net;
SiteNetInfo blocking_site_net;
std::vector<PipId> input_site_ports;
std::vector<PipId> output_site_ports;

7
fpga_interchange/site_router.cc
View File

@ -1033,11 +1033,6 @@ static void block_lut_outputs(SiteArch *site_arch,
const HashTables::HashSet<std::pair<IdString, IdString>> &blocked_wires) {
const Context * ctx = site_arch->site_info->ctx;
auto &tile_info = ctx->chip_info->tile_types[site_arch->site_info->tile_type];
NetInfo blocking_net;
blocking_net.name = ctx->id("$nextpnr_blocked_net");
SiteNetInfo blocking_site_net;
blocking_site_net.net = &blocking_net;
for(const auto & bel_pin_pair : blocked_wires) {
IdString bel_name = bel_pin_pair.first;
IdString bel_pin = bel_pin_pair.second;
@ -1056,7 +1051,7 @@ static void block_lut_outputs(SiteArch *site_arch,
bel.index = bel_index;
SiteWire lut_output_wire = site_arch->getBelPinWire(bel, bel_pin);
site_arch->bindWire(lut_output_wire, &blocking_site_net);
site_arch->bindWire(lut_output_wire, &site_arch->blocking_site_net);
}
}