diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-07-18 15:45:25 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-07-18 15:45:25 -0700 |
| commit | 42e40dbd0a513d430ff0a463f9a80dedfbbf51f5 (patch) | |
| tree | 5cf69498d43b8d225e28cf5562f91c3a4a94f814 /kernel | |
| parent | 09411dd996f75dbce22a6f6979b7d61b0dae24f7 (diff) | |
| parent | e66e8fb59d8443c8d55c1185d6b2ce889a35357d (diff) | |
| download | yosys-42e40dbd0a513d430ff0a463f9a80dedfbbf51f5.tar.gz yosys-42e40dbd0a513d430ff0a463f9a80dedfbbf51f5.tar.bz2 yosys-42e40dbd0a513d430ff0a463f9a80dedfbbf51f5.zip | |
Merge remote-tracking branch 'origin/master' into ice40dsp
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/log.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/kernel/log.cc b/kernel/log.cc index a7820950c..e0a60ca12 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -61,7 +61,7 @@ int log_force_debug = 0; int log_debug_suppressed = 0; vector<int> header_count; -pool<RTLIL::IdString> log_id_cache; +vector<char*> log_id_cache; vector<shared_str> string_buf; int string_buf_index = -1; @@ -69,6 +69,13 @@ static struct timeval initial_tv = { 0, 0 }; static bool next_print_log = false; static int log_newline_count = 0; +static void log_id_cache_clear() +{ + for (auto p : log_id_cache) + free(p); + log_id_cache.clear(); +} + #if defined(_WIN32) && !defined(__MINGW32__) // this will get time information and return it in timeval, simulating gettimeofday() int gettimeofday(struct timeval *tv, struct timezone *tz) @@ -414,7 +421,7 @@ void log_push() void log_pop() { header_count.pop_back(); - log_id_cache.clear(); + log_id_cache_clear(); string_buf.clear(); string_buf_index = -1; log_flush(); @@ -521,7 +528,7 @@ void log_reset_stack() { while (header_count.size() > 1) header_count.pop_back(); - log_id_cache.clear(); + log_id_cache_clear(); string_buf.clear(); string_buf_index = -1; log_flush(); @@ -580,8 +587,8 @@ const char *log_const(const RTLIL::Const &value, bool autoint) const char *log_id(RTLIL::IdString str) { - log_id_cache.insert(str); - const char *p = str.c_str(); + log_id_cache.push_back(strdup(str.c_str())); + const char *p = log_id_cache.back(); if (p[0] != '\\') return p; if (p[1] == '$' || p[1] == '\\' || p[1] == 0) |