diff options
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 3 | ||||
| -rw-r--r-- | ice40/arch.h | 5 | ||||
| -rw-r--r-- | ice40/main.cc | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 5d7d1fb4..3833dcb7 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -283,8 +283,7 @@ BelRange Arch::getBelsByTile(int x, int y) const br.e.cursor = br.b.cursor; if (br.e.cursor != -1) { - while (br.e.cursor < chip_info->num_bels && - chip_info->bel_data[br.e.cursor].x == x && + while (br.e.cursor < chip_info->num_bels && chip_info->bel_data[br.e.cursor].x == x && chip_info->bel_data[br.e.cursor].y == y) br.e.cursor++; } diff --git a/ice40/arch.h b/ice40/arch.h index b7e66414..9a8ec7bc 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -455,10 +455,7 @@ struct Arch : BaseCtx BelId getBelByLocation(Loc loc) const; BelRange getBelsByTile(int x, int y) const; - bool getBelGlobalBuf(BelId bel) const - { - return chip_info->bel_data[bel.index].type == TYPE_SB_GB; - } + bool getBelGlobalBuf(BelId bel) const { return chip_info->bel_data[bel.index].type == TYPE_SB_GB; } BelRange getBelsAtSameTile(BelId bel) const NPNR_DEPRECATED; diff --git a/ice40/main.cc b/ice40/main.cc index 70324a91..b84d6d92 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -69,8 +69,8 @@ void svg_dump_decal(const Context *ctx, const DecalXY &decal) void conflicting_options(const boost::program_options::variables_map &vm, const char *opt1, const char *opt2) { if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) { - std::string msg = "Conflicting options '"+ std::string(opt1) + "' and '" + std::string(opt1) + "'."; - log_error("%s\n",msg.c_str()); + std::string msg = "Conflicting options '" + std::string(opt1) + "' and '" + std::string(opt1) + "'."; + log_error("%s\n", msg.c_str()); } } |