From 8ca7a6da2525463be5be4ee9f62cfae0acc06b01 Mon Sep 17 00:00:00 2001 From: Sergiusz Bazanski Date: Sat, 14 Jul 2018 11:10:59 +0100 Subject: clang-format --- ice40/arch.cc | 104 +++++++++++++--------------------------------------------- ice40/arch.h | 55 ++++++++++++++++--------------- 2 files changed, 50 insertions(+), 109 deletions(-) (limited to 'ice40') diff --git a/ice40/arch.cc b/ice40/arch.cc index 790167e9..8f2731c6 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -259,99 +259,43 @@ BelRange Arch::getBelsAtSameTile(BelId bel) const // ----------------------------------------------------------------------- // Shorthands to ArchProxy -BelId Arch::getBelByName(IdString name) const -{ - return rproxy().getBelByName(name); -} +BelId Arch::getBelByName(IdString name) const { return rproxy().getBelByName(name); } -void Arch::bindWire(WireId wire, IdString net, PlaceStrength strength) -{ - rwproxy().bindWire(wire, net, strength); -} +void Arch::bindWire(WireId wire, IdString net, PlaceStrength strength) { rwproxy().bindWire(wire, net, strength); } -void Arch::unbindWire(WireId wire) -{ - rwproxy().unbindWire(wire); -} +void Arch::unbindWire(WireId wire) { rwproxy().unbindWire(wire); } -void Arch::bindBel(BelId bel, IdString cell, PlaceStrength strength) { - rwproxy().bindBel(bel, cell, strength); -} +void Arch::bindBel(BelId bel, IdString cell, PlaceStrength strength) { rwproxy().bindBel(bel, cell, strength); } -void Arch::unbindBel(BelId bel) -{ - rwproxy().unbindBel(bel); -} +void Arch::unbindBel(BelId bel) { rwproxy().unbindBel(bel); } -bool Arch::checkBelAvail(BelId bel) const -{ - return rproxy().checkBelAvail(bel); -} +bool Arch::checkBelAvail(BelId bel) const { return rproxy().checkBelAvail(bel); } -IdString Arch::getBoundBelCell(BelId bel) const -{ - return rproxy().getBoundBelCell(bel); -} +IdString Arch::getBoundBelCell(BelId bel) const { return rproxy().getBoundBelCell(bel); } -IdString Arch::getConflictingBelCell(BelId bel) const -{ - return rproxy().getConflictingBelCell(bel); -} +IdString Arch::getConflictingBelCell(BelId bel) const { return rproxy().getConflictingBelCell(bel); } -WireId Arch::getWireByName(IdString name) const -{ - return rproxy().getWireByName(name); -} +WireId Arch::getWireByName(IdString name) const { return rproxy().getWireByName(name); } -WireId Arch::getWireBelPin(BelId bel, PortPin pin) const -{ - return rproxy().getWireBelPin(bel, pin); -} +WireId Arch::getWireBelPin(BelId bel, PortPin pin) const { return rproxy().getWireBelPin(bel, pin); } -bool Arch::checkWireAvail(WireId wire) const -{ - return rproxy().checkWireAvail(wire); -} +bool Arch::checkWireAvail(WireId wire) const { return rproxy().checkWireAvail(wire); } -IdString Arch::getBoundWireNet(WireId wire) const -{ - return rproxy().getBoundWireNet(wire); -} +IdString Arch::getBoundWireNet(WireId wire) const { return rproxy().getBoundWireNet(wire); } -IdString Arch::getConflictingWireNet(WireId wire) const -{ - return rproxy().getConflictingWireNet(wire); -} +IdString Arch::getConflictingWireNet(WireId wire) const { return rproxy().getConflictingWireNet(wire); } -PipId Arch::getPipByName(IdString name) const -{ - return rproxy().getPipByName(name); -} +PipId Arch::getPipByName(IdString name) const { return rproxy().getPipByName(name); } -void Arch::bindPip(PipId pip, IdString net, PlaceStrength strength) -{ - return rwproxy().bindPip(pip, net, strength); -} +void Arch::bindPip(PipId pip, IdString net, PlaceStrength strength) { return rwproxy().bindPip(pip, net, strength); } -void Arch::unbindPip(PipId pip) -{ - return rwproxy().unbindPip(pip); -} +void Arch::unbindPip(PipId pip) { return rwproxy().unbindPip(pip); } -bool Arch::checkPipAvail(PipId pip) const -{ - return rproxy().checkPipAvail(pip); -} +bool Arch::checkPipAvail(PipId pip) const { return rproxy().checkPipAvail(pip); } -IdString Arch::getBoundPipNet(PipId pip) const -{ - return rproxy().getBoundPipNet(pip); -} +IdString Arch::getBoundPipNet(PipId pip) const { return rproxy().getBoundPipNet(pip); } -IdString Arch::getConflictingPipNet(PipId pip) const -{ - return rproxy().getConflictingPipNet(pip); -} +IdString Arch::getConflictingPipNet(PipId pip) const { return rproxy().getConflictingPipNet(pip); } // ----------------------------------------------------------------------- @@ -630,8 +574,7 @@ std::vector ArchReadMethods::getDecalGraphics(DecalId decal) con } if (bel_type == TYPE_ICESTORM_RAM) { - for (int i = 0; i < 2; i++) - { + for (int i = 0; i < 2; i++) { int tx = chip_info->bel_data[bel.index].x; int ty = chip_info->bel_data[bel.index].y + i; @@ -641,7 +584,7 @@ std::vector ArchReadMethods::getDecalGraphics(DecalId decal) con el.x1 = chip_info->bel_data[bel.index].x + logic_cell_x1; el.x2 = chip_info->bel_data[bel.index].x + logic_cell_x2; el.y1 = chip_info->bel_data[bel.index].y + logic_cell_y1; - el.y2 = chip_info->bel_data[bel.index].y + logic_cell_y2 + 7*logic_cell_pitch; + el.y2 = chip_info->bel_data[bel.index].y + logic_cell_y2 + 7 * logic_cell_pitch; el.z = 0; ret.push_back(el); @@ -936,9 +879,6 @@ void ArchMutateMethods::unbindPip(PipId pip) refreshUiWire(dst); } -CellInfo *ArchMutateMethods::getCell(IdString cell) -{ - return parent_->cells.at(cell).get(); -} +CellInfo *ArchMutateMethods::getCell(IdString cell) { return parent_->cells.at(cell).get(); } NEXTPNR_NAMESPACE_END diff --git a/ice40/arch.h b/ice40/arch.h index 5d4eaedf..f41990c3 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -343,7 +343,8 @@ class Arch : public BaseCtx // We let proxy methods access our state. friend class ArchMutateMethods; friend class ArchReadMethods; -private: + + private: // All of the following... std::vector bel_to_cell; std::vector wire_to_net; @@ -353,7 +354,7 @@ private: mutable std::unordered_map wire_by_name; mutable std::unordered_map pip_by_name; -public: + public: const ChipInfoPOD *chip_info; const PackageInfoPOD *package_info; @@ -410,10 +411,7 @@ public: return id(chip_info->bel_data[bel.index].name.get()); } - uint32_t getBelChecksum(BelId bel) const - { - return bel.index; - } + uint32_t getBelChecksum(BelId bel) const { return bel.index; } BelRange getBels() const { @@ -445,7 +443,6 @@ public: return chip_info->bel_data[bel.index].type; } - BelPin getBelPinUphill(WireId wire) const { BelPin ret; @@ -549,7 +546,6 @@ public: return range; } - BelId getPackagePinBel(const std::string &pin) const; std::string getBelPackagePin(BelId bel) const; @@ -611,8 +607,9 @@ public: }; // Read-only methods on Arch that require state access. -class ArchReadMethods : public BaseReadCtx { -private: +class ArchReadMethods : public BaseReadCtx +{ + private: const Arch *parent_; const ChipInfoPOD *chip_info; const std::vector &bel_to_cell; @@ -623,14 +620,15 @@ private: std::unordered_map &wire_by_name; std::unordered_map &pip_by_name; -public: - ~ArchReadMethods() noexcept { } - ArchReadMethods(const Arch *parent) : BaseReadCtx(parent), parent_(parent), - chip_info(parent->chip_info), bel_to_cell(parent->bel_to_cell), - wire_to_net(parent->wire_to_net), pip_to_net(parent->pip_to_net), - switches_locked(parent->switches_locked), - bel_by_name(parent->bel_by_name), wire_by_name(parent->wire_by_name), - pip_by_name(parent->pip_by_name) {} + public: + ~ArchReadMethods() noexcept {} + ArchReadMethods(const Arch *parent) + : BaseReadCtx(parent), parent_(parent), chip_info(parent->chip_info), bel_to_cell(parent->bel_to_cell), + wire_to_net(parent->wire_to_net), pip_to_net(parent->pip_to_net), + switches_locked(parent->switches_locked), bel_by_name(parent->bel_by_name), + wire_by_name(parent->wire_by_name), pip_by_name(parent->pip_by_name) + { + } ArchReadMethods(ArchReadMethods &&other) noexcept : ArchReadMethods(other.parent_) {} ArchReadMethods(const ArchReadMethods &other) : ArchReadMethods(other.parent_) {} @@ -669,9 +667,11 @@ public: }; // State mutating methods on Arch. -class ArchMutateMethods : public BaseMutateCtx { +class ArchMutateMethods : public BaseMutateCtx +{ friend class MutateContext; -private: + + private: Arch *parent_; const ChipInfoPOD *chip_info; std::vector &bel_to_cell; @@ -682,13 +682,14 @@ private: std::unordered_map &wire_by_name; std::unordered_map &pip_by_name; -public: - ArchMutateMethods(Arch *parent) : BaseMutateCtx(parent), parent_(parent), - chip_info(parent->chip_info), bel_to_cell(parent->bel_to_cell), - wire_to_net(parent->wire_to_net), pip_to_net(parent->pip_to_net), - switches_locked(parent->switches_locked), - bel_by_name(parent->bel_by_name), wire_by_name(parent->wire_by_name), - pip_by_name(parent->pip_by_name) {} + public: + ArchMutateMethods(Arch *parent) + : BaseMutateCtx(parent), parent_(parent), chip_info(parent->chip_info), bel_to_cell(parent->bel_to_cell), + wire_to_net(parent->wire_to_net), pip_to_net(parent->pip_to_net), + switches_locked(parent->switches_locked), bel_by_name(parent->bel_by_name), + wire_by_name(parent->wire_by_name), pip_by_name(parent->pip_by_name) + { + } ArchMutateMethods(ArchMutateMethods &&other) : ArchMutateMethods(other.parent_) {} ArchMutateMethods(const ArchMutateMethods &other) : ArchMutateMethods(other.parent_) {} ~ArchMutateMethods() {} -- cgit v1.2.3