diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-05-28 09:30:53 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-05-28 09:30:53 -0700 |
| commit | ba9513b325433f9232e1c4312a2b526ca7dacdd4 (patch) | |
| tree | 995de7437e31e2c383a0185049e4e844df4d27e0 /kernel | |
| parent | f745727de5af085412b2e5f8161aa1018cc5e276 (diff) | |
| parent | 8e647901ef6ea484bfe41628f258c53590ae4114 (diff) | |
| download | yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.tar.gz yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.tar.bz2 yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.zip | |
Merge remote-tracking branch 'origin/master' into xc7mux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/log.cc | 9 | ||||
| -rw-r--r-- | kernel/rtlil.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/kernel/log.cc b/kernel/log.cc index 9a9104e26..fa74a6a3c 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -230,6 +230,9 @@ static void logv_warning_with_prefix(const char *prefix, } else { + int bak_log_make_debug = log_make_debug; + log_make_debug = 0; + for (auto &re : log_werror_regexes) if (std::regex_search(message, re)) log_error("%s", message.c_str()); @@ -254,6 +257,7 @@ static void logv_warning_with_prefix(const char *prefix, } log_warnings_count++; + log_make_debug = bak_log_make_debug; } } @@ -285,6 +289,9 @@ static void logv_error_with_prefix(const char *prefix, #ifdef EMSCRIPTEN auto backup_log_files = log_files; #endif + int bak_log_make_debug = log_make_debug; + log_make_debug = 0; + log_suppressed(); if (log_errfile != NULL) log_files.push_back(log_errfile); @@ -298,6 +305,8 @@ static void logv_error_with_prefix(const char *prefix, log("%s%s", prefix, log_last_error.c_str()); log_flush(); + log_make_debug = bak_log_make_debug; + if (log_error_atexit) log_error_atexit(); diff --git a/kernel/rtlil.h b/kernel/rtlil.h index 6c860f36c..d3ad57d72 100644 --- a/kernel/rtlil.h +++ b/kernel/rtlil.h @@ -607,6 +607,7 @@ struct RTLIL::SigChunk RTLIL::SigChunk &operator =(const RTLIL::SigChunk &other) = default; RTLIL::SigChunk extract(int offset, int length) const; + inline int size() const { return width; } bool operator <(const RTLIL::SigChunk &other) const; bool operator ==(const RTLIL::SigChunk &other) const; |