aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/lpf.cc
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2019-02-25 14:40:38 +0000
committerDavid Shah <dave@ds0.me>2019-02-25 14:40:38 +0000
commit81b176e1504a05da65fd5989c3a2d2f389786ab0 (patch)
tree2835b4cad059da3b2452330d3c5e6b2732f1962b /ecp5/lpf.cc
parent031725c80eb6c2c0f922b6fa5be57c42330a8a3b (diff)
downloadnextpnr-81b176e1504a05da65fd5989c3a2d2f389786ab0.tar.gz
nextpnr-81b176e1504a05da65fd5989c3a2d2f389786ab0.tar.bz2
nextpnr-81b176e1504a05da65fd5989c3a2d2f389786ab0.zip
ecp5: Improve error handling and warning generation in LPF parser
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'ecp5/lpf.cc')
-rw-r--r--ecp5/lpf.cc50
1 files changed, 31 insertions, 19 deletions
diff --git a/ecp5/lpf.cc b/ecp5/lpf.cc
index df3687cf..b561807d 100644
--- a/ecp5/lpf.cc
+++ b/ecp5/lpf.cc
@@ -41,7 +41,9 @@ bool Arch::applyLPF(std::string filename, std::istream &in)
log_error("failed to open LPF file\n");
std::string line;
std::string linebuf;
+ int lineno = 0;
while (std::getline(in, line)) {
+ ++lineno;
size_t cstart = line.find('#');
if (cstart != std::string::npos)
line = line.substr(0, cstart);
@@ -61,15 +63,18 @@ bool Arch::applyLPF(std::string filename, std::istream &in)
if (words.size() >= 0) {
std::string verb = words.at(0);
if (verb == "BLOCK" || verb == "SYSCONFIG") {
- log_warning(" ignoring unsupported LPF command '%s'\n", command.c_str());
+ if (words.size() != 2 || (words.at(1) != "ASYNCPATHS" && words.at(1) != "RESETPATHS"))
+ log_warning(" ignoring unsupported LPF command '%s' (on line %d)\n", command.c_str(),
+ lineno);
} else if (verb == "FREQUENCY") {
+ if (words.size() < 2)
+ log_error("expected object type after FREQUENCY (on line %d)\n", lineno);
std::string etype = words.at(1);
if (etype == "PORT" || etype == "NET") {
- std::string target = words.at(2);
- if (target.at(0) == '\"') {
- NPNR_ASSERT(target.back() == '\"');
- target = target.substr(1, target.length() - 2);
- }
+ if (words.size() < 4)
+ log_error("expected frequency value and unit after 'FREQUENCY %s' (on line %d)\n",
+ etype.c_str(), lineno);
+ std::string target = strip_quotes(words.at(2));
float freq = std::stof(words.at(3));
std::string unit = words.at(4);
if (unit == "MHz")
@@ -79,33 +84,40 @@ bool Arch::applyLPF(std::string filename, std::istream &in)
else if (unit == "Hz")
freq /= 1.0e6;
else
- log_error("unsupported frequency unit '%s'\n", unit.c_str());
+ log_error("unsupported frequency unit '%s' (on line %d)\n", unit.c_str(), lineno);
addClock(id(target), freq);
} else {
- log_warning(" ignoring unsupported LPF command '%s %s'\n", command.c_str(),
- etype.c_str());
+ log_warning(" ignoring unsupported LPF command '%s %s' (on line %d)\n", command.c_str(),
+ etype.c_str(), lineno);
}
} else if (verb == "LOCATE") {
- NPNR_ASSERT(words.at(1) == "COMP");
+ if (words.size() < 5)
+ log_error("expected syntax 'LOCATE COMP <port name> SITE <pin>' (on line %d)\n", lineno);
+ if (words.at(1) != "COMP")
+ log_error("expected 'COMP' after 'LOCATE' (on line %d)\n", lineno);
std::string cell = strip_quotes(words.at(2));
- NPNR_ASSERT(words.at(3) == "SITE");
+ if (words.at(3) != "SITE")
+ log_error("expected 'SITE' after 'LOCATE COMP %s' (on line %d)\n", cell.c_str(), lineno);
auto fnd_cell = cells.find(id(cell));
- if (fnd_cell == cells.end()) {
- log_warning("unmatched LPF 'LOCATE COMP' '%s'\n", cell.c_str());
- } else {
+ if (fnd_cell != cells.end()) {
fnd_cell->second->attrs[id("LOC")] = strip_quotes(words.at(4));
}
} else if (verb == "IOBUF") {
- NPNR_ASSERT(words.at(1) == "PORT");
+ if (words.size() < 3)
+ log_error("expected syntax 'IOBUF PORT <port name> <attr>=<value>...' (on line %d)\n",
+ lineno);
+ if (words.at(1) != "PORT")
+ log_error("expected 'PORT' after 'IOBUF' (on line %d)\n", lineno);
std::string cell = strip_quotes(words.at(2));
auto fnd_cell = cells.find(id(cell));
- if (fnd_cell == cells.end()) {
- log_warning("unmatched LPF 'IOBUF PORT' '%s'\n", cell.c_str());
- } else {
+ if (fnd_cell != cells.end()) {
for (size_t i = 3; i < words.size(); i++) {
std::string setting = words.at(i);
size_t eqpos = setting.find('=');
- NPNR_ASSERT(eqpos != std::string::npos);
+ if (eqpos == std::string::npos)
+ log_error(
+ "expected syntax 'IOBUF PORT <port name> <attr>=<value>...' (on line %d)\n",
+ lineno);
std::string key = setting.substr(0, eqpos), value = setting.substr(eqpos + 1);
fnd_cell->second->attrs[id(key)] = value;
}