diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-08-02 17:40:14 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-08-02 17:40:14 +0200 |
| commit | 1c1fd99b8ba686c21b17dd8d413a0a5ae6ba1a6d (patch) | |
| tree | 720a9484a0cddc47a97c53ca1adfc947f9409290 /generic | |
| parent | 114c230624c1d78fd606f09c629d351166a43574 (diff) | |
| download | nextpnr-1c1fd99b8ba686c21b17dd8d413a0a5ae6ba1a6d.tar.gz nextpnr-1c1fd99b8ba686c21b17dd8d413a0a5ae6ba1a6d.tar.bz2 nextpnr-1c1fd99b8ba686c21b17dd8d413a0a5ae6ba1a6d.zip | |
various fixes for generic arch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/arch.cc | 12 | ||||
| -rw-r--r-- | generic/arch.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/generic/arch.cc b/generic/arch.cc index cff638df..1c22dbf7 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -149,12 +149,6 @@ void Arch::addDecalGraphic(DecalId decal, const GraphicElement &graphic) refreshUi(); } -void Arch::setFrameDecal(DecalXY decalxy) -{ - frame_decalxy = decalxy; - refreshUiFrame(); -} - void Arch::setWireDecal(WireId wire, DecalXY decalxy) { wires.at(wire).decalxy = decalxy; @@ -403,18 +397,18 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const return (dx + dy) * grid_distance_to_delay; } -delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const; +delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const { const auto &driver = net_info->driver; auto driver_loc = getBelLocation(driver.cell->bel); auto sink_loc = getBelLocation(sink.cell->bel); int dx = abs(driver_loc.x - driver_loc.x); - int dy = abs(sink_loc.y - sink_locy); + int dy = abs(sink_loc.y - sink_loc.y); return (dx + dy) * grid_distance_to_delay; } -delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { return budget; } +delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { return budget; } // --------------------------------------------------------------- diff --git a/generic/arch.h b/generic/arch.h index 0c756d3a..d3e8f69e 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -110,7 +110,6 @@ struct Arch : BaseCtx void addGroupGroup(IdString group, IdString grp); void addDecalGraphic(DecalId decal, const GraphicElement &graphic); - void setFrameDecal(DecalXY decalxy); void setWireDecal(WireId wire, DecalXY decalxy); void setPipDecal(PipId pip, DecalXY decalxy); void setBelDecal(BelId bel, DecalXY decalxy); |