From 1280e199a3388cee8f71bfae07240206b7d0bcd1 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Tue, 17 Jan 2023 22:13:12 +0100 Subject: [PATCH] Add boolean variables as flags when XSPICE and/or OSDI are enabled --- src/main.c | 12 ++++++++++++ src/sharedspice.c | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/src/main.c b/src/main.c index 7c30953e0..bba99a714 100644 --- a/src/main.c +++ b/src/main.c @@ -824,6 +824,8 @@ int main(int argc, char **argv) bool iflag = FALSE; /* flag for interactive mode */ bool qflag = FALSE; /* flag for command completion */ + bool t = TRUE; + FILE * volatile circuit_file; bool volatile oflag = FALSE; bool srflag = FALSE; @@ -866,6 +868,7 @@ int main(int argc, char **argv) } #endif + ivars(argv[0]); /* Create internal variables */ /* Set default data sources */ @@ -895,6 +898,15 @@ int main(int argc, char **argv) cp_vset("rndseed", CP_NUM, &ii); com_sseed(NULL); + /* set a boolean variable when XSPICE and/or OSDI is enabled, + to be used in spinit etc. */ +#if defined(SIMULATOR) && defined(XSPICE) + cp_vset("xspice_enabled", CP_BOOL, &t); +#endif +#if defined(SIMULATOR) && defined(OSDI) + cp_vset("osdi_enabled", CP_BOOL, &t); +#endif + /* --- Process command line options --- */ for (;;) { enum { soa_log = 1001, }; diff --git a/src/sharedspice.c b/src/sharedspice.c index 4b5dbcec6..4d7e52514 100644 --- a/src/sharedspice.c +++ b/src/sharedspice.c @@ -899,6 +899,15 @@ ngSpice_Init(SendChar* printfcn, SendStat* statusfcn, ControlledExit* ngspiceexi bool sm = TRUE; cp_vset("sharedmode", CP_BOOL, &sm); + /* set a boolean variable when XSPICE and/or OSDI is enabled, + to be used in spinit etc. */ +#if defined(XSPICE) + cp_vset("xspice_enabled", CP_BOOL, &sm); +#endif +#if defined(OSDI) + cp_vset("osdi_enabled", CP_BOOL, &sm); +#endif + /*parameter fetcher, used in show, alter, altermod */ if_getparam = spif_getparam_special;