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

Fix formating

Browse Source 
Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2021-07-07 22:53:49 +10:00
parent 5d8b27710d
commit d613626ab9
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gowin/arch.cc
View File

@ -488,20 +488,20 @@ void Arch::read_cst(std::istream &in)
std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^ =;]+=[^ =;]+) *;.*"); std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^ =;]+=[^ =;]+) *;.*");
std::smatch match; std::smatch match;
std::string line; std::string line;
bool io_loc; bool io_loc;
while (!in.eof()) { while (!in.eof()) {
std::getline(in, line); std::getline(in, line);
io_loc = true; io_loc = true;
if (!std::regex_match(line, match, iobre)) { if (!std::regex_match(line, match, iobre)) {
if (std::regex_match(line, match, portre)) { if (std::regex_match(line, match, portre)) {
io_loc = false; io_loc = false;
} else { } else {
if ( (!line.empty()) && (line.rfind("//", 0) == std::string::npos)) { if ((!line.empty()) && (line.rfind("//", 0) == std::string::npos)) {
log_warning("Invalid constraint: %s\n", line.c_str()); log_warning("Invalid constraint: %s\n", line.c_str());
} }
continue; continue;
} }
} }
IdString net = id(match[1]); IdString net = id(match[1]);
auto it = cells.find(net); auto it = cells.find(net);
@ -509,19 +509,19 @@ void Arch::read_cst(std::istream &in)
log_info("Cell %s not found\n", net.c_str(this)); log_info("Cell %s not found\n", net.c_str(this));
continue; continue;
} }
if (io_loc) { // IO_LOC name pin if (io_loc) { // IO_LOC name pin
IdString pinname = id(match[2]); IdString pinname = id(match[2]);
const PairPOD *belname = pairLookup(package->pins.get(), package->num_pins, pinname.index); const PairPOD *belname = pairLookup(package->pins.get(), package->num_pins, pinname.index);
if (belname == nullptr) if (belname == nullptr)
log_error("Pin %s not found\n", pinname.c_str(this)); log_error("Pin %s not found\n", pinname.c_str(this));
std::string bel = IdString(belname->src_id).str(this); std::string bel = IdString(belname->src_id).str(this);
it->second->attrs[IdString(ID_BEL)] = bel; it->second->attrs[IdString(ID_BEL)] = bel;
} else { // IO_PORT attr=value } else { // IO_PORT attr=value
std::string attr = "&"; std::string attr = "&";
attr += match[2]; attr += match[2];
boost::algorithm::to_upper(attr); boost::algorithm::to_upper(attr);
it->second->attrs[id(attr)] = 1; it->second->attrs[id(attr)] = 0;
} }
} }
} }