caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clangformat

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-25 19:45:38 +02:00
parent 75744ff14c
commit 7a8e8999d2
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/nextpnr.h
View File

@ -276,11 +276,11 @@ struct CellInfo : ArchCellInfo
// placement constraints // placement constraints
CellInfo *constr_parent; CellInfo *constr_parent;
std::vector<CellInfo*> constr_children; std::vector<CellInfo *> constr_children;
const int UNCONSTR = INT_MIN; const int UNCONSTR = INT_MIN;
int constr_x = UNCONSTR; // this.x - parent.x int constr_x = UNCONSTR; // this.x - parent.x
int constr_y = UNCONSTR; // this.y - parent.y int constr_y = UNCONSTR; // this.y - parent.y
int constr_z = UNCONSTR; // this.z - parent.z int constr_z = UNCONSTR; // this.z - parent.z
bool constr_abs_z = false; // parent.z := 0 bool constr_abs_z = false; // parent.z := 0
// parent.[xyz] := 0 when (constr_parent == nullptr) // parent.[xyz] := 0 when (constr_parent == nullptr)
}; };

3
ecp5/arch.cc
View File

@ -328,7 +328,8 @@ BelId Arch::getPackagePinBel(const std::string &pin) const
std::string Arch::getBelPackagePin(BelId bel) const std::string Arch::getBelPackagePin(BelId bel) const
{ {
for (int i = 0; i < package_info->num_pins; i++) { 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(); return package_info->pin_data[i].name.get();
} }
} }

4
ecp5/bitstream.cc
View File

@ -280,8 +280,8 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex
other = "PIOD"; other = "PIOD";
else else
log_error("cannot place differential IO at location %s\n", pio.c_str()); 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[pio_tile].add_enum(other + ".BASE_TYPE", "_NONE_");
//cc.tiles[pic_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(other + ".PULLMODE", "NONE");
cc.tiles[pio_tile].add_enum(pio + ".PULLMODE", "NONE"); cc.tiles[pio_tile].add_enum(pio + ".PULLMODE", "NONE");
} }

10
generic/arch.cc
View File

@ -207,15 +207,9 @@ BelId Arch::getBelByLocation(Loc loc) const
return BelId(); return BelId();
} }
const std::vector<BelId> &Arch::getBelsByTile(int x, int y) const const std::vector<BelId> &Arch::getBelsByTile(int x, int y) const { return bels_by_tile.at(x).at(y); }
{
return bels_by_tile.at(x).at(y);
}
bool Arch::getBelGlobalBuf(BelId bel) const bool Arch::getBelGlobalBuf(BelId bel) const { return bels.at(bel).gb; }
{
return bels.at(bel).gb;
}
uint32_t Arch::getBelChecksum(BelId bel) const uint32_t Arch::getBelChecksum(BelId bel) const
{ {