From 423a10bc31a20bbdd03e85754971878f5a57f89b Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:49:01 -0800 Subject: Change CellInfo in getBelPinsForCellPin to be const. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- common/nextpnr.h | 4 ++-- fpga_interchange/arch.h | 2 +- generic/arch.cc | 2 +- generic/arch.h | 2 +- gowin/arch.cc | 2 +- gowin/arch.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/nextpnr.h b/common/nextpnr.h index ed227fb6..59198d6d 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -1146,7 +1146,7 @@ template struct ArchAPI : BaseCtx virtual WireId getBelPinWire(BelId bel, IdString pin) const = 0; virtual PortType getBelPinType(BelId bel, IdString pin) const = 0; virtual typename R::BelPinsRangeT getBelPins(BelId bel) const = 0; - virtual typename R::CellBelPinRangeT getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const = 0; + virtual typename R::CellBelPinRangeT getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const = 0; // Wire methods virtual typename R::AllWiresRangeT getWires() const = 0; virtual WireId getWireByName(IdStringList name) const = 0; @@ -1298,7 +1298,7 @@ template struct BaseArch : ArchAPI return empty_if_possible(); } - virtual typename R::CellBelPinRangeT getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const override + virtual typename R::CellBelPinRangeT getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const override { return return_if_match, typename R::CellBelPinRangeT>({pin}); } diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h index 82a2788b..1118a96b 100644 --- a/fpga_interchange/arch.h +++ b/fpga_interchange/arch.h @@ -1033,7 +1033,7 @@ struct Arch : ArchAPI return str_range; } - const std::vector &getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const override + const std::vector &getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const override { return cell_info->cell_bel_pins.at(pin); } diff --git a/generic/arch.cc b/generic/arch.cc index 03d8c801..1f9531c7 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -347,7 +347,7 @@ std::vector Arch::getBelPins(BelId bel) const return ret; } -const std::vector &Arch::getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const +const std::vector &Arch::getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const { return cell_info->bel_pins.at(pin); } diff --git a/generic/arch.h b/generic/arch.h index 8a5b27e0..cc8de484 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -247,7 +247,7 @@ struct Arch : ArchAPI WireId getBelPinWire(BelId bel, IdString pin) const override; PortType getBelPinType(BelId bel, IdString pin) const override; std::vector getBelPins(BelId bel) const override; - const std::vector &getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const override; + const std::vector &getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const override; WireId getWireByName(IdStringList name) const override; IdStringList getWireName(WireId wire) const override; diff --git a/gowin/arch.cc b/gowin/arch.cc index d1fbd0ed..7e947341 100644 --- a/gowin/arch.cc +++ b/gowin/arch.cc @@ -824,7 +824,7 @@ std::vector Arch::getBelPins(BelId bel) const return ret; } -std::array Arch::getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const { return {pin}; } +std::array Arch::getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const { return {pin}; } // --------------------------------------------------------------- diff --git a/gowin/arch.h b/gowin/arch.h index 0b0d7b9c..052c1545 100644 --- a/gowin/arch.h +++ b/gowin/arch.h @@ -372,7 +372,7 @@ struct Arch : BaseArch WireId getBelPinWire(BelId bel, IdString pin) const override; PortType getBelPinType(BelId bel, IdString pin) const override; std::vector getBelPins(BelId bel) const override; - std::array getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const override; + std::array getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const override; WireId getWireByName(IdStringList name) const override; IdStringList getWireName(WireId wire) const override; -- cgit v1.2.3