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

ice40: Improve bitstream error handling

Browse Source 
Fixes #161 and provides a clearer error for #170

Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2018-12-06 11:19:48 +00:00
parent 88e1e6bdf4
commit e7fc42ac84
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ice40/bitstream.cc
View File

@ -156,7 +156,9 @@ void configure_extra_cell(chipconfig_t &config, const Context *ctx, CellInfo *ce
// Lattice's weird string style params, not sure if // Lattice's weird string style params, not sure if
// prefixes other than 0b should be supported, only 0b features in docs // prefixes other than 0b should be supported, only 0b features in docs
std::string raw = get_param_str_or_def(cell, ctx->id(p.first), "0b0"); std::string raw = get_param_str_or_def(cell, ctx->id(p.first), "0b0");
assert(raw.substr(0, 2) == "0b"); if (raw.substr(0, 2) != "0b")
log_error("expected configuration string starting with '0b' for parameter '%s' on cell '%s'\n",
p.first.c_str(), cell->name.c_str(ctx));
raw = raw.substr(2); raw = raw.substr(2);
value.resize(raw.length()); value.resize(raw.length());
for (int i = 0; i < (int)raw.length(); i++) { for (int i = 0; i < (int)raw.length(); i++) {
@ -168,7 +170,13 @@ void configure_extra_cell(chipconfig_t &config, const Context *ctx, CellInfo *ce
} }
} }
} else { } else {
int ival = get_param_or_def(cell, ctx->id(p.first), 0); int ival;
try {
ival = get_param_or_def(cell, ctx->id(p.first), 0);
} catch (std::invalid_argument &e) {
log_error("expected numeric value for parameter '%s' on cell '%s'\n", p.first.c_str(),
cell->name.c_str(ctx));
}
for (int i = 0; i < p.second; i++) for (int i = 0; i < p.second; i++)
value.push_back((ival >> i) & 0x1); value.push_back((ival >> i) & 0x1);