mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00
Code Activity

- kernel/register.h, kernel/driver.cc: refactor rewrite_yosys_exe()/get_share_file_name() to portable proc_self_dirname()/proc_share_dirname().

Browse source 
This refactoring improves robustness and allows OSX support with only 7 new lines of code, and easy extension for other systems.
 - passes/abc/abc.cc, passes/cmds/show.cc, passes/techmap/techmap.cc: use new, refactored semantics.
This commit is contained in:
Siesh1oo 2014-03-12 18:33:37 +01:00 • committed by Clifford Wolf
parent 3152863479
commit 8127d5e8c3
5 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
passes/abc/abc.cc
View file

@ -969,7 +969,7 @@ struct AbcPass : public Pass {
log_header("Executing ABC pass (technology mapping using ABC).\n");
log_push();
std::string exe_file = rewrite_yosys_exe("yosys-abc");
std::string exe_file = proc_self_dirname() + "yosys-abc";
std::string script_file, liberty_file, constr_file, clk_str;
bool dff_mode = false, keepff = false, cleanup = true;
int lut_mode = 0;

3
passes/cmds/show.cc
View file

@ -751,7 +751,8 @@ struct ShowPass : public Pass {
log_cmd_error("Shell command failed!\n");
} else
if (format.empty()) {
std::string cmd = stringf("fuser -s '%s' || '%s' '%s' &", out_file.c_str(), rewrite_yosys_exe("yosys-svgviewer").c_str(), out_file.c_str());
std::string svgviewer = proc_self_dirname() + "yosys-svgviewer";
std::string cmd = stringf("fuser -s '%s' || '%s' '%s' &", out_file.c_str(), svgviewer.c_str(), out_file.c_str());
log("Exec: %s\n", cmd.c_str());
if (system(cmd.c_str()) != 0)
log_cmd_error("Shell command failed!\n");

3
passes/techmap/techmap.cc
View file

@ -548,13 +548,14 @@ struct TechmapPass : public Pass {
int max_iter = -1;
size_t argidx;
std::string proc_share_path = proc_share_dirname();
for (argidx = 1; argidx < args.size(); argidx++) {
if (args[argidx] == "-map" && argidx+1 < args.size()) {
map_files.push_back(args[++argidx]);
continue;
}
if (args[argidx] == "-share_map" && argidx+1 < args.size()) {
map_files.push_back(get_share_file_name(args[++argidx]));
map_files.push_back(proc_share_path + args[++argidx]);
continue;
}
if (args[argidx] == "-max_iter" && argidx+1 < args.size()) {