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

Merge pull request #758 from whitequark/tcl_script_args 

tcl: add support for passing arguments to scripts
This commit is contained in:
Clifford Wolf 2018-12-21 17:56:43 +01:00 committed by GitHub
parent 29a82acb2e 2ca237e086
commit ee8a7589e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/yosys.cc
View File

@ -166,7 +166,7 @@ std::string vstringf(const char *fmt, va_list ap)
std::string string; std::string string;
char *str = NULL; char *str = NULL;
#if defined(_WIN32 )|| defined(__CYGWIN__) #if defined(_WIN32 )|| defined(__CYGWIN__)
int sz = 64, rc; int sz = 64, rc;
while (1) { while (1) {
va_list apc; va_list apc;
@ -637,8 +637,9 @@ extern Tcl_Interp *yosys_get_tcl_interp()
struct TclPass : public Pass { struct TclPass : public Pass {
TclPass() : Pass("tcl", "execute a TCL script file") { } TclPass() : Pass("tcl", "execute a TCL script file") { }
void help() YS_OVERRIDE { void help() YS_OVERRIDE {
// |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
log("\n"); log("\n");
log(" tcl <filename>\n"); log(" tcl <filename> [args]\n");
log("\n"); log("\n");
log("This command executes the tcl commands in the specified file.\n"); log("This command executes the tcl commands in the specified file.\n");
log("Use 'yosys cmd' to run the yosys command 'cmd' from tcl.\n"); log("Use 'yosys cmd' to run the yosys command 'cmd' from tcl.\n");
@ -648,14 +649,24 @@ struct TclPass : public Pass {
log("'proc' and 'rename' are wrapped to tcl commands 'procs' and 'renames'\n"); log("'proc' and 'rename' are wrapped to tcl commands 'procs' and 'renames'\n");
log("in order to avoid a name collision with the built in commands.\n"); log("in order to avoid a name collision with the built in commands.\n");
log("\n"); log("\n");
log("If any arguments are specified, these arguments are provided to the script via\n");
log("the standard $argc and $argv variables.\n");
log("\n");
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE { void execute(std::vector<std::string> args, RTLIL::Design *) YS_OVERRIDE {
if (args.size() < 2) if (args.size() < 2)
log_cmd_error("Missing script file.\n"); log_cmd_error("Missing script file.\n");
if (args.size() > 2)
extra_args(args, 1, design, false); std::vector<Tcl_Obj*> script_args;
if (Tcl_EvalFile(yosys_get_tcl_interp(), args[1].c_str()) != TCL_OK) for (auto it = args.begin() + 2; it != args.end(); ++it)
log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(yosys_get_tcl_interp())); script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
Tcl_Interp *interp = yosys_get_tcl_interp();
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
} }
} TclPass; } TclPass;
#endif #endif