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

ecp5: Fix handling of CRLFs and uppercase frequency units in LPF

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-02-27 22:54:32 +00:00
parent ba4150aecc
commit 8744c46ea0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/lpf.cc
View File

@ -17,6 +17,7 @@
* *
*/ */
#include <boost/algorithm/string.hpp>
#include <sstream> #include <sstream>
#include "log.h" #include "log.h"
@ -25,7 +26,7 @@ NEXTPNR_NAMESPACE_BEGIN
bool Arch::applyLPF(std::string filename, std::istream &in) bool Arch::applyLPF(std::string filename, std::istream &in)
{ {
auto isempty = [](const std::string &str) { auto isempty = [](const std::string &str) {
return std::all_of(str.begin(), str.end(), [](char c) { return isblank(c); }); return std::all_of(str.begin(), str.end(), [](char c) { return isblank(c) || c == '\r' || c == '\n'; });
}; };
auto strip_quotes = [](const std::string &str) { auto strip_quotes = [](const std::string &str) {
if (str.at(0) == '"') { if (str.at(0) == '"') {
@ -77,11 +78,12 @@ bool Arch::applyLPF(std::string filename, std::istream &in)
std::string target = strip_quotes(words.at(2)); std::string target = strip_quotes(words.at(2));
float freq = std::stof(words.at(3)); float freq = std::stof(words.at(3));
std::string unit = words.at(4); std::string unit = words.at(4);
if (unit == "MHz") boost::algorithm::to_upper(unit);
if (unit == "MHZ")
; ;
else if (unit == "kHz") else if (unit == "KHZ")
freq /= 1.0e3; freq /= 1.0e3;
else if (unit == "Hz") else if (unit == "HZ")
freq /= 1.0e6; freq /= 1.0e6;
else else
log_error("unsupported frequency unit '%s' (on line %d)\n", unit.c_str(), lineno); log_error("unsupported frequency unit '%s' (on line %d)\n", unit.c_str(), lineno);