Rename "yosys -D" to "yosys -U", add "yosys -D" with expected behavior

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-02-21 14:27:46 +01:00
parent 31fea5eb33
commit 953e0bf88d
1 changed files with 16 additions and 2 deletions

View File

@ -179,6 +179,7 @@ int main(int argc, char **argv)
{ {
std::string frontend_command = "auto"; std::string frontend_command = "auto";
std::string backend_command = "auto"; std::string backend_command = "auto";
std::vector<std::string> vlog_defines;
std::vector<std::string> passes_commands; std::vector<std::string> passes_commands;
std::vector<std::string> plugin_filenames; std::vector<std::string> plugin_filenames;
std::string output_filename = ""; std::string output_filename = "";
@ -268,7 +269,10 @@ int main(int argc, char **argv)
printf(" -A\n"); printf(" -A\n");
printf(" will call abort() at the end of the script. for debugging\n"); printf(" will call abort() at the end of the script. for debugging\n");
printf("\n"); printf("\n");
printf(" -D <header_id>[:<filename>]\n"); printf(" -D <macro>[=<value>]\n");
printf(" set the specified Verilog define (via \"read -define\")\n");
printf("\n");
printf(" -U <header_id>[:<filename>]\n");
printf(" dump the design when printing the specified log header to a file.\n"); printf(" dump the design when printing the specified log header to a file.\n");
printf(" yosys_dump_<header_id>.il is used as filename if none is specified.\n"); printf(" yosys_dump_<header_id>.il is used as filename if none is specified.\n");
printf(" Use 'ALL' as <header_id> to dump at every header.\n"); printf(" Use 'ALL' as <header_id> to dump at every header.\n");
@ -307,7 +311,7 @@ int main(int argc, char **argv)
} }
int opt; int opt;
while ((opt = getopt(argc, argv, "MXAQTVSm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:e:D:E:")) != -1) while ((opt = getopt(argc, argv, "MXAQTVSm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:e:D:U:E:")) != -1)
{ {
switch (opt) switch (opt)
{ {
@ -408,6 +412,9 @@ int main(int argc, char **argv)
std::regex_constants::egrep)); std::regex_constants::egrep));
break; break;
case 'D': case 'D':
vlog_defines.push_back(optarg);
break;
case 'U':
{ {
auto args = split_tokens(optarg, ":"); auto args = split_tokens(optarg, ":");
if (!args.empty() && args[0] == "ALL") { if (!args.empty() && args[0] == "ALL") {
@ -473,6 +480,13 @@ int main(int argc, char **argv)
shell(yosys_design); shell(yosys_design);
} }
if (!vlog_defines.empty()) {
std::string vdef_cmd = "read -define";
for (auto vdef : vlog_defines)
vdef_cmd += " " + vdef;
run_pass(vdef_cmd);
}
while (optind < argc) while (optind < argc)
run_frontend(argv[optind++], frontend_command, output_filename == "-" ? &backend_command : NULL); run_frontend(argv[optind++], frontend_command, output_filename == "-" ? &backend_command : NULL);