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

yosys: fix pyosys initialization segfault

This commit is contained in:
Emil J. Tywoniak 2024-10-17 22:21:50 +02:00
parent 799497ebba
commit 37e61b993a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/yosys.cc
View File

@ -547,12 +547,6 @@ void yosys_setup()
if(already_setup) if(already_setup)
return; return;
already_setup = true; already_setup = true;
init_share_dirname();
init_abc_executable_name();
#define X(_id) RTLIL::ID::_id = "\\" # _id;
#include "kernel/constids.inc"
#undef X
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
// With Python 3.12, calling PyImport_AppendInittab on an already // With Python 3.12, calling PyImport_AppendInittab on an already
@ -566,6 +560,13 @@ void yosys_setup()
} }
#endif #endif
init_share_dirname();
init_abc_executable_name();
#define X(_id) RTLIL::ID::_id = "\\" # _id;
#include "kernel/constids.inc"
#undef X
Pass::init_register(); Pass::init_register();
yosys_design = new RTLIL::Design; yosys_design = new RTLIL::Design;
yosys_celltypes.setup(); yosys_celltypes.setup();

2
setup.py
View File

@ -76,7 +76,7 @@ class libyosys_so_ext(Extension):
# yosys-abc # yosys-abc
yosys_abc_target = os.path.join(pyosys_path, "yosys-abc") yosys_abc_target = os.path.join(pyosys_path, "yosys-abc")
shutil.copy("yosys-abc", yosys_abc_target) shutil.copy("yosys-abc", yosys_abc_target)
bext.spawn(["strip", "-S", "yosys-abc"]) bext.spawn(["strip", "-S", yosys_abc_target])
# share directory # share directory
share_target = os.path.join(pyosys_path, "share") share_target = os.path.join(pyosys_path, "share")