riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added IdString::destruct_guard hack

This commit is contained in:
Clifford Wolf 2014-12-11 21:46:36 +01:00
parent df52eedb30
commit 7775d2806f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/rtlil.cc
View File

@ -27,6 +27,7 @@
YOSYS_NAMESPACE_BEGIN YOSYS_NAMESPACE_BEGIN
RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
std::vector<int> RTLIL::IdString::global_refcount_storage_; std::vector<int> RTLIL::IdString::global_refcount_storage_;
std::vector<char*> RTLIL::IdString::global_id_storage_; std::vector<char*> RTLIL::IdString::global_id_storage_;
std::map<char*, int, RTLIL::IdString::char_ptr_cmp> RTLIL::IdString::global_id_index_; std::map<char*, int, RTLIL::IdString::char_ptr_cmp> RTLIL::IdString::global_id_index_;

13
kernel/rtlil.h
View File

@ -85,6 +85,12 @@ namespace RTLIL
} }
}; };
static struct destruct_guard_t {
bool ok = false;
destruct_guard_t() { ok = true; }
~destruct_guard_t() { ok = false; }
} destruct_guard;
static std::vector<int> global_refcount_storage_; static std::vector<int> global_refcount_storage_;
static std::vector<char*> global_id_storage_; static std::vector<char*> global_id_storage_;
static std::map<char*, int, char_ptr_cmp> global_id_index_; static std::map<char*, int, char_ptr_cmp> global_id_index_;
@ -98,6 +104,8 @@ namespace RTLIL
static inline int get_reference(const char *p) static inline int get_reference(const char *p)
{ {
log_assert(destruct_guard.ok);
if (p[0]) { if (p[0]) {
log_assert(p[1] != 0); log_assert(p[1] != 0);
log_assert(p[0] == '$' || p[0] == '\\'); log_assert(p[0] == '$' || p[0] == '\\');
@ -126,6 +134,11 @@ namespace RTLIL
static inline void put_reference(int idx) static inline void put_reference(int idx)
{ {
// put_reference() may be called from destructors after the destructor of
// global_refcount_storage_ has been run. in this case we simply do nothing.
if (!destruct_guard.ok)
return;
log_assert(global_refcount_storage_.at(idx) > 0); log_assert(global_refcount_storage_.at(idx) > 0);
if (--global_refcount_storage_.at(idx) != 0) if (--global_refcount_storage_.at(idx) != 0)