diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-08-15 22:44:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 22:44:38 +0200 |
| commit | 49301b733eede41f2a4165440eee68c1a71f36e6 (patch) | |
| tree | 4fe0f872f39957888d09d363041fb9b1e18c1e83 /kernel/yosys.cc | |
| parent | 0c5db07cd6cc3c19b926da21a46599f97592b20f (diff) | |
| parent | d8a2aaa46379df7a07f4b776b7f9981b04999215 (diff) | |
| download | yosys-49301b733eede41f2a4165440eee68c1a71f36e6.tar.gz yosys-49301b733eede41f2a4165440eee68c1a71f36e6.tar.bz2 yosys-49301b733eede41f2a4165440eee68c1a71f36e6.zip | |
Merge branch 'master' into clifford/fix1255
Diffstat (limited to 'kernel/yosys.cc')
| -rw-r--r-- | kernel/yosys.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/yosys.cc b/kernel/yosys.cc index 5a53f90fd..747f2d739 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -510,10 +510,13 @@ void yosys_setup() if(already_setup) return; already_setup = true; - // if there are already IdString objects then we have a global initialization order bug - IdString empty_id; - log_assert(empty_id.index_ == 0); - IdString::get_reference(empty_id.index_); + + RTLIL::ID::A = "\\A"; + RTLIL::ID::B = "\\B"; + RTLIL::ID::Y = "\\Y"; + RTLIL::ID::keep = "\\keep"; + RTLIL::ID::whitebox = "\\whitebox"; + RTLIL::ID::blackbox = "\\blackbox"; #ifdef WITH_PYTHON PyImport_AppendInittab((char*)"libyosys", INIT_MODULE); @@ -575,9 +578,6 @@ void yosys_shutdown() #ifdef WITH_PYTHON Py_Finalize(); #endif - - IdString empty_id; - IdString::put_reference(empty_id.index_); } RTLIL::IdString new_id(std::string file, int line, std::string func) |