diff options
| author | Andrew Zonenberg <azonenberg@drawersteak.com> | 2017-02-14 08:29:37 -0800 |
|---|---|---|
| committer | Andrew Zonenberg <azonenberg@drawersteak.com> | 2017-02-14 08:29:37 -0800 |
| commit | 6fed2dc996a57b0f7c4205e1d76da865dd410982 (patch) | |
| tree | ab980df43bc10a3aeefb2220b17885e210eeb0a7 /kernel/log.cc | |
| parent | 203b521a781ccc4c8dba05d2cc73e4625bcf2a8e (diff) | |
| parent | 4fb800717101c65344fe78a365b8ae6ca0a90d9e (diff) | |
| download | yosys-6fed2dc996a57b0f7c4205e1d76da865dd410982.tar.gz yosys-6fed2dc996a57b0f7c4205e1d76da865dd410982.tar.bz2 yosys-6fed2dc996a57b0f7c4205e1d76da865dd410982.zip | |
Merge https://github.com/cliffordwolf/yosys
Diffstat (limited to 'kernel/log.cc')
| -rw-r--r-- | kernel/log.cc | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/kernel/log.cc b/kernel/log.cc index 956d93fd1..c7240d540 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -41,7 +41,7 @@ YOSYS_NAMESPACE_BEGIN std::vector<FILE*> log_files; std::vector<std::ostream*> log_streams; std::map<std::string, std::set<std::string>> log_hdump; -std::vector<std::regex> log_warn_regexes; +std::vector<std::regex> log_warn_regexes, log_nowarn_regexes; bool log_hdump_all = false; FILE *log_errfile = NULL; SHA1 *log_hasher = NULL; @@ -202,15 +202,28 @@ void logv_header(RTLIL::Design *design, const char *format, va_list ap) void logv_warning(const char *format, va_list ap) { - if (log_errfile != NULL && !log_quiet_warnings) - log_files.push_back(log_errfile); + std::string message = vstringf(format, ap); + bool suppressed = false; - log("Warning: "); - logv(format, ap); - log_flush(); + for (auto &re : log_nowarn_regexes) + if (std::regex_search(message, re)) + suppressed = true; - if (log_errfile != NULL && !log_quiet_warnings) - log_files.pop_back(); + if (suppressed) + { + log("Suppressed warning: %s", message.c_str()); + } + else + { + if (log_errfile != NULL && !log_quiet_warnings) + log_files.push_back(log_errfile); + + log("Warning: %s", message.c_str()); + log_flush(); + + if (log_errfile != NULL && !log_quiet_warnings) + log_files.pop_back(); + } } void logv_error(const char *format, va_list ap) |