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

Use a hash table glonodes to prevent double or multiple entries 

in global node table global_nodes
This commit is contained in:
Holger Vogt 2023-11-17 13:58:57 +01:00
parent d060cb82af
commit 2bbadc6085
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend/subckt.c
View File

@ -61,6 +61,7 @@ Modified: 2000 AlansFixes
#include "ngspice/fteinp.h" #include "ngspice/fteinp.h"
#include "ngspice/stringskip.h" #include "ngspice/stringskip.h"
#include "ngspice/compatmode.h" #include "ngspice/compatmode.h"
#include "ngspice/hash.h"
#include <stdarg.h> #include <stdarg.h>
@ -104,6 +105,11 @@ static int inp_numnodes(char c);
#define N_GLOBAL_NODES 1005 #define N_GLOBAL_NODES 1005
/* hash table to store the global nodes
* For now its use is limited to avoid double entries in global_nodes[] */
static NGHASHPTR glonodes = NULL;
#define DUMMYDATA ((void *)42)
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
* table is used in settrans and gettrans -- it holds the netnames used * table is used in settrans and gettrans -- it holds the netnames used
* in the .subckt definition (t_old), and in the subcircuit invocation * in the .subckt definition (t_old), and in the subcircuit invocation
@ -144,29 +150,40 @@ static int num_global_nodes;
static void static void
collect_global_nodes(struct card *c) collect_global_nodes(struct card *c)
{ {
glonodes = nghash_init(NGHASH_MIN_SIZE);
num_global_nodes = 0; num_global_nodes = 0;
global_nodes[num_global_nodes++] = copy("0"); global_nodes[num_global_nodes++] = copy("0");
nghash_insert(glonodes, global_nodes[num_global_nodes - 1], DUMMYDATA);
#ifdef XSPICE #ifdef XSPICE
global_nodes[num_global_nodes++] = copy("null"); global_nodes[num_global_nodes++] = copy("null");
nghash_insert(glonodes, global_nodes[num_global_nodes - 1], DUMMYDATA);
#endif #endif
for (; c; c = c->nextcard) for (; c; c = c->nextcard)
if (ciprefix(".global", c->line)) { if (ciprefix(".global", c->line)) {
char *s = c->line; char *s = c->line;
s = nexttok(s); s = nexttok(s);
while (*s) { while (*s) {
if (num_global_nodes == N_GLOBAL_NODES) { if (num_global_nodes == N_GLOBAL_NODES) {
fprintf(stderr, "ERROR, N_GLOBAL_NODES overflow\n"); fprintf(stderr, "ERROR, the number of global nodes is limited to %d\n", N_GLOBAL_NODES);
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
char *t = skip_non_ws(s); char *t = skip_non_ws(s);
global_nodes[num_global_nodes++] = copy_substring(s, t); char *gnode = copy_substring(s, t);
if (nghash_find(glonodes, gnode) == NULL) {
global_nodes[num_global_nodes++] = gnode;
nghash_insert(glonodes, gnode, DUMMYDATA);
}
s = skip_ws(t); s = skip_ws(t);
} }
c->line[0] = '*'; /* comment it out */ c->line[0] = '*'; /* comment it out */
} }
nghash_free(glonodes, NULL, NULL);
#ifdef TRACE #ifdef TRACE
{ {