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 +++++++++++++--------------------------------------------- 1 file changed, 22 insertions(+), 82 deletions(-) (limited to 'ice40/arch.cc') 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 -- cgit v1.2.3