diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-10-05 14:38:32 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2017-10-05 14:38:32 +0200 |
| commit | fc3378916dbaf46018a99571ef190189088c225c (patch) | |
| tree | dfc1a3ce67c3af2defbea9e6db380272877c47f4 /frontends | |
| parent | ee56a887b65e74e44aa6601113f0b477211ccdbc (diff) | |
| download | yosys-fc3378916dbaf46018a99571ef190189088c225c.tar.gz yosys-fc3378916dbaf46018a99571ef190189088c225c.tar.bz2 yosys-fc3378916dbaf46018a99571ef190189088c225c.zip | |
Improve handling of Verific errors
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/verific/verific.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc index 579b81afa..ae39f7c9d 100644 --- a/frontends/verific/verific.cc +++ b/frontends/verific/verific.cc @@ -60,11 +60,11 @@ PRIVATE_NAMESPACE_BEGIN #ifdef YOSYS_ENABLE_VERIFIC -bool got_verific_error_msg = false; +string verific_error_msg; void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefile, const char *msg, va_list args) { - string message = stringf("VERIFIC-%s [%s] ", + string message_prefix = stringf("VERIFIC-%s [%s] ", msg_type == VERIFIC_NONE ? "NONE" : msg_type == VERIFIC_ERROR ? "ERROR" : msg_type == VERIFIC_WARNING ? "WARNING" : @@ -73,18 +73,16 @@ void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefil msg_type == VERIFIC_COMMENT ? "COMMENT" : msg_type == VERIFIC_PROGRAM_ERROR ? "PROGRAM_ERROR" : "UNKNOWN", message_id); - if (linefile) - message += stringf("%s:%d: ", LineFile::GetFileName(linefile), LineFile::GetLineNo(linefile)); - + string message = linefile ? stringf("%s:%d: ", LineFile::GetFileName(linefile), LineFile::GetLineNo(linefile)) : ""; message += vstringf(msg, args); if (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_WARNING || msg_type == VERIFIC_PROGRAM_ERROR) - log_warning_noprefix("%s\n", message.c_str()); + log_warning_noprefix("%s%s\n", message_prefix.c_str(), message.c_str()); else - log("%s\n", message.c_str()); + log("%s%s\n", message_prefix.c_str(), message.c_str()); - if (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_PROGRAM_ERROR) - got_verific_error_msg = true; + if (verific_error_msg.empty() && (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_PROGRAM_ERROR)) + verific_error_msg = message; } string get_full_netlist_name(Netlist *nl) @@ -1984,8 +1982,8 @@ struct VerificPass : public Pass { log_cmd_error("Missing or unsupported mode parameter.\n"); check_error: - if (got_verific_error_msg) - log_error("Verific ERROR.\n"); + if (!verific_error_msg.empty()) + log_error("%s\n", verific_error_msg.c_str()); } #else /* YOSYS_ENABLE_VERIFIC */ |