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

Few more checks on parameters and error eol

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-07-20 14:06:53 +02:00
parent 53034959f3
commit 6c835d76f2
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ice40/bitstream.cc
View File

@ -227,7 +227,7 @@ void write_asc(const Context *ctx, std::ostream &out)
out << ".device 5k" << std::endl; out << ".device 5k" << std::endl;
break; break;
default: default:
NPNR_ASSERT_FALSE("unsupported device type"); NPNR_ASSERT_FALSE("unsupported device type\n");
} }
// Set pips // Set pips
for (auto pip : ctx->getPips()) { for (auto pip : ctx->getPips()) {
@ -561,10 +561,10 @@ void read_config(Context *ctx, std::istream &in, chipconfig_t &config)
expected = "5k"; expected = "5k";
break; break;
default: default:
log_error("unsupported device type"); log_error("unsupported device type\n");
} }
if (expected != config_device) if (expected != config_device)
log_error("device type does not match"); log_error("device type does not match\n");
} else if (!strcmp(tok, ".io_tile") || !strcmp(tok, ".logic_tile") || !strcmp(tok, ".ramb_tile") || } else if (!strcmp(tok, ".io_tile") || !strcmp(tok, ".logic_tile") || !strcmp(tok, ".ramb_tile") ||
!strcmp(tok, ".ramt_tile") || !strcmp(tok, ".ipcon_tile") || !strcmp(tok, ".dsp0_tile") || !strcmp(tok, ".ramt_tile") || !strcmp(tok, ".ipcon_tile") || !strcmp(tok, ".dsp0_tile") ||
!strcmp(tok, ".dsp1_tile") || !strcmp(tok, ".dsp2_tile") || !strcmp(tok, ".dsp3_tile")) { !strcmp(tok, ".dsp1_tile") || !strcmp(tok, ".dsp2_tile") || !strcmp(tok, ".dsp3_tile")) {
@ -574,7 +574,7 @@ void read_config(Context *ctx, std::istream &in, chipconfig_t &config)
TileType tile = tile_at(ctx, tile_x, tile_y); TileType tile = tile_at(ctx, tile_x, tile_y);
if (tok != tagTileType(tile)) if (tok != tagTileType(tile))
log_error("Wrong tile type for specified position"); log_error("Wrong tile type for specified position\n");
} else if (!strcmp(tok, ".extra_bit")) { } else if (!strcmp(tok, ".extra_bit")) {
/* /*

16
ice40/main.cc
View File

@ -66,6 +66,12 @@ 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())
log_error((std::string("Conflicting options '") + opt1 + "' and '" + opt2 + "'.").c_str());
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
try { try {
@ -122,13 +128,17 @@ int main(int argc, char *argv[])
po::store(parsed, vm); po::store(parsed, vm);
po::notify(vm); po::notify(vm);
} } catch (std::exception &e) {
catch (std::exception &e) {
std::cout << e.what() << "\n"; std::cout << e.what() << "\n";
return 1; return 1;
} }
conflicting_options(vm, "read", "json");
#ifndef ICE40_HX1K_ONLY
if ((vm.count("lp384") + vm.count("lp1k") + vm.count("lp8k") + vm.count("hx1k") + vm.count("hx8k") +
vm.count("up5k")) > 1)
log_error("Only one device type can be set\n");
#endif
if (vm.count("help") || argc == 1) { if (vm.count("help") || argc == 1) {
help: help:
std::cout << boost::filesystem::basename(argv[0]) std::cout << boost::filesystem::basename(argv[0])