mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Fix tcl crash in case of error executing command

Browse source
This commit is contained in:
Miodrag Milanovic 2022-11-30 15:54:31 +01:00
parent f9db7c0599
commit b0469b3863
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/yosys.cc
View file

@ -590,7 +590,9 @@ void yosys_shutdown()
#ifdef YOSYS_ENABLE_TCL #ifdef YOSYS_ENABLE_TCL
if (yosys_tcl_interp != NULL) { if (yosys_tcl_interp != NULL) {
Tcl_DeleteInterp(yosys_tcl_interp); if (!Tcl_InterpDeleted(yosys_tcl_interp)) {
Tcl_DeleteInterp(yosys_tcl_interp);
}
Tcl_Finalize(); Tcl_Finalize();
yosys_tcl_interp = NULL; yosys_tcl_interp = NULL;
} }
@ -789,11 +791,13 @@ struct TclPass : public Pass {
script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size())); script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
Tcl_Interp *interp = yosys_get_tcl_interp(); Tcl_Interp *interp = yosys_get_tcl_interp();
Tcl_Preserve(interp);
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0); 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("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); 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) if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(interp)); log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
Tcl_Release(interp);
} }
} TclPass; } TclPass;
#endif #endif

3
kernel/yosys.h
View file

@ -82,6 +82,9 @@
# ifdef YOSYS_MXE_HACKS # ifdef YOSYS_MXE_HACKS
extern Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, const char *cmdName, Tcl_CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); extern Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, const char *cmdName, Tcl_CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc);
extern Tcl_Interp *Tcl_CreateInterp(void); extern Tcl_Interp *Tcl_CreateInterp(void);
extern void Tcl_Preserve(ClientData data);
extern void Tcl_Release(ClientData clientData);
extern int Tcl_InterpDeleted(Tcl_Interp *interp);
extern void Tcl_DeleteInterp(Tcl_Interp *interp); extern void Tcl_DeleteInterp(Tcl_Interp *interp);
extern int Tcl_Eval(Tcl_Interp *interp, const char *script); extern int Tcl_Eval(Tcl_Interp *interp, const char *script);
extern int Tcl_EvalFile(Tcl_Interp *interp, const char *fileName); extern int Tcl_EvalFile(Tcl_Interp *interp, const char *fileName);