diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2020-11-10 08:05:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 08:05:42 +0100 |
| commit | 924f1713c220755bb2dd6313c2226b9111e16b58 (patch) | |
| tree | be183ef521241556273a5a975e105648b2193074 /kernel | |
| parent | 014c7e26b85000e99a27d2287a6967daa64d7a30 (diff) | |
| parent | 829b5cca602984e67c756d9c81b40e55e32be779 (diff) | |
| download | yosys-924f1713c220755bb2dd6313c2226b9111e16b58.tar.gz yosys-924f1713c220755bb2dd6313c2226b9111e16b58.tar.bz2 yosys-924f1713c220755bb2dd6313c2226b9111e16b58.zip | |
Merge pull request #2433 from YosysHQ/paths_as_globals
Expose abc and data paths as globals for pyosys
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/yosys.cc | 72 | ||||
| -rw-r--r-- | kernel/yosys.h | 3 |
2 files changed, 61 insertions, 14 deletions
diff --git a/kernel/yosys.cc b/kernel/yosys.cc index 7a2ef4913..dcaf364e9 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -89,6 +89,12 @@ bool memhasher_active = false; uint32_t memhasher_rng = 123456; std::vector<void*> memhasher_store; +std::string yosys_share_dirname; +std::string yosys_abc_executable; + +void init_share_dirname(); +void init_abc_executable_name(); + void memhasher_on() { #if defined(__linux__) || defined(__FreeBSD__) @@ -523,6 +529,8 @@ void yosys_setup() if(already_setup) return; already_setup = true; + init_share_dirname(); + init_abc_executable_name(); #define X(_id) RTLIL::ID::_id = "\\" # _id; #include "kernel/constids.inc" @@ -825,38 +833,74 @@ std::string proc_self_dirname() #endif #if defined(EMSCRIPTEN) || defined(__wasm) -std::string proc_share_dirname() +void init_share_dirname() { - return "/share/"; + yosys_share_dirname = "/share/"; } #else -std::string proc_share_dirname() +void init_share_dirname() { std::string proc_self_path = proc_self_dirname(); # if defined(_WIN32) && !defined(YOSYS_WIN32_UNIX_DIR) std::string proc_share_path = proc_self_path + "share\\"; - if (check_file_exists(proc_share_path, true)) - return proc_share_path; + if (check_file_exists(proc_share_path, true)) { + yosys_share_dirname = proc_share_path; + return; + } proc_share_path = proc_self_path + "..\\share\\"; - if (check_file_exists(proc_share_path, true)) - return proc_share_path; + if (check_file_exists(proc_share_path, true)) { + yosys_share_dirname = proc_share_path; + return; + } # else std::string proc_share_path = proc_self_path + "share/"; - if (check_file_exists(proc_share_path, true)) - return proc_share_path; + if (check_file_exists(proc_share_path, true)) { + yosys_share_dirname = proc_share_path; + return; + } proc_share_path = proc_self_path + "../share/" + proc_program_prefix()+ "yosys/"; - if (check_file_exists(proc_share_path, true)) - return proc_share_path; + if (check_file_exists(proc_share_path, true)) { + yosys_share_dirname = proc_share_path; + return; + } # ifdef YOSYS_DATDIR proc_share_path = YOSYS_DATDIR "/"; - if (check_file_exists(proc_share_path, true)) - return proc_share_path; + if (check_file_exists(proc_share_path, true)) { + yosys_share_dirname = proc_share_path; + return; + } # endif # endif - log_error("proc_share_dirname: unable to determine share/ directory!\n"); } #endif +void init_abc_executable_name() +{ +#ifdef ABCEXTERNAL + std::string exe_file; + if (std::getenv("ABC")) { + yosys_abc_executable = std::getenv("ABC"); + } else { + yosys_abc_executable = ABCEXTERNAL; + } +#else + yosys_abc_executable = proc_self_dirname() + proc_program_prefix()+ "yosys-abc"; +#endif +#ifdef _WIN32 +#ifndef ABCEXTERNAL + if (!check_file_exists(yosys_abc_executable + ".exe") && check_file_exists(proc_self_dirname() + "..\\" + proc_program_prefix() + "yosys-abc.exe")) + yosys_abc_executable = proc_self_dirname() + "..\\" + proc_program_prefix() + "yosys-abc"; +#endif +#endif +} + +std::string proc_share_dirname() +{ + if (yosys_share_dirname.empty()) + log_error("init_share_dirname: unable to determine share/ directory!\n"); + return yosys_share_dirname; +} + std::string proc_program_prefix() { std::string program_prefix; diff --git a/kernel/yosys.h b/kernel/yosys.h index f1646d6bc..ab6eb5f8c 100644 --- a/kernel/yosys.h +++ b/kernel/yosys.h @@ -366,6 +366,9 @@ extern std::map<std::string, void*> loaded_python_plugins; extern std::map<std::string, std::string> loaded_plugin_aliases; void load_plugin(std::string filename, std::vector<std::string> aliases); +extern std::string yosys_share_dirname; +extern std::string yosys_abc_executable; + YOSYS_NAMESPACE_END #endif |