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

Solve some of connection issues

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-05-31 11:50:49 +02:00
parent 545068dec4
commit 1657479c81
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
json/jsonwrite.cc
View File

@ -92,12 +92,10 @@ void write_module(std::ostream &f, Context *ctx)
bool first2 = true; bool first2 = true;
for (auto &conn : c->ports) { for (auto &conn : c->ports) {
auto &p = conn.second; auto &p = conn.second;
if (p.net) { std::string direction = (p.type == PORT_IN) ? "input" : (p.type == PORT_OUT) ? "output" : "inout";
std::string direction = (p.type == PORT_IN) ? "input" : (p.type == PORT_OUT) ? "output" : "inout"; f << stringf("%s\n", first2 ? "" : ",");
f << stringf("%s\n", first2 ? "" : ","); f << stringf(" %s: \"%s\"", get_name(conn.first, ctx).c_str(), direction.c_str());
f << stringf(" %s: \"%s\"", get_name(conn.first, ctx).c_str(), direction.c_str()); first2 = false;
first2 = false;
}
} }
f << stringf("\n },\n"); f << stringf("\n },\n");
f << stringf(" \"connections\": {"); f << stringf(" \"connections\": {");
@ -105,11 +103,13 @@ void write_module(std::ostream &f, Context *ctx)
for (auto &conn : c->ports) { for (auto &conn : c->ports) {
auto &p = conn.second; auto &p = conn.second;
if (p.net) { f << stringf("%s\n", first2 ? "" : ",");
f << stringf("%s\n", first2 ? "" : ","); if (p.net)
f << stringf(" %s: %d", get_name(conn.first,ctx).c_str(), fn(p.net->name)); f << stringf(" %s: [ %d ]", get_name(conn.first,ctx).c_str(), fn(p.net->name));
first2 = false; else
} f << stringf(" %s: [ ]", get_name(conn.first,ctx).c_str());
first2 = false;
} }
f << stringf("\n }\n"); f << stringf("\n }\n");