mirror of https://github.com/YosysHQ/yosys.git
Minor fixes in show command
This commit is contained in:
parent
5d90a5b905
commit
321e15b0bf
|
@ -759,7 +759,7 @@ struct ShowPass : public Pass {
|
||||||
}
|
}
|
||||||
extra_args(args, argidx, design);
|
extra_args(args, argidx, design);
|
||||||
|
|
||||||
if (format != "ps") {
|
if (format != "ps" && format != "dot") {
|
||||||
int modcount = 0;
|
int modcount = 0;
|
||||||
for (auto &mod_it : design->modules_) {
|
for (auto &mod_it : design->modules_) {
|
||||||
if (mod_it.second->get_bool_attribute("\\blackbox"))
|
if (mod_it.second->get_bool_attribute("\\blackbox"))
|
||||||
|
@ -770,7 +770,7 @@ struct ShowPass : public Pass {
|
||||||
modcount++;
|
modcount++;
|
||||||
}
|
}
|
||||||
if (modcount > 1)
|
if (modcount > 1)
|
||||||
log_cmd_error("For formats different than 'ps' only one module must be selected.\n");
|
log_cmd_error("For formats different than 'ps' or 'dot' only one module must be selected.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto filename : libfiles) {
|
for (auto filename : libfiles) {
|
||||||
|
@ -806,7 +806,7 @@ struct ShowPass : public Pass {
|
||||||
log_cmd_error("Nothing there to show.\n");
|
log_cmd_error("Nothing there to show.\n");
|
||||||
|
|
||||||
if (format != "dot" && !format.empty()) {
|
if (format != "dot" && !format.empty()) {
|
||||||
std::string cmd = stringf("dot -T%s -o '%s.new' '%s' && mv '%s.new' '%s'", format.c_str(), out_file.c_str(), dot_file.c_str(), out_file.c_str(), out_file.c_str());
|
std::string cmd = stringf("dot -T%s '%s' > '%s.new' && mv '%s.new' '%s'", format.c_str(), dot_file.c_str(), out_file.c_str(), out_file.c_str(), out_file.c_str());
|
||||||
log("Exec: %s\n", cmd.c_str());
|
log("Exec: %s\n", cmd.c_str());
|
||||||
if (run_command(cmd) != 0)
|
if (run_command(cmd) != 0)
|
||||||
log_cmd_error("Shell command failed!\n");
|
log_cmd_error("Shell command failed!\n");
|
||||||
|
|
Loading…
Reference in New Issue