luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to commit 

172fb6d66 ("Fix Bug 817 - "Global models are not visible from
with subcircuits". Remove code that can miscount the number of
nodes to be renamed.", 2025-10-08)
Keep checking for x lines with nesting. This re-enables
simulating large cxircuits (e.g. SRAMs) with deeply nested
subcircuit calls.
This commit is contained in:
Holger Vogt 2025-11-12 11:23:24 +01:00
parent 1ef57ffc42
commit c896fed414
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend/subckt.c
View File

@ -97,7 +97,7 @@ struct bxx_buffer;
static void finishLine(struct bxx_buffer *dst, char *src, char *scname); static void finishLine(struct bxx_buffer *dst, char *src, char *scname);
static int settrans(char *formal, int flen, char *actual, const char *subname); static int settrans(char *formal, int flen, char *actual, const char *subname);
static char *gettrans(const char *name, const char *name_end, bool *isglobal); static char *gettrans(const char *name, const char *name_end, bool *isglobal);
static int numnodes(const char *line); static int numnodes(const char* line, struct subs* subs);
static int numdevs(char *s); static int numdevs(char *s);
static wordlist *modtranslate(struct card *deck, char *subname, wordlist *new_modnames); static wordlist *modtranslate(struct card *deck, char *subname, wordlist *new_modnames);
static void devmodtranslate(struct card *deck, char *subname, wordlist * const orig_modnames); static void devmodtranslate(struct card *deck, char *subname, wordlist * const orig_modnames);
@ -1173,11 +1173,15 @@ translate_inst_name(struct bxx_buffer *buffer, const char *scname, const char *n
static int static int
translate(struct card *deck, char *formal, int flen, char *actual, char *scname, const char *subname, struct subs *subs, wordlist const *modnames) translate(struct card *deck, char *formal, int flen, char *actual, char *scname, const char *subname, struct subs *subs, wordlist const *modnames)
{ {
struct card *c; struct card *c;
struct bxx_buffer buffer; struct bxx_buffer buffer;
char *next_name, *name, *t, *nametofree, *paren_ptr; char *next_name, *name, *t, *nametofree, *paren_ptr;
int nnodes, i, dim; int nnodes, i, dim;
int rtn = 0; int rtn = 0;
NG_IGNORE(modnames);
#ifdef XSPICE #ifdef XSPICE
bool got_vnam = FALSE; bool got_vnam = FALSE;
#endif #endif
@ -1387,7 +1391,7 @@ translate(struct card *deck, char *formal, int flen, char *actual, char *scname,
* Ignore controlling nodes as they get special treatment for POLY. * Ignore controlling nodes as they get special treatment for POLY.
*/ */
nnodes = numnodes(c->line); nnodes = numnodes(c->line, subs);
while (--nnodes >= 0) { while (--nnodes >= 0) {
name = gettok_node(&s); name = gettok_node(&s);
if (name == NULL) { if (name == NULL) {
@ -1477,7 +1481,7 @@ translate(struct card *deck, char *formal, int flen, char *actual, char *scname,
tfree(name); tfree(name);
bxx_putc(&buffer, ' '); bxx_putc(&buffer, ' ');
nnodes = numnodes(c->line); nnodes = numnodes(c->line, subs);
while (--nnodes >= 0) { while (--nnodes >= 0) {
name = gettok_node(&s); name = gettok_node(&s);
if (name == NULL) { if (name == NULL) {
@ -1690,10 +1694,10 @@ gettrans(const char *name, const char *name_end, bool *isglobal)
/* Control nodes for E and G sources are not counted as they vary in /* Control nodes for E and G sources are not counted as they vary in
* the case of POLY. The count returned by get_number_terminals() includes * the case of POLY. The count returned by get_number_terminals() includes
* devices for K (mutual inductors) and W (current-controlled switch). * devices for K (mutual inductors) and W (current-controlled switch).
*/ * x lines are special, when nested and containing parameters.
* Therefore the old code is kept.*/
static int static int
numnodes(const char *line) numnodes(const char* line, struct subs* subs)
{ {
switch (*line) { switch (*line) {
case 'e': case 'e':
@ -1702,6 +1706,14 @@ numnodes(const char *line)
return 2; return 2;
case 'k': case 'k':
return 0; return 0;
case 'x':
{
const char* xname_e = skip_back_ws(strchr(line, '\0'), line);
const char* xname = skip_back_non_ws(xname_e, line);
for (; subs; subs = subs->su_next)
if (eq_substr(xname, xname_e, subs->su_name))
return subs->su_numargs;
}
} }
return get_number_terminals((char *)line); return get_number_terminals((char *)line);
} }