diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-25 19:45:38 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-25 19:45:38 +0200 |
| commit | 7a8e8999d21205044e707a2765dc444531d69cef (patch) | |
| tree | 7085808be6ffebcd52da35af98577c736e523b5b | |
| parent | 75744ff14cef6a8b1f44521bcb63b7b4a88037be (diff) | |
| download | nextpnr-7a8e8999d21205044e707a2765dc444531d69cef.tar.gz nextpnr-7a8e8999d21205044e707a2765dc444531d69cef.tar.bz2 nextpnr-7a8e8999d21205044e707a2765dc444531d69cef.zip | |
clangformat
Signed-off-by: David Shah <davey1576@gmail.com>
| -rw-r--r-- | common/nextpnr.h | 8 | ||||
| -rw-r--r-- | ecp5/arch.cc | 3 | ||||
| -rw-r--r-- | ecp5/bitstream.cc | 4 | ||||
| -rw-r--r-- | generic/arch.cc | 10 |
4 files changed, 10 insertions, 15 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index f7f1cebc..1cce21c0 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -276,11 +276,11 @@ struct CellInfo : ArchCellInfo // placement constraints CellInfo *constr_parent; - std::vector<CellInfo*> constr_children; + std::vector<CellInfo *> constr_children; const int UNCONSTR = INT_MIN; - int constr_x = UNCONSTR; // this.x - parent.x - int constr_y = UNCONSTR; // this.y - parent.y - int constr_z = UNCONSTR; // this.z - parent.z + int constr_x = UNCONSTR; // this.x - parent.x + int constr_y = UNCONSTR; // this.y - parent.y + int constr_z = UNCONSTR; // this.z - parent.z bool constr_abs_z = false; // parent.z := 0 // parent.[xyz] := 0 when (constr_parent == nullptr) }; diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 3e8676ca..55fe5704 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -328,7 +328,8 @@ BelId Arch::getPackagePinBel(const std::string &pin) const std::string Arch::getBelPackagePin(BelId bel) const { for (int i = 0; i < package_info->num_pins; i++) { - if (Location(package_info->pin_data[i].abs_loc) == bel.location && package_info->pin_data[i].bel_index == bel.index) { + if (Location(package_info->pin_data[i].abs_loc) == bel.location && + package_info->pin_data[i].bel_index == bel.index) { return package_info->pin_data[i].name.get(); } } diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index f1feba24..f87b7038 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -280,8 +280,8 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex other = "PIOD"; else log_error("cannot place differential IO at location %s\n", pio.c_str()); - //cc.tiles[pio_tile].add_enum(other + ".BASE_TYPE", "_NONE_"); - //cc.tiles[pic_tile].add_enum(other + ".BASE_TYPE", "_NONE_"); + // cc.tiles[pio_tile].add_enum(other + ".BASE_TYPE", "_NONE_"); + // cc.tiles[pic_tile].add_enum(other + ".BASE_TYPE", "_NONE_"); cc.tiles[pio_tile].add_enum(other + ".PULLMODE", "NONE"); cc.tiles[pio_tile].add_enum(pio + ".PULLMODE", "NONE"); } diff --git a/generic/arch.cc b/generic/arch.cc index ac79ebea..d7401356 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -207,15 +207,9 @@ BelId Arch::getBelByLocation(Loc loc) const return BelId(); } -const std::vector<BelId> &Arch::getBelsByTile(int x, int y) const -{ - return bels_by_tile.at(x).at(y); -} +const std::vector<BelId> &Arch::getBelsByTile(int x, int y) const { return bels_by_tile.at(x).at(y); } -bool Arch::getBelGlobalBuf(BelId bel) const -{ - return bels.at(bel).gb; -} +bool Arch::getBelGlobalBuf(BelId bel) const { return bels.at(bel).gb; } uint32_t Arch::getBelChecksum(BelId bel) const { |