diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-08-15 06:48:40 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-15 06:48:40 -0700 |
| commit | 91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830 (patch) | |
| tree | b749ff51dec39f145cc25a1df262de7412f5c45a /kernel/yosys.cc | |
| parent | 1551e14d2d688982f22f416a55a3212796a82421 (diff) | |
| parent | 704686774e28b9b602874264df2c0f96841be05e (diff) | |
| download | yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.tar.gz yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.tar.bz2 yosys-91f6cdfef6af69b7fe9203ee4d501ab6e6f1a830.zip | |
Merge remote-tracking branch 'origin/master' into eddie/fix_1284_again
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) |