diff options
| -rw-r--r-- | common/nextpnr.h | 2 | ||||
| -rw-r--r-- | ecp5/arch.cc | 4 | ||||
| -rw-r--r-- | ecp5/arch.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index e950ad69..cb3f6e9f 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -1064,7 +1064,7 @@ typename std::enable_if<!std::is_same<Tret, Tc>::value, Tret>::type return_if_ma } // namespace -template <typename R> struct ArchBase : BaseCtx +template <typename R> struct BaseArch : BaseCtx { // -------------------------------------------------------------- // Arch API base diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 18fae1e2..51ba9311 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -105,8 +105,8 @@ Arch::Arch(ArchArgs args) : args(args) bel_to_cell.resize(chip_info->height * chip_info->width * max_loc_bels, nullptr); - ArchBase::init_cell_types(); - ArchBase::init_bel_buckets(); + BaseArch::init_cell_types(); + BaseArch::init_bel_buckets(); for (int i = 0; i < chip_info->width; i++) x_ids.push_back(id(stringf("X%d", i))); diff --git a/ecp5/arch.h b/ecp5/arch.h index 0d93a7a0..15520c18 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -465,7 +465,7 @@ struct ArchRanges using BucketBelRange = const std::vector<BelId> &; }; -struct Arch : ArchBase<ArchRanges> +struct Arch : BaseArch<ArchRanges> { const ChipInfoPOD *chip_info; const PackageInfoPOD *package_info; @@ -654,7 +654,7 @@ struct Arch : ArchBase<ArchRanges> if (pip != PipId()) { wire_fanout[getPipSrcWire(pip)]--; } - ArchBase::unbindWire(wire); + BaseArch::unbindWire(wire); } DelayInfo getWireDelay(WireId wire) const override @@ -703,13 +703,13 @@ struct Arch : ArchBase<ArchRanges> void bindPip(PipId pip, NetInfo *net, PlaceStrength strength) override { wire_fanout[getPipSrcWire(pip)]++; - ArchBase::bindPip(pip, net, strength); + BaseArch::bindPip(pip, net, strength); } void unbindPip(PipId pip) override { wire_fanout[getPipSrcWire(pip)]--; - ArchBase::unbindPip(pip); + BaseArch::unbindPip(pip); } AllPipRange getPips() const override |