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

ice40: after review

Browse Source
This commit is contained in:
Sergiusz Bazanski 2018-07-25 11:57:10 +01:00
parent db4f2d2318
commit 2c34a50a7c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ice40/arch.h
View File

@ -749,7 +749,7 @@ struct Arch : BaseCtx
return src_bel; return src_bel;
} }
} }
NPNR_ASSERT(0); NPNR_ASSERT_FALSE("Expected PLL pin to share an output with an SB_IO D_IN_{0,1}");
} }
}; };

4
ice40/arch_place.cc
View File

@ -124,10 +124,10 @@ bool Arch::isValidBelForCell(CellInfo *cell, BelId bel) const
} }
// Is there a PLL that shares this IO buffer? // Is there a PLL that shares this IO buffer?
if (pll_bel.index != -1) { if (pll_bel.index != -1) {
auto pll_cell = getBoundBelCell(pll_bel);
// Is a PLL placed in this PLL bel? // Is a PLL placed in this PLL bel?
if (!checkBelAvail(pll_bel)) { if (pll_cell != IdString()) {
// Is the shared port driving a net? // Is the shared port driving a net?
auto pll_cell = getBoundBelCell(pll_bel);
auto pi = cells.at(pll_cell)->ports[portPinToId(pll_bel_pin)]; auto pi = cells.at(pll_cell)->ports[portPinToId(pll_bel_pin)];
if (pi.net != nullptr) { if (pi.net != nullptr) {
// Are we perhaps a PAD INPUT Bel that can be placed here? // Are we perhaps a PAD INPUT Bel that can be placed here?