diff options
author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 18:53:08 +0100 |
---|---|---|
committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 18:53:08 +0100 |
commit | 57f75385b0960d6e1e30112a395a89ee4df07056 (patch) | |
tree | 363182d1590248c89019b290fbb305506f23f1e3 /ice40/arch.cc | |
parent | 447ed83638ef35967adae801430f24e92acb6010 (diff) | |
download | nextpnr-57f75385b0960d6e1e30112a395a89ee4df07056.tar.gz nextpnr-57f75385b0960d6e1e30112a395a89ee4df07056.tar.bz2 nextpnr-57f75385b0960d6e1e30112a395a89ee4df07056.zip |
Revert "Make PnR use Unlocked methods"
This reverts commit 9e4f97290a50fc5d9dc0cbe6ead945840b9811b1.
Diffstat (limited to 'ice40/arch.cc')
-rw-r--r-- | ice40/arch.cc | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 30eea776..74353fe6 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -242,11 +242,6 @@ IdString Arch::archArgsToId(ArchArgs args) const BelId Arch::getBelByName(IdString name) const { boost::lock_guard<boost::shared_mutex> lock(mtx_); - return getBelByNameUnlocked(name); -} - -BelId Arch::getBelByNameUnlocked(IdString name) const -{ BelId ret; if (bel_by_name.empty()) { @@ -281,13 +276,8 @@ BelRange Arch::getBelsAtSameTile(BelId bel) const WireId Arch::getWireBelPin(BelId bel, PortPin pin) const { - boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); - return getWireBelPinUnlocked(bel, pin); -} - -WireId Arch::getWireBelPinUnlocked(BelId bel, PortPin pin) const -{ WireId ret; + boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); NPNR_ASSERT(bel != BelId()); @@ -307,13 +297,8 @@ WireId Arch::getWireBelPinUnlocked(BelId bel, PortPin pin) const WireId Arch::getWireByName(IdString name) const { - boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); - return getWireByNameUnlocked(name); -} - -WireId Arch::getWireByNameUnlocked(IdString name) const -{ WireId ret; + boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); if (wire_by_name.empty()) { for (int i = 0; i < chip_info->num_wires; i++) @@ -331,13 +316,8 @@ WireId Arch::getWireByNameUnlocked(IdString name) const PipId Arch::getPipByName(IdString name) const { - boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); - return getPipByNameUnlocked(name); -} - -PipId Arch::getPipByNameUnlocked(IdString name) const -{ PipId ret; + boost::shared_lock_guard<boost::shared_mutex> lock(mtx_); if (pip_by_name.empty()) { for (int i = 0; i < chip_info->num_pips; i++) { |