mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-13 09:26:16 +00:00
Code Activity

Improved show -colors color assignments

Browse source
This commit is contained in:
Clifford Wolf 2013-03-24 13:32:56 +01:00
parent bbae24bdf7
commit 181b479e77
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/show.cc
View file

@ -58,8 +58,6 @@ struct ShowWorker
{ {
if (currentColor == 0) if (currentColor == 0)
return "color=\"black\""; return "color=\"black\"";
currentColor = xorshift32(currentColor);
return stringf("colorscheme=\"dark28\", color=\"%d\", fontcolor=\"%d\"", currentColor%8+1); return stringf("colorscheme=\"dark28\", color=\"%d\", fontcolor=\"%d\"", currentColor%8+1);
} }
@ -158,6 +156,7 @@ struct ShowWorker
label_string = label_string.substr(0, label_string.size()-1); label_string = label_string.substr(0, label_string.size()-1);
code += stringf("x%d [ shape=record, style=rounded, label=\"%s\" ];\n", idx, label_string.c_str()); code += stringf("x%d [ shape=record, style=rounded, label=\"%s\" ];\n", idx, label_string.c_str());
if (!port.empty()) { if (!port.empty()) {
currentColor = xorshift32(currentColor);
if (driver) if (driver)
code += stringf("%s:e -> x%d:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", port.c_str(), idx, nextColor().c_str(), widthLabel(sig.width).c_str()); code += stringf("%s:e -> x%d:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", port.c_str(), idx, nextColor().c_str(), widthLabel(sig.width).c_str());
else else
@ -294,6 +293,7 @@ struct ShowWorker
fprintf(f, "%s", code.c_str()); fprintf(f, "%s", code.c_str());
if (left_node[0] == 'x' && right_node[0] == 'x') { if (left_node[0] == 'x' && right_node[0] == 'x') {
currentColor = xorshift32(currentColor);
fprintf(f, "%s:e -> %s:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", left_node.c_str(), right_node.c_str(), nextColor().c_str(), widthLabel(conn.first.width).c_str()); fprintf(f, "%s:e -> %s:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", left_node.c_str(), right_node.c_str(), nextColor().c_str(), widthLabel(conn.first.width).c_str());
} else { } else {
net_conn_map[right_node].bits = conn.first.width; net_conn_map[right_node].bits = conn.first.width;
@ -312,6 +312,7 @@ struct ShowWorker
for (auto &it : net_conn_map) for (auto &it : net_conn_map)
{ {
currentColor = xorshift32(currentColor);
if (wires_on_demand.count(it.first) > 0) { if (wires_on_demand.count(it.first) > 0) {
if (it.second.in.size() == 1 && it.second.out.size() == 1) { if (it.second.in.size() == 1 && it.second.out.size() == 1) {
fprintf(f, "%s:e -> %s:w [%s, %s];\n", it.second.in.begin()->c_str(), it.second.out.begin()->c_str(), nextColor().c_str(), widthLabel(it.second.bits).c_str()); fprintf(f, "%s:e -> %s:w [%s, %s];\n", it.second.in.begin()->c_str(), it.second.out.begin()->c_str(), nextColor().c_str(), widthLabel(it.second.bits).c_str());