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

Merge pull request #6 from hansiglaser/master 

added option '-Dname[=definition]' to command 'read_verilog'
This commit is contained in:
Clifford Wolf 2013-05-19 16:07:55 -07:00
parent fbadb54b9b 10a195c0a1
commit 63e6a35ce2
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontends/verilog/preproc.cc
View File

@ -206,9 +206,9 @@ static std::string define_to_feature(std::string defname)
return std::string(); return std::string();
} }
std::string frontend_verilog_preproc(FILE *f, std::string filename) std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::map<std::string, std::string> pre_defines_map)
{ {
std::map<std::string, std::string> defines_map; std::map<std::string, std::string> defines_map(pre_defines_map);
int ifdef_fail_level = 0; int ifdef_fail_level = 0;
output_code.clear(); output_code.clear();

17
frontends/verilog/verilog_frontend.cc
View File

@ -92,6 +92,10 @@ struct VerilogFrontend : public Frontend {
log(" -lib\n"); log(" -lib\n");
log(" only create empty placeholder modules\n"); log(" only create empty placeholder modules\n");
log("\n"); log("\n");
log(" -Dname[=definition]\n");
log(" define the preprocessor symbol 'name' and set its optional value\n");
log(" 'definition'\n");
log("\n");
} }
virtual void execute(FILE *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) virtual void execute(FILE *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design)
{ {
@ -104,6 +108,7 @@ struct VerilogFrontend : public Frontend {
bool flag_ppdump = false; bool flag_ppdump = false;
bool flag_nopp = false; bool flag_nopp = false;
bool flag_lib = false; bool flag_lib = false;
std::map<std::string, std::string> defines_map;
frontend_verilog_yydebug = false; frontend_verilog_yydebug = false;
log_header("Executing Verilog-2005 frontend.\n"); log_header("Executing Verilog-2005 frontend.\n");
@ -152,6 +157,16 @@ struct VerilogFrontend : public Frontend {
flag_lib = true; flag_lib = true;
continue; continue;
} }
if (arg.compare(0,2,"-D") == 0) {
size_t equal = arg.find('=',2); // returns string::npos it not found
std::string name = arg.substr(2,equal-2);
std::string value;
if (equal != std::string::npos) {
value = arg.substr(equal+1,std::string::npos);
}
defines_map[name] = value;
continue;
}
break; break;
} }
extra_args(f, filename, args, argidx); extra_args(f, filename, args, argidx);
@ -168,7 +183,7 @@ struct VerilogFrontend : public Frontend {
std::string code_after_preproc; std::string code_after_preproc;
if (!flag_nopp) { if (!flag_nopp) {
code_after_preproc = frontend_verilog_preproc(f, filename); code_after_preproc = frontend_verilog_preproc(f, filename, defines_map);
if (flag_ppdump) if (flag_ppdump)
log("-- Verilog code after preprocessor --\n%s-- END OF DUMP --\n", code_after_preproc.c_str()); log("-- Verilog code after preprocessor --\n%s-- END OF DUMP --\n", code_after_preproc.c_str());
fp = fmemopen((void*)code_after_preproc.c_str(), code_after_preproc.size(), "r"); fp = fmemopen((void*)code_after_preproc.c_str(), code_after_preproc.size(), "r");

2
frontends/verilog/verilog_frontend.h
View File

@ -47,7 +47,7 @@ namespace VERILOG_FRONTEND
} }
// the pre-processor // the pre-processor
std::string frontend_verilog_preproc(FILE *f, std::string filename); std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::map<std::string, std::string> pre_defines_map);
// the usual bison/flex stuff // the usual bison/flex stuff
extern int frontend_verilog_yydebug; extern int frontend_verilog_yydebug;