diff options
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.cc | 2 | ||||
| -rw-r--r-- | ecp5/bitstream.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 4a0b31b5..91331f7e 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -456,7 +456,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const el.x1 = bel.location.x + logic_cell_x1; el.x2 = bel.location.x + logic_cell_x2; el.y1 = bel.location.y + logic_cell_y1 + (2 * z) * logic_cell_pitch; - el.y2 = bel.location.y + logic_cell_y2 + (2 * z + 1) * logic_cell_pitch; + el.y2 = bel.location.y + logic_cell_y2 + (2 * z + 0.5f) * logic_cell_pitch; ret.push_back(el); } } diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index 95256732..6d43b369 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -385,6 +385,7 @@ std::vector<std::string> get_pll_tiles(Context *ctx, BelId bel) std::string name = ctx->locInfo(bel)->bel_data[bel.index].name.get(); std::vector<std::string> tiles; Loc loc = ctx->getBelLocation(bel); + static const std::set<std::string> pll1_lr = {"PLL1_LR", "BANKREF4"}; if (name == "EHXPLL_UL") { tiles.push_back(ctx->getTileByTypeAndLocation(loc.y, loc.x - 1, "PLL0_UL")); @@ -394,7 +395,7 @@ std::vector<std::string> get_pll_tiles(Context *ctx, BelId bel) tiles.push_back(ctx->getTileByTypeAndLocation(loc.y + 1, loc.x + 1, "BANKREF8")); } else if (name == "EHXPLL_LR") { tiles.push_back(ctx->getTileByTypeAndLocation(loc.y + 1, loc.x, "PLL0_LR")); - tiles.push_back(ctx->getTileByTypeAndLocation(loc.y + 1, loc.x - 1, "PLL1_LR")); + tiles.push_back(ctx->getTileByTypeAndLocation(loc.y + 1, loc.x - 1, pll1_lr)); } else if (name == "EHXPLL_UR") { tiles.push_back(ctx->getTileByTypeAndLocation(loc.y, loc.x - 1, "PLL0_UR")); tiles.push_back(ctx->getTileByTypeAndLocation(loc.y + 1, loc.x - 1, "PLL1_UR")); |