mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 13:29:12 +00:00
Code Activity

Merge https://github.com/cliffordwolf/yosys

Browse source
This commit is contained in:
Andrew Zonenberg 2016-03-30 20:38:18 -07:00
commit d16d05e415
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -3,7 +3,7 @@
| | | |
| yosys -- Yosys Open SYnthesis Suite | | yosys -- Yosys Open SYnthesis Suite |
| | | |
| Copyright (C) 2012 - 2015 Clifford Wolf <clifford@clifford.at> | | Copyright (C) 2012 - 2016 Clifford Wolf <clifford@clifford.at> |
| | | |
| Permission to use, copy, modify, and/or distribute this software for any | | Permission to use, copy, modify, and/or distribute this software for any |
| purpose with or without fee is hereby granted, provided that the above | | purpose with or without fee is hereby granted, provided that the above |

4
kernel/yosys.cc
View file

@ -104,7 +104,7 @@ void yosys_banner()
log(" | |\n"); log(" | |\n");
log(" | yosys -- Yosys Open SYnthesis Suite |\n"); log(" | yosys -- Yosys Open SYnthesis Suite |\n");
log(" | |\n"); log(" | |\n");
log(" | Copyright (C) 2012 - 2015 Clifford Wolf <clifford@clifford.at> |\n"); log(" | Copyright (C) 2012 - 2016 Clifford Wolf <clifford@clifford.at> |\n");
log(" | |\n"); log(" | |\n");
log(" | Permission to use, copy, modify, and/or distribute this software for any |\n"); log(" | Permission to use, copy, modify, and/or distribute this software for any |\n");
log(" | purpose with or without fee is hereby granted, provided that the above |\n"); log(" | purpose with or without fee is hereby granted, provided that the above |\n");
@ -763,6 +763,8 @@ void run_frontend(std::string filename, std::string command, std::string *backen
command = "verilog"; command = "verilog";
else if (filename.size() > 2 && filename.substr(filename.size()-3) == ".sv") else if (filename.size() > 2 && filename.substr(filename.size()-3) == ".sv")
command = "verilog -sv"; command = "verilog -sv";
else if (filename.size() > 2 && filename.substr(filename.size()-4) == ".vhd")
command = "vhdl";
else if (filename.size() > 4 && filename.substr(filename.size()-5) == ".blif") else if (filename.size() > 4 && filename.substr(filename.size()-5) == ".blif")
command = "blif"; command = "blif";
else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il") else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")

8
passes/cmds/plugin.cc
View file

@ -31,19 +31,23 @@ std::map<std::string, std::string> loaded_plugin_aliases;
#ifdef YOSYS_ENABLE_PLUGINS #ifdef YOSYS_ENABLE_PLUGINS
void load_plugin(std::string filename, std::vector<std::string> aliases) void load_plugin(std::string filename, std::vector<std::string> aliases)
{ {
std::string orig_filename = filename;
if (filename.find('/') == std::string::npos) if (filename.find('/') == std::string::npos)
filename = "./" + filename; filename = "./" + filename;
if (!loaded_plugins.count(filename)) { if (!loaded_plugins.count(filename)) {
void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL); void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
if (hdl == NULL && orig_filename.find('/') == std::string::npos)
hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
if (hdl == NULL) if (hdl == NULL)
log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror()); log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
loaded_plugins[filename] = hdl; loaded_plugins[orig_filename] = hdl;
Pass::init_register(); Pass::init_register();
} }
for (auto &alias : aliases) for (auto &alias : aliases)
loaded_plugin_aliases[alias] = filename; loaded_plugin_aliases[alias] = orig_filename;
} }
#else #else
void load_plugin(std::string, std::vector<std::string>) void load_plugin(std::string, std::vector<std::string>)