* TODO, doc/ngspice.texi: Small updates

ChangeLog

@@ -1,3 +1,8 @@
+2000-09-05  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* ???: Paolo and I have integrated patches from Alan Gillespie
+	<Alan.Gillespie@analog.com>.
+
 2000-07-28  Arno W. Peters  <A.W.Peters@ieee.org>
 
 	* tests/polezero/*.out: Changed the content of these files because

TODO

@@ -1,3 +1,16 @@
+Long term vision
+================
+
+Remove distinction between subcircuits and models as much as possible.
+With a Spice netlist compiler (to be written), the subcircuit can be
+translated into a compiled version, dynamically loadable into the
+simulation core.
+
+Using the approach outlined above, we can cut down on maintenance for
+the bsim[123], bjt, and other transistor models.  For inspiration,
+look at *.model files in ACS (Al's Circuit Simulator).
+
+
 List of Things To Do
 ====================
 
@@ -23,7 +36,9 @@ Usability issues
 ------------------
 
 Plug all memory leaks; use debauch (http://quorum.tamu.edu/jon/gnu/)
-or another memory checker to find them.
+or another memory checker to find them.  Could also try a garbage
+collector (http://www.hpl.hp.com/personal/Hans_Boehm/gc/) to
+circumvent memory leaks.
 
 Either get help program functioning again; OR interface to webbrowser,
 info reader and get rid of all help-related code.  Option 2 is the
@@ -43,10 +58,6 @@ Separate ngspice and nutmeg; i.e., no more SIMULATOR define.  ngspice
 should probably only contain the batch processor.  nutmeg would have
 the complete frontend.
 
-Integrate bsim3, bsim3v1, bsim3v2 to use a single codebase instead of
-three only slighty differing implementations.  This also cuts down
-compilation time.
-
 All frontend commands can now be found in the frontend directory.
 Move frontend helper functions into frontend directory as well.
 Not all files that define commands, start with com_*; fix that.
@@ -54,10 +65,25 @@ Not all files that define commands, start with com_*; fix that.
 Make devices dynamically loadable.  Perhaps use framework from glib
 (http://developer.gnome.org/doc/API/glib/index.html).
 
+Integrate bsim3, bsim3v1, bsim3v2 to use a single codebase instead of
+three only slighty differing implementations.  This also cuts down
+compilation time.
+
+Code for determing memory limits and resource usage, now use
+setjmp()/longjmp(), replace this by rlimit() on systems that have it.
+
+Program frontend in Guile (http://www.gnu.org/software/guile ),
+Python (http://www.python.org ), or SWIG (http://www.swig.org).  This
+shows where the spicelib API needs refining.
+
 
 Testability
 -----------
 
+Verify C code device models by building equivalent netlists and
+comparing simulation results.  Equivalent netlists also help document
+the models currently in Spice.
+
 Add tests for all functions in the complex library in
 src/maths/cmaths.
 
@@ -72,11 +98,23 @@ src/maths/deriv.
 
 Add more circuit tests into the tests directory.
 
+Use gcov to measure current test coverage (and to find out where more
+tests are needed.)  Make this a configure switch.
+
+Let GCC generate even more warnings on dubious construction by
+specifying the following compile switches: -pedantic -W
+-Wmissing-prototypes -Wstrict-prototypes -Wtraditional -Wconversion
+-Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings
+-Waggregate-return -fshort-enums -fno-common -Wnested-externs
+-Dinline= -g -O4.  Use 'configure --enable-smoketest' to use these
+compile switches.  Our goal is to remove all warnings.
+
 
 Documentation
 -------------
 
-Update ARCHITECTURE to contain a high level overview of spice.
+Make a document that contains a high level architectural overview of
+spice.
 
 Convert ngspice.texi further to texinfo format. [PARTIAL]
 

configure.in

@@ -27,6 +27,10 @@ dnl --enable-sense2 : define HAVE_SENSE2 for the code
 AC_ARG_ENABLE(sense2,
     [  --enable-sense2         Use spice2 sensitivity analysis])
 
+dnl --enable-smoketest : a smoketest
+AC_ARG_ENABLE(smoketest,
+    [  --enable-smoketest      Enables smoketest compile])
+
 dnl --enable-experimental : define EXPERIMENTAL_CODE for the code
 AC_ARG_ENABLE(experimental,
     [  --enable-experimental   Enables some experimental code])
@@ -52,6 +56,7 @@ if test "$enable_debug" = "no"; then
 	CFLAGS=" "
 fi
 
+
 dnl Not sure that this will work....
 if test "$with_checkergcc" = "yes"; then
         CC="checkergcc"
@@ -68,24 +73,20 @@ if test "$enable_ansi" = "yes"; then
 	fi	
 fi
 
-
+if test "$enable_smoketest" = "yes"; then
+dnl	CFLAGS="$CFLAGS -Werror"
+	CFLAGS="$CFLAGS -pedantic -W -Wmissing-prototypes"
+	CFLAGS="$CFLAGS -Wstrict-prototypes -Wtraditional"
+	CFLAGS="$CFLAGS -Wconversion -Wshadow -Wpointer-arith"
+	CFLAGS="$CFLAGS -Wcast-qual -Wcast-align -Wwrite-strings"
+	CFLAGS="$CFLAGS -Waggregate-return -fshort-enums -fno-common"
+	CFLAGS="$CFLAGS -Wnested-externs -Dinline= -g -O4"
+fi
 
 
 dnl Chech system we're on , and tune accordingly 
 AC_CANONICAL_HOST
 
-case "$host" in
-
-*bsd* )    CFLAGS="$CFLAGS";;
-*linux*)   CFLAGS="$CFLAGS";;
-*rs6000* ) CFLAGS="$CFLAGS";;
-*sgi* )    CFLAGS="$CFLAGS";;
-*sun* )    CFLAGS="$CFLAGS";;
-*ultrix* ) CFLAGS="$CFLAGS";;
-
-esac
-
-
 
 dnl Checks for programs
 

doc/ngspice.texi

@@ -146,7 +146,7 @@ Emmanuel Rouat <emmanuel.rouat@@wanadoo.fr>,
 Jaijeet S. Roychowdhury,
 Takayasu Sakurai,
 Kanwar Jit Singh,
-Andrew Tuckey <Tuckey@@ieee.org>
+Andrew Tuckey <Tuckey@@ieee.org>,
 Michael Widlok <widlok@@uci.agh.edu.pl>,
 and many others...
 

src/frontend/outitf.c

@@ -30,7 +30,9 @@ Modified: 2000 AlansFixes
 
 
 extern void gr_end_iplot(void);
-extern SPICEanalysis *analInfo[];
+extern char *spice_analysis_get_name(int index);
+extern char *spice_analysis_get_description(int index);
+
 
 /* static declarations */
 static int beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, 
@@ -135,7 +137,7 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
     run->windowed = windowed;
     run->numData = 0;
 
-    an_name = analInfo[((JOB *) analysisPtr)->JOBtype]->public.name;
+    an_name = spice_analysis_get_name(((JOB *) analysisPtr)->JOBtype);
 
     /* Now let's see which of these things we need.  First toss in the
      * reference vector.  Then toss in anything that getSaves() tells
@@ -159,8 +161,8 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
                 continue;
             }
             if (cieq(saves[i].name, "alli")) {
-                savealli = true;
-                savesused[i] = true;
+                savealli = TRUE;
+                savesused[i] = TRUE;
 		saves[i].used = 1;
                 continue;
             }
@@ -315,7 +317,7 @@ beginPlot(void *analysisPtr, void *circuitPtr, char *cktName, char *analName, ch
 	    && run->refIndex == -1))
     {
 	fprintf(cp_err, "Error: no data saved for %s; analysis not run\n",
-	    analInfo[((JOB *) analysisPtr)->JOBtype]->public.description);
+		spice_analysis_get_description(((JOB *) analysisPtr)->JOBtype));
 	return E_NOTFOUND;
     }
     
@@ -488,7 +490,7 @@ OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
         fileEndPoint(run->fp, run->binary);
         if (ferror(run->fp)) {
              fprintf(stderr, "Warning: rawfile write error !!\n");
-             shouldstop=true;
+             shouldstop = TRUE;
         };
     } else {
         for (i = 0; i < run->numData; i++) {
@@ -711,13 +713,13 @@ fileInit(runDesc *run)
     
     /*  Write Analysis Type */
 
-    if (strnicmp(run->type,"AC",2)==0) {
+    if (strncasecmp(run->type,"AC",2)==0) {
           sprintf(buf, "AC Sweep");
           sweep=2;
-    } else if (strnicmp(run->type,"DC",2)==0) {
+    } else if (strncasecmp(run->type,"DC",2)==0) {
           sprintf(buf, "DC Sweep");
           sweep=1;
-    } else if (strnicmp(run->type,"Tran",4)==0) {
+    } else if (strncasecmp(run->type,"Tran",4)==0) {
           sprintf(buf, "Transient Analysis");
           sweep=4;
     };
@@ -818,23 +820,24 @@ fileInit_pass2(runDesc *run)
     int i, type;
     char *name, buf[BSIZE_SP];
     char *ch, *end;
+    int tmp;
 
     for (i = 0; i < run->numData; i++) {
        
-       if ((run->data[i].regular==false) ||
+	if ((run->data[i].regular == FALSE) ||
             cieq(run->data[i].name, "time") ||
             cieq(run->data[i].name, "sweep") ||
             cieq(run->data[i].name, "frequency"))
-           (void) sprintf(name, "%s", run->data[i].name);
+	    (void) sprintf(name, "%s", run->data[i].name);
         else
-           (void) sprintf(name, "V(%s)", run->data[i].name);
+	    (void) sprintf(name, "V(%s)", run->data[i].name);
 
-		  if (ch=strstr(name, "#branch")) {
+	if (ch=strstr(name, "#branch")) {
             name[0]='I';
             *ch++=')';
             *ch='\0';	
             type = SV_CURRENT;
-            }
+	}
         else if (cieq(name, "time"))
             type = SV_TIME;
         else if (cieq(name, "frequency"))
@@ -842,56 +845,57 @@ fileInit_pass2(runDesc *run)
         else 
             type = SV_VOLTAGE;
         if (*name=='@') {
-          type = SV_CURRENT;
-          memmove(name, &name[1], strlen(name)-1);
-          if ((ch=strchr(name, '['))!=NULL) {
-            ch++;
-            strncpy(buf, ch, BSIZE_SP);
-            ch--;
-            *ch='\0';
-            if ((ch=strchr(buf, ']'))!=NULL) *ch='\0';
-            strcat(buf, "(");
-            if ((ch=strchr(name, ':'))!=NULL) {
-                ch++;
-                strncat(buf, ch, BSIZE_SP-strlen(buf));
-                ch--;
-                *ch='\0';
-                if ((ch=strrchr(buf, ':'))!=NULL) {
-                   ch++;
-                   memmove(&ch[strlen(name)], ch, strlen(ch)+1);
-                   memmove(ch, name, strlen(name));
-                };
-            } else {
-                strncat(buf, name, BSIZE_SP-strlen(buf));
-            };
-            strcat(buf, ")");
-          };
-          strncpy(name, buf, BSIZE_SP);
+	    type = SV_CURRENT;
+	    memmove(name, &name[1], strlen(name)-1);
+	    if ((ch=strchr(name, '['))!=NULL) {
+		ch++;
+		strncpy(buf, ch, BSIZE_SP);
+		ch--;
+		*ch='\0';
+		if ((ch=strchr(buf, ']'))!=NULL) *ch='\0';
+		strcat(buf, "(");
+		if ((ch=strchr(name, ':'))!=NULL) {
+		    ch++;
+		    strncat(buf, ch, BSIZE_SP-strlen(buf));
+		    ch--;
+		    *ch='\0';
+		    if ((ch=strrchr(buf, ':'))!=NULL) {
+			ch++;
+			memmove(&ch[strlen(name)], ch, strlen(ch)+1);
+			memmove(ch, name, strlen(name));
+		    };
+		} else {
+		    strncat(buf, name, BSIZE_SP-strlen(buf));
+		};
+		strcat(buf, ")");
+	    };
+	    strncpy(name, buf, BSIZE_SP);
         };
 
-        while ((ch=strchr(name, ':'))!=NULL) *ch='.';
+        while ((ch=strchr(name, ':'))!=NULL)
+	    *ch='.';
 
         if ((ch=strchr(name, '('))!=NULL) {
-          ch++;
-          end=(char *)memchr(name, '\0', BSIZE_SP);
-          while (strchr(ch, '.')!=NULL) {
-              memmove(ch+1, ch, end-ch+1);
-              end++;
-              *ch='x';
-              ch=strchr(ch, '.');
-              ch++;
-          };
+	    ch++;
+	    end=(char *)memchr(name, '\0', BSIZE_SP);
+	    while (strchr(ch, '.')!=NULL) {
+		memmove(ch+1, ch, end-ch+1);
+		end++;
+		*ch='x';
+		ch=strchr(ch, '.');
+		ch++;
+	    };
         };
 
         fprintf(run->fp, "%s", name);
         tmp=0;
-        fwrite((char*)&tmp,1,1,run->fp);
+        fwrite((void *)&tmp,1,1,run->fp);
 
     }
 
     fflush(run->fp);        /* Make all sure this gets to disk */
 
-/*  Allocate Row buffer  */
+    /*  Allocate Row buffer  */
 
     rowbuflen=(run->numData)*sizeof(float);
     if (run->isComplex) rowbuflen *=2;
@@ -1126,7 +1130,7 @@ parseSpecial(char *name, char *dev, char *param, char *ind)
     *dev = *param = *ind = '\0';
 
     if (*name != '@')
-        return (FALSE);
+        return FALSE;
     name++;
     
     s = dev;
@@ -1134,7 +1138,7 @@ parseSpecial(char *name, char *dev, char *param, char *ind)
         *s++ = *name++;
     *s = '\0';
     if (!*name)
-        return (TRUE);
+        return TRUE;
     name++;
 
     s = param;
@@ -1144,7 +1148,7 @@ parseSpecial(char *name, char *dev, char *param, char *ind)
     if (*name == ']')
         return (!name[1] ? TRUE : FALSE);
     else if (!*name)
-        return (FALSE);
+        return FALSE;
     name++;
 
     s = ind;
@@ -1152,9 +1156,9 @@ parseSpecial(char *name, char *dev, char *param, char *ind)
         *s++ = *name++;
     *s = '\0';
     if (*name && !name[1])
-        return (TRUE);
+        return TRUE;
     else
-        return (FALSE);
+        return FALSE;
 }
 
 /* This routine must match two names with or without a V() around them. */
@@ -1167,14 +1171,14 @@ name_eq(char *n1, char *n2)
     if ((s =strchr(n1, '('))) {
         strcpy(buf1, s);
         if (!(s =strchr(buf1, ')')))
-            return (FALSE);
+            return FALSE;
         *s = '\0';
         n1 = buf1;
     }
     if ((s =strchr(n2, '('))) {
         strcpy(buf2, s);
         if (!(s =strchr(buf2, ')')))
-            return (FALSE);
+            return FALSE;
         *s = '\0';
         n2 = buf2;
     }
@@ -1193,7 +1197,7 @@ getSpecial(dataDesc *desc, runDesc *run, IFvalue *val)
             desc->specName, &desc->specFast, ft_sim, &desc->type,
             &selector) == OK) {
       desc->type &= (IF_REAL | IF_COMPLEX);   /* mask out other bits */
-      return(TRUE);
+      return TRUE;
     } else if ((vv = if_getstat(run->circuit, &desc->name[1]))) {
 						/* skip @ sign */
       desc->type = IF_REAL;
@@ -1204,13 +1208,13 @@ getSpecial(dataDesc *desc, runDesc *run, IFvalue *val)
       else if (vv->va_type == VT_BOOL)
 	val->rValue = (vv->va_bool ? 1.0 : 0.0);
       else {
-	return (FALSE); /* not a real */
+	return FALSE; /* not a real */
       }
       tfree(vv);
-      return(TRUE);
+      return TRUE;
     }
 
-    return (FALSE);
+    return FALSE;
 }
 
 static void

src/frontend/parser/numparse.c

@@ -13,7 +13,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 
 static double
-pow10(double num)   /* Chris Inbody */
+power10(double num)   /* Chris Inbody */
 {
     double d = 1.0;
 
@@ -65,7 +65,7 @@ ft_numparse(char **s, bool whole)
         string++;
         p = 1;
         while (isdigit(*string))
-            mant += (*string++ - '0') / pow10(p++);
+            mant += (*string++ - '0') / power10(p++);
     }
 
     /* Now look for the scale factor or the exponent (can't have both). */
@@ -87,7 +87,7 @@ ft_numparse(char **s, bool whole)
                 string++;
                 p = 1;
                 while (isdigit(*string))
-                    expo += (*string++ - '0') / pow10(p++);
+                    expo += (*string++ - '0') / power10(p++);
             }
             expo *= exsign;
             break;

src/frontend/runcoms.c

@@ -294,11 +294,10 @@ ft_getOutReq(FILE **fpp, struct plot **plotp, bool *binp, char *name, char *titl
 {
     /*struct plot *pl;*/
 #ifndef BATCH
-struct plot *pl;
 
     if ( (strcmp(name, "Operating Point")==0) ||
          (strcmp(name, "AC Operating Point")==0) ) {
-        return (false);
+        return (FALSE);
     };
 #endif
 

src/frontend/spiceif.c

@@ -51,27 +51,32 @@ if_inpdeck(struct line *deck, INPtables **tab)
         i++;
     *tab = INPtabInit(i);
     ft_curckt->ci_symtab = *tab;
-    if ((err = (*(ft_sim->newCircuit))(&ckt))
-            != OK) {
+
+    err = (*(ft_sim->newCircuit))(&ckt);
+    if (err != OK) {
         ft_sperror(err, "CKTinit");
         return (NULL);
     }
+
     err = IFnewUid(ckt,&taskUid,(IFuid)NULL,"default",UID_TASK,(void**)NULL);
     if(err) {
         ft_sperror(err,"newUid");
         return(NULL);
     }
+
     err = (*(ft_sim->newTask))(ckt,(void**)&(ft_curckt->ci_defTask),taskUid);
     if(err) {
         ft_sperror(err,"newTask");
         return(NULL);
     }
+
     for(j=0;j<ft_sim->numAnalyses;j++) {
         if(strcmp(ft_sim->analyses[j]->name,"options")==0) {
             which = j;
             break;
         }
     } 
+
     if(which != -1) {
         err = IFnewUid(ckt,&optUid,(IFuid)NULL,"options",UID_ANALYSIS,
                 (void**)NULL);
@@ -79,6 +84,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
             ft_sperror(err,"newUid");
             return(NULL);
         }
+
         err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,optUid,
                 (void**)&(ft_curckt->ci_defOpt),
                 (void*)ft_curckt->ci_defTask);
@@ -86,33 +92,34 @@ if_inpdeck(struct line *deck, INPtables **tab)
             ft_sperror(err,"createOptions");
             return(NULL);
         }
+
         ft_curckt->ci_curOpt  = ft_curckt->ci_defOpt;
     }
+
     ft_curckt->ci_curTask = ft_curckt->ci_defTask;
     INPpas1((void *) ckt, (card *) deck->li_next,(INPtables *)*tab);
     INPpas2((void *) ckt, (card *) deck->li_next,
             (INPtables *) *tab,ft_curckt->ci_defTask);
     INPkillMods();
 
-/*  INPpas2 has been modified to ignore .NODESET and .IC cards. These are
- *  left till INPpas3 so that we can check for nodeset/ic of non-existant
- *  nodes.
- */
+    /* INPpas2 has been modified to ignore .NODESET and .IC
+     * cards. These are left till INPpas3 so that we can check for
+     * nodeset/ic of non-existant nodes.  */
 
-    INPpas3((GENERIC *) ckt, (card *) deck->li_next,
-            (INPtables *) *tab,ft_curckt->ci_defTask);
+    INPpas3((void *) ckt, (card *) deck->li_next,
+            (INPtables *) *tab,ft_curckt->ci_defTask, ft_sim->nodeParms,
+	    ft_sim->numNodeParms);
 
     return (ckt);
 }
 
-/* Do a run of the circuit, of the given type. Type "resume" is special --
- * it means to resume whatever simulation that was in progress. The
- * return value of this routine is 0 if the exit was ok, and 1 if there was
- * a reason to interrupt the circuit (interrupt typed at the keyboard,
- * error in the simulation, etc). args should be the entire command line,
- * e.g. "tran 1 10 20 uic"
- */
 
+/* Do a run of the circuit, of the given type. Type "resume" is
+ * special -- it means to resume whatever simulation that was in
+ * progress. The return value of this routine is 0 if the exit was ok,
+ * and 1 if there was a reason to interrupt the circuit (interrupt
+ * typed at the keyboard, error in the simulation, etc). args should
+ * be the entire command line, e.g. "tran 1 10 20 uic" */
 int
 if_run(char *t, char *what, wordlist *args, char *tab)
 {

src/include/cktdefs.h

@@ -6,10 +6,10 @@
 #ifndef CKT
 #define CKT "CKTdefs.h $Revision$  on $Date$ "
 
-#define MAXNUMDEVS 32     /* Max number of possible devices; */
-extern int DEVmaxnum;     /* Not sure if still used */
-#define MAXNUMDEVNODES 4  /* Max No. of nodes per device */
-                          /* Need to change for SOI devs ? */
+#define MAXNUMDEVS 32		/* Max number of possible devices; */
+extern int DEVmaxnum;		/* Not sure if still used */
+#define MAXNUMDEVNODES 4	/* Max No. of nodes per device */
+				/* Need to change for SOI devs ? */
 
 #include "smpdefs.h"
 #include "ifsim.h"
@@ -32,13 +32,13 @@ typedef struct sCKTnode {
 #define NODE_VOLTAGE SP_VOLTAGE
 #define NODE_CURRENT SP_CURRENT
 
-  int number;                /* Number of the node */
-  double ic;                 /* Value of the initial condition */
-  double nodeset;            /* Value of the .nodeset option */
-  double *ptr;               /* ??? */
-  struct sCKTnode *next;     /* pointer to the next node */
-  unsigned int icGiven:1;    /* FLAG ic given */
-  unsigned int nsGiven:1;    /* FLAG nodeset given */ 
+    int number;			/* Number of the node */
+    double ic;			/* Value of the initial condition */
+    double nodeset;		/* Value of the .nodeset option */
+    double *ptr;		/* ??? */
+    struct sCKTnode *next;	/* pointer to the next node */
+    unsigned int icGiven:1;	/* FLAG ic given */
+    unsigned int nsGiven:1;	/* FLAG nodeset given */ 
 } CKTnode;
 
 /* defines for node parameters */
@@ -49,11 +49,11 @@ typedef struct sCKTnode {
 
 
 typedef struct {
-  GENmodel *CKThead[MAXNUMDEVS];  /* The max number of loadable devices */
-  STATistics *CKTstat;            /* The STATistics structure */
-  double *(CKTstates[8]);         /* Used as memory of past steps ??? */
+    GENmodel *CKThead[MAXNUMDEVS]; /* The max number of loadable devices */
+    STATistics *CKTstat;	/* The STATistics structure */
+    double *(CKTstates[8]);	/* Used as memory of past steps ??? */
 
-  /* Some shortcut for CKTstates */
+    /* Some shortcut for CKTstates */
 #define CKTstate0 CKTstates[0]
 #define CKTstate1 CKTstates[1]
 #define CKTstate2 CKTstates[2]
@@ -62,40 +62,44 @@ typedef struct {
 #define CKTstate5 CKTstates[5]
 #define CKTstate6 CKTstates[6]
 #define CKTstate7 CKTstates[7]
-  double CKTtime;                /* ??? */
-  double CKTdelta;               /* ??? */
-  double CKTdeltaOld[7];         /* Memory for ??? */
-  double CKTtemp;                /* Actual temperature of CKT */
-  double CKTnomTemp;             /* Reference temperature 27 C ? */
-  double CKTvt;                  /* Thernmal voltage at CKTtemp */
-  double CKTag[7];               /* the gear variable coefficient matrix */
+    double CKTtime;		/* ??? */
+    double CKTdelta;		/* ??? */
+    double CKTdeltaOld[7];	/* Memory for ??? */
+    double CKTtemp;		/* Actual temperature of CKT */
+    double CKTnomTemp;		/* Reference temperature 27 C ? */
+    double CKTvt;		/* Thernmal voltage at CKTtemp */
+    double CKTag[7];		/* the gear variable coefficient matrix */
 #ifdef PREDICTOR
-    double CKTagp[7];       /* the gear predictor variable coefficient matrix */
+    double CKTagp[7];		/* the gear predictor variable
+                                   coefficient matrix */
 #endif /*PREDICTOR*/
-    int CKTorder;           /* the integration method order */
-    int CKTmaxOrder;        /* maximum integration method order */
-    int CKTintegrateMethod; /* the integration method to be used */
+    int CKTorder;		/* the integration method order */
+    int CKTmaxOrder;		/* maximum integration method order */
+    int CKTintegrateMethod;	/* the integration method to be used */
 
 /* known integration methods */
 #define TRAPEZOIDAL 1
 #define GEAR 2
 
-    SMPmatrix *CKTmatrix;   /* pointer to sparse matrix */
-    int CKTniState;         /* internal state */
-    double *CKTrhs;         /* current rhs value - being loaded */
-    double *CKTrhsOld;      /* previous rhs value for convergence testing */
-    double *CKTrhsSpare;    /* spare rhs value for reordering */
-    double *CKTirhs;        /* current rhs value - being loaded (imag) */
-    double *CKTirhsOld;     /* previous rhs value (imaginary)*/
-    double *CKTirhsSpare;   /* spare rhs value (imaginary)*/
+    SMPmatrix *CKTmatrix;	/* pointer to sparse matrix */
+    int CKTniState;		/* internal state */
+    double *CKTrhs;		/* current rhs value - being loaded */
+    double *CKTrhsOld;		/* previous rhs value for convergence
+                                   testing */
+    double *CKTrhsSpare;	/* spare rhs value for reordering */
+    double *CKTirhs;		/* current rhs value - being loaded
+                                   (imag) */
+    double *CKTirhsOld;		/* previous rhs value (imaginary)*/
+    double *CKTirhsSpare;	/* spare rhs value (imaginary)*/
 #ifdef PREDICTOR
-    double *CKTpred;        /* predicted solution vector */
-    double *CKTsols[8];     /* previous 8 solutions */
+    double *CKTpred;		/* predicted solution vector */
+    double *CKTsols[8];		/* previous 8 solutions */
 #endif /* PREDICTOR */
 
-    double *CKTrhsOp;      /* opearating point values */
-    double *CKTsenRhs;      /* current sensitivity rhs  values */
-    double *CKTseniRhs;      /* current sensitivity rhs  values (imag)*/
+    double *CKTrhsOp;		/* opearating point values */
+    double *CKTsenRhs;		/* current sensitivity rhs values */
+    double *CKTseniRhs;		/* current sensitivity rhs values
+                                   (imag)*/
 
 
 /*
@@ -113,19 +117,21 @@ typedef struct {
 #define NIDIDPREORDER 0x100
 #define NIPZSHOULDREORDER 0x200
 
-  int CKTmaxEqNum;        /* And this ? */
-  int CKTcurrentAnalysis; /* the analysis in progress (if any) */
+    int CKTmaxEqNum;		/* And this ? */
+    int CKTcurrentAnalysis;	/* the analysis in progress (if any) */
 
 /* defines for the value of  CKTcurrentAnalysis */
 /* are in TSKdefs.h */
 
-  CKTnode *CKTnodes;          /* ??? */
-  CKTnode *CKTlastNode;       /* ??? */
+    CKTnode *CKTnodes;          /* ??? */
+    CKTnode *CKTlastNode;       /* ??? */
 
-  /* This define should be somewhere else ??? */
+    /* This define should be somewhere else ??? */
 #define NODENAME(ckt,nodenum) CKTnodName(ckt,nodenum)
-  int CKTnumStates;       /* Number of sates effectively valid ??? */ 
-  long CKTmode;           /* Mode of operation of the circuit ??? */
+    int CKTnumStates;		/* Number of sates effectively valid
+                                   ??? */
+    long CKTmode;		/* Mode of operation of the circuit
+                                   ??? */
 
 /* defines for CKTmode */
 
@@ -152,72 +158,78 @@ typedef struct {
 /* old 'nosolv' paramater */
 #define MODEUIC 0x10000l
 
-  int CKTbypass;          /* bypass option, how does it work ? */
-  int CKTdcMaxIter;       /* iteration limit for dc op.  (itl1) */
-  int CKTdcTrcvMaxIter;   /* iteration limit for dc tran. curv (itl2) */
-  int CKTtranMaxIter;     /* iteration limit for each timepoint for tran*/
-                          /* (itl4) */
-  int CKTbreakSize;       /* ??? */
-  int CKTbreak;           /* ??? */
-  double CKTsaveDelta;    /* ??? */
-  double CKTminBreak;     /* ??? */
-  double *CKTbreaks;      /* List of breakpoints ??? */
-  double CKTabstol;       /* --- */
-  double CKTpivotAbsTol;  /* --- */
-  double CKTpivotRelTol;  /* --- */
-  double CKTreltol;       /* --- */
-  double CKTchgtol;       /* --- */
-  double CKTvoltTol;      /* --- */
-  /* What is this define for  ? */
+    int CKTbypass;		/* bypass option, how does it work ?  */
+    int CKTdcMaxIter;		/* iteration limit for dc op.  (itl1) */
+    int CKTdcTrcvMaxIter;	/* iteration limit for dc tran. curv
+                                   (itl2) */
+    int CKTtranMaxIter;		/* iteration limit for each timepoint
+                                   for tran*/
+    /* (itl4) */
+    int CKTbreakSize;		/* ??? */
+    int CKTbreak;		/* ??? */
+    double CKTsaveDelta;	/* ??? */
+    double CKTminBreak;		/* ??? */
+    double *CKTbreaks;		/* List of breakpoints ??? */
+    double CKTabstol;		/* --- */
+    double CKTpivotAbsTol;	/* --- */
+    double CKTpivotRelTol;	/* --- */
+    double CKTreltol;		/* --- */
+    double CKTchgtol;		/* --- */
+    double CKTvoltTol;		/* --- */
+    /* What is this define for  ? */
 #ifdef NEWTRUNC
     double CKTlteReltol;  
     double CKTlteAbstol;
 #endif /* NEWTRUNC */
-  double CKTgmin;         /* Parallel Conductance --- */
-  double CKTgshunt;       
-  double CKTdelmin;       /* ??? */
-  double CKTtrtol;        /* ??? */
-  double CKTfinalTime;    /* ??? */
-  double CKTstep;         /* ??? */
-  double CKTmaxStep;      /* ??? */
-  double CKTinitTime;     /* ??? */
-  double CKTomega;        /* ??? */
-  double CKTsrcFact;      /* ??? */
-  double CKTdiagGmin;     /* ??? */
-  int CKTnumSrcSteps;     /* ??? */
-  int CKTnumGminSteps;    /* ??? */
-  double CKTgminFactor;   
-  int CKTnoncon;          /* ??? */
-  double CKTdefaultMosM;  
-  double CKTdefaultMosL;  /* Default Channel Lenght of MOS devices */
-  double CKTdefaultMosW;  /* Default Channel Width of MOS devics */
-  double CKTdefaultMosAD; /* Default Drain Area of MOS */
-  double CKTdefaultMosAS; /* Default Source Area of MOS */
-  unsigned int CKThadNodeset:1; /* ??? */
-  unsigned int CKTfixLimit:1;   /* flag to indicate that the limiting of 
-                                 * MOSFETs should be done as in SPICE2 */
-  unsigned int CKTnoOpIter:1;   /* flag to indicate not to try the operating
-                                 * point brute force, but to use gmin stepping
-                                 * first */
-  unsigned int CKTisSetup:1;    /* flag to indicate if CKTsetup done */
-  JOB *CKTcurJob;               /* Next analysis to be performed ??? */
-
-  SENstruct *CKTsenInfo;	/* the sensitivity information */
-  double *CKTtimePoints;        /* list of all accepted timepoints in the
+    double CKTgmin;		/* Parallel Conductance --- */
+    double CKTgshunt;       
+    double CKTdelmin;		/* ??? */
+    double CKTtrtol;		/* ??? */
+    double CKTfinalTime;	/* ??? */
+    double CKTstep;		/* ??? */
+    double CKTmaxStep;		/* ??? */
+    double CKTinitTime;		/* ??? */
+    double CKTomega;		/* ??? */
+    double CKTsrcFact;		/* ??? */
+    double CKTdiagGmin;		/* ??? */
+    int CKTnumSrcSteps;		/* ??? */
+    int CKTnumGminSteps;	/* ??? */
+    double CKTgminFactor;   
+    int CKTnoncon;		/* ??? */
+    double CKTdefaultMosM;  
+    double CKTdefaultMosL;	/* Default Channel Lenght of MOS devices */
+    double CKTdefaultMosW;	/* Default Channel Width of MOS devics */
+    double CKTdefaultMosAD;	/* Default Drain Area of MOS */
+    double CKTdefaultMosAS;	/* Default Source Area of MOS */
+    unsigned int CKThadNodeset:1; /* ??? */
+    unsigned int CKTfixLimit:1;	/* flag to indicate that the limiting
+				   of MOSFETs should be done as in
+				   SPICE2 */
+    unsigned int CKTnoOpIter:1;	/* flag to indicate not to try the operating
+				   point brute force, but to use gmin stepping
+				   first */
+    unsigned int CKTisSetup:1;	/* flag to indicate if CKTsetup done */
+    JOB *CKTcurJob;		/* Next analysis to be performed ??? */
+
+    SENstruct *CKTsenInfo;	/* the sensitivity information */
+    double *CKTtimePoints;	/* list of all accepted timepoints in
+				   the current transient simulation */
+    double *CKTdeltaList;	/* list of all timesteps in the
 				   current transient simulation */
-  double *CKTdeltaList;         /* list of all timesteps in the current
-				   transient simulation */
-  int CKTtimeListSize;	        /* size of above lists */
-  int CKTtimeIndex;		/* current position in above lists */
-  int CKTsizeIncr;		/* amount to increment size of above arrays
-				   when you run out of space */
-  unsigned int CKTtryToCompact:1; /* try to compact past history for LTRA
-				   lines */
-  unsigned int CKTbadMos3:1; /* Use old, unfixed MOS3 equations */
-  unsigned int CKTkeepOpInfo:1; /* flag for small signal analyses */
-  unsigned int CKTcopyNodesets:1; /* NodesetFIX */
-  int CKTtroubleNode;		/* Non-convergent node number */
-  GENinstance *CKTtroubleElt;	/* Non-convergent device instance */
+    int CKTtimeListSize;	/* size of above lists */
+    int CKTtimeIndex;		/* current position in above lists */
+    int CKTsizeIncr;		/* amount to increment size of above
+				   arrays when you run out of space */
+    unsigned int CKTtryToCompact:1; /* try to compact past history for LTRA
+				       lines */
+    unsigned int CKTbadMos3:1;	/* Use old, unfixed MOS3 equations */
+    unsigned int CKTkeepOpInfo:1; /* flag for small signal analyses */
+    unsigned int CKTcopyNodesets:1; /* NodesetFIX */
+    unsigned int CKTnodeDamping:1; /* flag for node damping fix */
+    double CKTabsDv;		/* abs limit for iter-iter voltage change */
+    double CKTrelDv;		/* rel limit for iter-iter voltage change */
+    int CKTtroubleNode;		/* Non-convergent node number */
+    GENinstance *CKTtroubleElt;	/* Non-convergent device instance */
 
 } CKTcircuit;
 
@@ -339,7 +351,6 @@ extern int NIpzSym2(PZtrial **, PZtrial *);
 extern int NIreinit( CKTcircuit *);
 extern int NIsenReinit( CKTcircuit *);
 extern int NIdIter (CKTcircuit *);             
-/*extern int NInzIter (CKTcircuit *, int, int ); */ 
 extern IFfrontEnd *SPfrontEnd;
 
 #endif /*CKT*/

src/include/fteext.h

@@ -187,8 +187,8 @@ extern void fatal();
 extern void fperror();
 extern void ft_sperror();
 extern char ErrorMessage[];
-extern int internalerror(char *); 
-extern int externalerror(char *); 
+extern void internalerror(char *); 
+extern void externalerror(char *); 
 
 
 

src/include/inpdefs.h

@@ -104,7 +104,7 @@ int INPmakeMod(char*,int,card*);
 char *INPmkTemp(char*);
 void INPpas1(void*,card*,INPtables*);
 void INPpas2(void*,card*,INPtables*,void *);
-void INPpas3(void*,card*,INPtables*,void *); 
+void INPpas3(void*,card*,INPtables*,void *,IFparm*,int); 
 int INPpName(char*,IFvalue*,void*,int,void*);
 int INPtermInsert(void*,char**,INPtables*,void**);
 int INPmkTerm(void*,char**,INPtables*,void**);

src/include/jobdefs.h

@@ -16,17 +16,6 @@ typedef struct sJOB{
 
 } JOB;
 
-typedef struct {
-    IFanalysis public;
-    int size;
-    int domain;
-    int do_ic;
-    int (*(setParm))( );
-    int (*(askQuest))( );
-    int (*an_init)( );
-    int (*an_func)( );
-} SPICEanalysis;
-
 #define NODOMAIN	0
 #define TIMEDOMAIN	1
 #define FREQUENCYDOMAIN 2

src/include/ngspice.h

@@ -95,16 +95,9 @@ struct timeb timebegin;
 #endif
 
 #ifdef HAS_TIME_
-#  ifdef HAVE_GETTIMEOFDAY
-/* extern char *timezone(); */  /* never used ? (ER) */
-#  endif
-extern char *asctime();
-extern struct tm *localtime();
+#include <time.h>
 #endif
 
-extern char *sbrk();
-
-
 
 /* Functions declarations from src/misc/[].c  */
 
@@ -122,12 +115,12 @@ extern char *tilde_expand(char *string);
 
 extern char *smktemp(char *id);
 
-extern char *copy();
-extern int prefix();
-extern int substring();
-extern void cp_printword();
+extern char *copy(char *str);
+extern int prefix(char *p, char *str);
+extern int substring(char *sub, char *str);
+extern void cp_printword(char *string, FILE *fp);
 
-extern char *datestring();
+extern char *datestring(void);
 extern double seconds(void);
 
 /* Some external variables */

src/include/tskdefs.h

@@ -34,6 +34,7 @@ typedef struct {
                             /* (itl4) */
     int TSKnumSrcSteps;     /* number of steps for source stepping */
     int TSKnumGminSteps;    /* number of steps for Gmin stepping */
+    double TSKgminFactor;   /* factor for Gmin stepping */
     double TSKminBreak;
     double TSKabstol;
     double TSKpivotAbsTol;

src/main.c

@@ -20,6 +20,7 @@
 #include <ftedefs.h>
 #include <devdefs.h>
 #include <spicelib/devices/dev.h>
+#include <spicelib/analysis/analysis.h>
 #include <misc/ivars.h>
 #include <frontend/resource.h>
 #include <frontend/variable.h>
@@ -164,6 +165,8 @@ int SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
     spice_init_devices();
     SIMinfo.numDevices = DEVmaxnum = num_devices();
     SIMinfo.devices = devices_ptr();
+    SIMinfo.numAnalyses = spice_num_analysis();
+    SIMinfo.analyses = spice_analysis_ptr();
 #endif /* SIMULATOR */
 
     SPfrontEnd = frontEnd;

src/ngspice.c

@@ -20,33 +20,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "suffix.h"
 
 
-extern SPICEanalysis OPTinfo;
-extern SPICEanalysis ACinfo;
-extern SPICEanalysis DCTinfo;
-extern SPICEanalysis DCOinfo;
-extern SPICEanalysis TRANinfo;
-extern SPICEanalysis PZinfo;
-extern SPICEanalysis TFinfo;
-extern SPICEanalysis DISTOinfo;
-extern SPICEanalysis NOISEinfo;
-extern SPICEanalysis SENSinfo;
-
-
-SPICEanalysis *analInfo[] = {
-    &OPTinfo,
-    &ACinfo,
-    &DCTinfo,
-    &DCOinfo,
-    &TRANinfo,
-    &PZinfo,
-    &TFinfo,
-    &DISTOinfo,
-    &NOISEinfo,
-    &SENSinfo,
-
-};
-
-int ANALmaxnum = sizeof(analInfo)/sizeof(SPICEanalysis*);
 /* XXX Should be -1 ? There is always an extra null element at the end ? */
 static char * specSigList[] = {
     "time"
@@ -100,9 +73,8 @@ IFsimulator SIMinfo = {
 
     0,				/* Initialized in SIMinit() */
     NULL,			/* Initialized in SIMinit() */
-
-    sizeof(analInfo)/sizeof(SPICEanalysis *),
-    (IFanalysis **)analInfo,
+    0,				/* Initialized in SIMinit() */
+    NULL,			/* Initialized in SIMinit() */
 
     sizeof(nodeParms)/sizeof(IFparm),
     nodeParms,

src/spicelib/analysis/Makefile.am

@@ -6,6 +6,8 @@ libckt_a_SOURCES = \
 		acan.c		\
 		acaskq.c	\
 		acsetp.c	\
+		analysis.c	\
+		analysis.h	\
 		cktacct.c	\
 		cktacdum.c	\
 		cktaskaq.c	\

src/spicelib/analysis/acsetp.c

@@ -5,11 +5,13 @@ Author: 1985 Thomas L. Quarles
 
 #include "ngspice.h"
 #include <stdio.h>
+
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "acdefs.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/cktaskaq.c

@@ -11,6 +11,7 @@ Author: 1985 Thomas L. Quarles
 #include "ifsim.h"
 #include "iferrmsg.h"
 
+#include "analysis.h"
 
 extern SPICEanalysis *analInfo[];
 

src/spicelib/analysis/cktdojob.c

@@ -10,9 +10,9 @@ Modified: 2000 AlansFixes
 #include "sperror.h"
 #include "trandefs.h"
 
+#include "analysis.h"
 
 extern SPICEanalysis *analInfo[];
-extern int ANALmaxnum;
 
 int
 CKTdoJob(void *inCkt, int reset, void *inTask)
@@ -22,6 +22,7 @@ CKTdoJob(void *inCkt, int reset, void *inTask)
     JOB		*job;
     double	startTime;
     int		error, i, error2;
+    int ANALmaxnum;
 
 #ifdef WANT_SENSE2
     int		senflag;
@@ -36,6 +37,8 @@ CKTdoJob(void *inCkt, int reset, void *inTask)
     }
 #endif
 
+    ANALmaxnum = spice_num_analysis();
+
     startTime = (*(SPfrontEnd->IFseconds))( );
 
     ckt->CKTtemp  = task->TSKtemp;

src/spicelib/analysis/cktnewan.c

@@ -5,11 +5,14 @@ Author: 1985 Thomas L. Quarles
 
 #include "ngspice.h"
 #include <stdio.h>
+
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
+#include <cktdefs.h>
 
+#include "analysis.h"
 
 extern SPICEanalysis *analInfo[];
 

src/spicelib/analysis/cktsetap.c

@@ -11,6 +11,7 @@ Author: 1985 Thomas L. Quarles
 #include "iferrmsg.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
 
 extern SPICEanalysis *analInfo[];
 

src/spicelib/analysis/cktsopt.c

@@ -19,6 +19,7 @@ Modified: 2000 AlansFixes
 #include "cktdefs.h"
 #include "sperror.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int

src/spicelib/analysis/ckttroub.c

@@ -11,6 +11,7 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "isrc/isrcdefs.h"
 #include "jobdefs.h"
 
+#include "analysis.h"
 
 extern SPICEdev *DEVices[];
 extern SPICEanalysis *analInfo[];

src/spicelib/analysis/dcosetp.c

@@ -11,6 +11,8 @@ Author: 1985 Thomas L. Quarles
 #include "opdefs.h"
 
 
+#include "analysis.h"
+
 /* ARGSUSED */
 int 
 DCOsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value)

src/spicelib/analysis/dctsetp.c

@@ -10,6 +10,7 @@ Author: 1985 Thomas L. Quarles
 #include "trcvdefs.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/dsetparm.c

@@ -10,6 +10,7 @@ Author: 1988 Jaijeet S Roychowdhury
 #include "cktdefs.h"
 #include "distodef.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/nsetparm.c

@@ -10,6 +10,7 @@ Author: 1987 Gary W. Ng
 #include "iferrmsg.h"
 #include "noisedef.h"
 
+#include "analysis.h"
 
 int 
 NsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value)

src/spicelib/analysis/pzsetp.c

@@ -10,6 +10,7 @@ Author: 1985 Thomas L. Quarles
 #include "pzdefs.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/senssetp.c

@@ -9,6 +9,7 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 #include "cktdefs.h"
 #include "sensdefs.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/tfsetp.c

@@ -10,6 +10,7 @@ Author: 1985 Thomas L. Quarles
 #include "tfdefs.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
 
 /* ARGSUSED */
 int 

src/spicelib/analysis/transetp.c

@@ -10,6 +10,8 @@ Author: 1985 Thomas L. Quarles
 #include "trandefs.h"
 #include "cktdefs.h"
 
+#include "analysis.h"
+
 /* ARGSUSED */
 int 
 TRANsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value)

src/spicelib/devices/bjt/bjtdset.h

@@ -1,6 +1,6 @@
 #ifndef __BJTDSET_H
 #define __BJTDSET_H
 
-int BJTdSetup(BJTmodel *inModel, CKTcircuit *ckt);
+int BJTdSetup(GENmodel *inModel, CKTcircuit *ckt);
 
 #endif

src/spicelib/devices/bjt/bjtext.h

@@ -3,8 +3,10 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 Modified: 2000 AnalsFixes
 **********/
+#ifndef __BJTEXT_H
+#define __BJTEXT_H
+
 
-#ifdef __STDC__
 extern int BJTacLoad(GENmodel *,CKTcircuit*);
 extern int BJTask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BJTconvTest(GENmodel*,CKTcircuit*);
@@ -31,29 +33,4 @@ extern int BJTnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 
 extern int BJTdSetup(GENmodel*, register CKTcircuit*);
 
-#else /* stdc */
-extern int BJTacLoad();
-extern int BJTask();
-extern int BJTconvTest();
-extern int BJTdelete();
-extern void BJTdestroy();
-extern int BJTgetic();
-extern int BJTload();
-extern int BJTmAsk();
-extern int BJTmDelete();
-extern int BJTmParam();
-extern int BJTparam();
-extern int BJTpzLoad();
-extern int BJTsAcLoad();
-extern int BJTsLoad();
-extern void BJTsPrint();
-extern int BJTsSetup();
-extern int BJTsUpdate();
-extern int BJTsetup();
-extern int BJTunsetup();
-extern int BJTtemp();
-extern int BJTtrunc();
-extern int BJTdisto();
-extern int BJTnoise();
-#endif /* stdc */
-
+#endif

src/spicelib/devices/bjt/bjtsetup.c

@@ -149,11 +149,12 @@ BJTsetup(matrix,inModel,ckt,states)
         /* loop through all the instances of the model */
         for (here = model->BJTinstances; here != NULL ;
                 here=here->BJTnextInstance) {
-	    if (here->BJTowner != ARCHme) goto matrixpointers;
-	    
-	       CKTnode *tmpNode;
-            IFuid tmpName;
+	    CKTnode *tmpNode;
+	    IFuid tmpName;
             
+	    if (here->BJTowner != ARCHme)
+		goto matrixpointers;
+	    
             if(!here->BJTareaGiven) {
                 here->BJTarea = 1;
             }

src/spicelib/devices/bsim2/b2set.c

@@ -492,16 +492,19 @@ B2setup(matrix,inModel,ckt,states)
                     (here->B2drainSquares != 0.0 ) &&
                     (here->B2dNodePrime == 0) ) {
                 error = CKTmkVolt(ckt,&tmp,here->B2name,"drain");
-                if(error) return(error);
+               if(error) return(error);
                 here->B2dNodePrime = tmp->number;
                  if (ckt->CKTcopyNodesets) {
-                  if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
-                     if (tmpNode->nsGiven) {
-                       tmp->nodeset=tmpNode->nodeset; 
-                       tmp->nsGiven=tmpNode->nsGiven; 
-                     }
-                  }
-                }
+		     CKTnode *tmpNode;
+		     IFuid tmpName;
+            
+		     if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
+			 if (tmpNode->nsGiven) {
+			     tmp->nodeset=tmpNode->nodeset; 
+			     tmp->nsGiven=tmpNode->nsGiven; 
+			 }
+		     }
+		 }
             } else {
                     here->B2dNodePrime = here->B2dNode;
             }
@@ -512,14 +515,18 @@ B2setup(matrix,inModel,ckt,states)
                     (here->B2sNodePrime == 0) ) {
                 if(here->B2sNodePrime == 0) {
                     error = CKTmkVolt(ckt,&tmp,here->B2name,"source");
-                    if(error) return(error);
+                    if(error)
+			return(error);
                     here->B2sNodePrime = tmp->number;
                     if (ckt->CKTcopyNodesets) {
-                     if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
-                     if (tmpNode->nsGiven) {
-                       tmp->nodeset=tmpNode->nodeset; 
-                       tmp->nsGiven=tmpNode->nsGiven; 
-                     }
+			CKTnode *tmpNode;
+			IFuid tmpName;
+			
+			if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
+			    if (tmpNode->nsGiven) {
+				tmp->nodeset=tmpNode->nodeset; 
+				tmp->nsGiven=tmpNode->nsGiven; 
+			    }
                   }
                 }
                 }

src/spicelib/devices/bsim3/b3acld.c

@@ -15,325 +15,317 @@ File: b3acld.c
 
 
 int
-BSIM3acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM3acLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
-BSIM3model *model = (BSIM3model*)inModel;
-BSIM3instance *here;
-double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
-double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
-double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb, omega;
-double GSoverlapCap, GDoverlapCap, GBoverlapCap, FwdSum, RevSum, Gm, Gmbs;
-double dxpart, sxpart, xgtg, xgtd, xgts, xgtb, xcqgb, xcqdb, xcqsb, xcqbb;
-double gbspsp, gbbdp, gbbsp, gbspg, gbspb;
-double gbspdp, gbdpdp, gbdpg, gbdpb, gbdpsp;
-double ddxpart_dVd, ddxpart_dVg, ddxpart_dVb, ddxpart_dVs;
-double dsxpart_dVd, dsxpart_dVg, dsxpart_dVb, dsxpart_dVs;
-double T1, CoxWL, qcheq, Cdg, Cdd, Cds, Csg, Csd, Css;
-double ScalingFactor = 1.0e-9;
-
+    BSIM3model *model = (BSIM3model*)inModel;
+    BSIM3instance *here;
+    double xcggb, xcgdb, xcgsb, xcbgb, xcbdb, xcbsb, xcddb, xcssb, xcdgb;
+    double gdpr, gspr, gds, gbd, gbs, capbd, capbs, xcsgb, xcdsb, xcsdb;
+    double cggb, cgdb, cgsb, cbgb, cbdb, cbsb, cddb, cdgb, cdsb, omega;
+    double GSoverlapCap, GDoverlapCap, GBoverlapCap, FwdSum, RevSum, Gm, Gmbs;
+    double dxpart, sxpart, xgtg, xgtd, xgts, xgtb, xcqgb, xcqdb, xcqsb, xcqbb;
+    double gbspsp, gbbdp, gbbsp, gbspg, gbspb;
+    double gbspdp, gbdpdp, gbdpg, gbdpb, gbdpsp;
+    double ddxpart_dVd, ddxpart_dVg, ddxpart_dVb, ddxpart_dVs;
+    double dsxpart_dVd, dsxpart_dVg, dsxpart_dVb, dsxpart_dVs;
+    double T1, CoxWL, qcheq, Cdg, Cdd, Cds, Csg, Csd, Css;
+    double ScalingFactor = 1.0e-9;
+    double m;
+    
     omega = ckt->CKTomega;
-    for (; model != NULL; model = model->BSIM3nextModel) 
-    {    for (here = model->BSIM3instances; here!= NULL;
-              here = here->BSIM3nextInstance) {    
-	      if (here->BSIM3owner != ARCHme) continue;
-	      if (here->BSIM3mode >= 0) 
-	      {   Gm = here->BSIM3gm;
-                  Gmbs = here->BSIM3gmbs;
-                  FwdSum = Gm + Gmbs;
-                  RevSum = 0.0;
-
-                  gbbdp = -here->BSIM3gbds;
-                  gbbsp = here->BSIM3gbds + here->BSIM3gbgs + here->BSIM3gbbs;
-
-                  gbdpg = here->BSIM3gbgs;
-                  gbdpb = here->BSIM3gbbs;
-                  gbdpdp = here->BSIM3gbds;
-                  gbdpsp = -(gbdpg + gbdpb + gbdpdp);
-
-                  gbspdp = 0.0;
-                  gbspg = 0.0;
-                  gbspb = 0.0;
-                  gbspsp = 0.0;
-
-		  if (here->BSIM3nqsMod == 0)
-                  {   cggb = here->BSIM3cggb;
-                      cgsb = here->BSIM3cgsb;
-                      cgdb = here->BSIM3cgdb;
-
-                      cbgb = here->BSIM3cbgb;
-                      cbsb = here->BSIM3cbsb;
-                      cbdb = here->BSIM3cbdb;
-
-                      cdgb = here->BSIM3cdgb;
-                      cdsb = here->BSIM3cdsb;
-                      cddb = here->BSIM3cddb;
-
-                      xgtg = xgtd = xgts = xgtb = 0.0;
-		      sxpart = 0.6;
-                      dxpart = 0.4;
-		      ddxpart_dVd = ddxpart_dVg = ddxpart_dVb 
-				  = ddxpart_dVs = 0.0;
-		      dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
-				  = dsxpart_dVs = 0.0;
-                  }                  
-                  else
-                  {   cggb = cgdb = cgsb = 0.0;
-                      cbgb = cbdb = cbsb = 0.0;
-                      cdgb = cddb = cdsb = 0.0;
-
-		      xgtg = here->BSIM3gtg;
-                      xgtd = here->BSIM3gtd;
-                      xgts = here->BSIM3gts;
-                      xgtb = here->BSIM3gtb; 
+    for (; model != NULL; model = model->BSIM3nextModel) {
+	for (here = model->BSIM3instances; here!= NULL;
+	     here = here->BSIM3nextInstance) {    
+	    if (here->BSIM3owner != ARCHme)
+		continue;
+	    if (here->BSIM3mode >= 0) {
+		Gm = here->BSIM3gm;
+		Gmbs = here->BSIM3gmbs;
+		FwdSum = Gm + Gmbs;
+		RevSum = 0.0;
+
+		gbbdp = -here->BSIM3gbds;
+		gbbsp = here->BSIM3gbds + here->BSIM3gbgs + here->BSIM3gbbs;
+
+		gbdpg = here->BSIM3gbgs;
+		gbdpb = here->BSIM3gbbs;
+		gbdpdp = here->BSIM3gbds;
+		gbdpsp = -(gbdpg + gbdpb + gbdpdp);
+		
+		gbspdp = 0.0;
+		gbspg = 0.0;
+		gbspb = 0.0;
+		gbspsp = 0.0;
+
+		if (here->BSIM3nqsMod == 0) {
+		    cggb = here->BSIM3cggb;
+		    cgsb = here->BSIM3cgsb;
+		    cgdb = here->BSIM3cgdb;
+
+		    cbgb = here->BSIM3cbgb;
+		    cbsb = here->BSIM3cbsb;
+		    cbdb = here->BSIM3cbdb;
+
+		    cdgb = here->BSIM3cdgb;
+		    cdsb = here->BSIM3cdsb;
+		    cddb = here->BSIM3cddb;
+
+		    xgtg = xgtd = xgts = xgtb = 0.0;
+		    sxpart = 0.6;
+		    dxpart = 0.4;
+		    ddxpart_dVd = ddxpart_dVg = ddxpart_dVb 
+			= ddxpart_dVs = 0.0;
+		    dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
+			= dsxpart_dVs = 0.0;
+		} else {
+		    cggb = cgdb = cgsb = 0.0;
+		    cbgb = cbdb = cbsb = 0.0;
+		    cdgb = cddb = cdsb = 0.0;
+
+		    xgtg = here->BSIM3gtg;
+		    xgtd = here->BSIM3gtd;
+		    xgts = here->BSIM3gts;
+		    xgtb = here->BSIM3gtb; 
  
-                      xcqgb = here->BSIM3cqgb * omega;
-                      xcqdb = here->BSIM3cqdb * omega;
-                      xcqsb = here->BSIM3cqsb * omega;
-                      xcqbb = here->BSIM3cqbb * omega;
-
-		      CoxWL = model->BSIM3cox * here->pParam->BSIM3weffCV
-                            * here->pParam->BSIM3leffCV;
-		      qcheq = -(here->BSIM3qgate + here->BSIM3qbulk);
-		      if (fabs(qcheq) <= 1.0e-5 * CoxWL)
-		      {   if (model->BSIM3xpart < 0.5)
-		          {   dxpart = 0.4;
-		          }
-		          else if (model->BSIM3xpart > 0.5)
-		          {   dxpart = 0.0;
-		          }
-		          else
-		          {   dxpart = 0.5;
-		          }
-		          ddxpart_dVd = ddxpart_dVg = ddxpart_dVb
-				      = ddxpart_dVs = 0.0;
-		      }
-		      else
-		      {   dxpart = here->BSIM3qdrn / qcheq;
-		          Cdd = here->BSIM3cddb;
-		          Csd = -(here->BSIM3cgdb + here->BSIM3cddb
-			      + here->BSIM3cbdb);
-		          ddxpart_dVd = (Cdd - dxpart * (Cdd + Csd)) / qcheq;
-		          Cdg = here->BSIM3cdgb;
-		          Csg = -(here->BSIM3cggb + here->BSIM3cdgb
-			      + here->BSIM3cbgb);
-		          ddxpart_dVg = (Cdg - dxpart * (Cdg + Csg)) / qcheq;
-
-		          Cds = here->BSIM3cdsb;
-		          Css = -(here->BSIM3cgsb + here->BSIM3cdsb
-			      + here->BSIM3cbsb);
-		          ddxpart_dVs = (Cds - dxpart * (Cds + Css)) / qcheq;
-
-		          ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg 
-				      + ddxpart_dVs);
-		      }
-		      sxpart = 1.0 - dxpart;
-		      dsxpart_dVd = -ddxpart_dVd;
-		      dsxpart_dVg = -ddxpart_dVg;
-		      dsxpart_dVs = -ddxpart_dVs;
-		      dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg + dsxpart_dVs);
-                  }
-              } 
-              else
-              {   Gm = -here->BSIM3gm;
-                  Gmbs = -here->BSIM3gmbs;
-                  FwdSum = 0.0;
-                  RevSum = -(Gm + Gmbs);
-
-                  gbbsp = -here->BSIM3gbds;
-                  gbbdp = here->BSIM3gbds + here->BSIM3gbgs + here->BSIM3gbbs;
-
-                  gbdpg = 0.0;
-                  gbdpsp = 0.0;
-                  gbdpb = 0.0;
-                  gbdpdp = 0.0;
-
-                  gbspg = here->BSIM3gbgs;
-                  gbspsp = here->BSIM3gbds;
-                  gbspb = here->BSIM3gbbs;
-                  gbspdp = -(gbspg + gbspsp + gbspb);
-
-		  if (here->BSIM3nqsMod == 0)
-                  {   cggb = here->BSIM3cggb;
-                      cgsb = here->BSIM3cgdb;
-                      cgdb = here->BSIM3cgsb;
-
-                      cbgb = here->BSIM3cbgb;
-                      cbsb = here->BSIM3cbdb;
-                      cbdb = here->BSIM3cbsb;
-
-                      cdgb = -(here->BSIM3cdgb + cggb + cbgb);
-                      cdsb = -(here->BSIM3cddb + cgsb + cbsb);
-                      cddb = -(here->BSIM3cdsb + cgdb + cbdb);
-
-                      xgtg = xgtd = xgts = xgtb = 0.0;
-		      sxpart = 0.4;
-                      dxpart = 0.6;
-		      ddxpart_dVd = ddxpart_dVg = ddxpart_dVb 
-				  = ddxpart_dVs = 0.0;
-		      dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
-				  = dsxpart_dVs = 0.0;
-                  }
-                  else
-                  {   cggb = cgdb = cgsb = 0.0;
-                      cbgb = cbdb = cbsb = 0.0;
-                      cdgb = cddb = cdsb = 0.0;
-
-		      xgtg = here->BSIM3gtg;
-                      xgtd = here->BSIM3gts;
-                      xgts = here->BSIM3gtd;
-                      xgtb = here->BSIM3gtb;
-
-                      xcqgb = here->BSIM3cqgb * omega;
-                      xcqdb = here->BSIM3cqsb * omega;
-                      xcqsb = here->BSIM3cqdb * omega;
-                      xcqbb = here->BSIM3cqbb * omega;
-
-		      CoxWL = model->BSIM3cox * here->pParam->BSIM3weffCV
-                            * here->pParam->BSIM3leffCV;
-		      qcheq = -(here->BSIM3qgate + here->BSIM3qbulk);
-		      if (fabs(qcheq) <= 1.0e-5 * CoxWL)
-		      {   if (model->BSIM3xpart < 0.5)
-		          {   sxpart = 0.4;
-		          }
-		          else if (model->BSIM3xpart > 0.5)
-		          {   sxpart = 0.0;
-		          }
-		          else
-		          {   sxpart = 0.5;
-		          }
-		          dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
-				      = dsxpart_dVs = 0.0;
-		      }
-		      else
-		      {   sxpart = here->BSIM3qdrn / qcheq;
-		          Css = here->BSIM3cddb;
-		          Cds = -(here->BSIM3cgdb + here->BSIM3cddb
-			      + here->BSIM3cbdb);
-		          dsxpart_dVs = (Css - sxpart * (Css + Cds)) / qcheq;
-		          Csg = here->BSIM3cdgb;
-		          Cdg = -(here->BSIM3cggb + here->BSIM3cdgb
-			      + here->BSIM3cbgb);
-		          dsxpart_dVg = (Csg - sxpart * (Csg + Cdg)) / qcheq;
-
-		          Csd = here->BSIM3cdsb;
-		          Cdd = -(here->BSIM3cgsb + here->BSIM3cdsb
-			      + here->BSIM3cbsb);
-		          dsxpart_dVd = (Csd - sxpart * (Csd + Cdd)) / qcheq;
-
-		          dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg 
-				      + dsxpart_dVs);
-		      }
-		      dxpart = 1.0 - sxpart;
-		      ddxpart_dVd = -dsxpart_dVd;
-		      ddxpart_dVg = -dsxpart_dVg;
-		      ddxpart_dVs = -dsxpart_dVs;
-		      ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg + ddxpart_dVs);
-                  }
-              }
-
-	      T1 = *(ckt->CKTstate0 + here->BSIM3qdef) * here->BSIM3gtau;
-              gdpr = here->BSIM3drainConductance;
-              gspr = here->BSIM3sourceConductance;
-              gds = here->BSIM3gds;
-              gbd = here->BSIM3gbd;
-              gbs = here->BSIM3gbs;
-              capbd = here->BSIM3capbd;
-              capbs = here->BSIM3capbs;
-
-	      GSoverlapCap = here->BSIM3cgso;
-	      GDoverlapCap = here->BSIM3cgdo;
-	      GBoverlapCap = here->pParam->BSIM3cgbo;
-
-              xcdgb = (cdgb - GDoverlapCap) * omega;
-              xcddb = (cddb + capbd + GDoverlapCap) * omega;
-              xcdsb = cdsb * omega;
-              xcsgb = -(cggb + cbgb + cdgb + GSoverlapCap) * omega;
-              xcsdb = -(cgdb + cbdb + cddb) * omega;
-              xcssb = (capbs + GSoverlapCap - (cgsb + cbsb + cdsb)) * omega;
-              xcggb = (cggb + GDoverlapCap + GSoverlapCap + GBoverlapCap)
-		    * omega;
-              xcgdb = (cgdb - GDoverlapCap ) * omega;
-              xcgsb = (cgsb - GSoverlapCap) * omega;
-              xcbgb = (cbgb - GBoverlapCap) * omega;
-              xcbdb = (cbdb - capbd ) * omega;
-              xcbsb = (cbsb - capbs ) * omega;
+		    xcqgb = here->BSIM3cqgb * omega;
+		    xcqdb = here->BSIM3cqdb * omega;
+		    xcqsb = here->BSIM3cqsb * omega;
+		    xcqbb = here->BSIM3cqbb * omega;
+
+		    CoxWL = model->BSIM3cox * here->pParam->BSIM3weffCV
+			* here->pParam->BSIM3leffCV;
+		    qcheq = -(here->BSIM3qgate + here->BSIM3qbulk);
+		    if (fabs(qcheq) <= 1.0e-5 * CoxWL) {
+			if (model->BSIM3xpart < 0.5) {
+			    dxpart = 0.4;
+			}
+			else if (model->BSIM3xpart > 0.5) {
+			    dxpart = 0.0;
+			} else {
+			    dxpart = 0.5;
+			}
+			ddxpart_dVd = ddxpart_dVg = ddxpart_dVb
+			    = ddxpart_dVs = 0.0;
+		    } else {
+			dxpart = here->BSIM3qdrn / qcheq;
+			Cdd = here->BSIM3cddb;
+			Csd = -(here->BSIM3cgdb + here->BSIM3cddb
+				+ here->BSIM3cbdb);
+			ddxpart_dVd = (Cdd - dxpart * (Cdd + Csd)) / qcheq;
+			Cdg = here->BSIM3cdgb;
+			Csg = -(here->BSIM3cggb + here->BSIM3cdgb
+				+ here->BSIM3cbgb);
+			ddxpart_dVg = (Cdg - dxpart * (Cdg + Csg)) / qcheq;
+
+			Cds = here->BSIM3cdsb;
+			Css = -(here->BSIM3cgsb + here->BSIM3cdsb
+				+ here->BSIM3cbsb);
+			ddxpart_dVs = (Cds - dxpart * (Cds + Css)) / qcheq;
+
+			ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg 
+					+ ddxpart_dVs);
+		    }
+		    sxpart = 1.0 - dxpart;
+		    dsxpart_dVd = -ddxpart_dVd;
+		    dsxpart_dVg = -ddxpart_dVg;
+		    dsxpart_dVs = -ddxpart_dVs;
+		    dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg + dsxpart_dVs);
+		}
+	    } else {
+		Gm = -here->BSIM3gm;
+		Gmbs = -here->BSIM3gmbs;
+		FwdSum = 0.0;
+		RevSum = -(Gm + Gmbs);
+
+		gbbsp = -here->BSIM3gbds;
+		gbbdp = here->BSIM3gbds + here->BSIM3gbgs + here->BSIM3gbbs;
+
+		gbdpg = 0.0;
+		gbdpsp = 0.0;
+		gbdpb = 0.0;
+		gbdpdp = 0.0;
+
+		gbspg = here->BSIM3gbgs;
+		gbspsp = here->BSIM3gbds;
+		gbspb = here->BSIM3gbbs;
+		gbspdp = -(gbspg + gbspsp + gbspb);
+
+		if (here->BSIM3nqsMod == 0) {
+		    cggb = here->BSIM3cggb;
+		    cgsb = here->BSIM3cgdb;
+		    cgdb = here->BSIM3cgsb;
+
+		    cbgb = here->BSIM3cbgb;
+		    cbsb = here->BSIM3cbdb;
+		    cbdb = here->BSIM3cbsb;
+
+		    cdgb = -(here->BSIM3cdgb + cggb + cbgb);
+		    cdsb = -(here->BSIM3cddb + cgsb + cbsb);
+		    cddb = -(here->BSIM3cdsb + cgdb + cbdb);
+
+		    xgtg = xgtd = xgts = xgtb = 0.0;
+		    sxpart = 0.4;
+		    dxpart = 0.6;
+		    ddxpart_dVd = ddxpart_dVg = ddxpart_dVb 
+			= ddxpart_dVs = 0.0;
+		    dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
+			= dsxpart_dVs = 0.0;
+		} else {
+		    cggb = cgdb = cgsb = 0.0;
+		    cbgb = cbdb = cbsb = 0.0;
+		    cdgb = cddb = cdsb = 0.0;
+
+		    xgtg = here->BSIM3gtg;
+		    xgtd = here->BSIM3gts;
+		    xgts = here->BSIM3gtd;
+		    xgtb = here->BSIM3gtb;
+
+		    xcqgb = here->BSIM3cqgb * omega;
+		    xcqdb = here->BSIM3cqsb * omega;
+		    xcqsb = here->BSIM3cqdb * omega;
+		    xcqbb = here->BSIM3cqbb * omega;
+
+		    CoxWL = model->BSIM3cox * here->pParam->BSIM3weffCV
+			* here->pParam->BSIM3leffCV;
+		    qcheq = -(here->BSIM3qgate + here->BSIM3qbulk);
+		    if (fabs(qcheq) <= 1.0e-5 * CoxWL) {
+			if (model->BSIM3xpart < 0.5) {
+			    sxpart = 0.4;
+			} else if (model->BSIM3xpart > 0.5) {
+			    sxpart = 0.0;
+			} else {
+			    sxpart = 0.5;
+			}
+			dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
+			    = dsxpart_dVs = 0.0;
+		    } else {
+			sxpart = here->BSIM3qdrn / qcheq;
+			Css = here->BSIM3cddb;
+			Cds = -(here->BSIM3cgdb + here->BSIM3cddb
+				+ here->BSIM3cbdb);
+			dsxpart_dVs = (Css - sxpart * (Css + Cds)) / qcheq;
+			Csg = here->BSIM3cdgb;
+			Cdg = -(here->BSIM3cggb + here->BSIM3cdgb
+				+ here->BSIM3cbgb);
+			dsxpart_dVg = (Csg - sxpart * (Csg + Cdg)) / qcheq;
+
+			Csd = here->BSIM3cdsb;
+			Cdd = -(here->BSIM3cgsb + here->BSIM3cdsb
+				+ here->BSIM3cbsb);
+			dsxpart_dVd = (Csd - sxpart * (Csd + Cdd)) / qcheq;
+
+			dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg 
+					+ dsxpart_dVs);
+		    }
+		    dxpart = 1.0 - sxpart;
+		    ddxpart_dVd = -dsxpart_dVd;
+		    ddxpart_dVg = -dsxpart_dVg;
+		    ddxpart_dVs = -dsxpart_dVs;
+		    ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg + ddxpart_dVs);
+		}
+	    }
+
+	    T1 = *(ckt->CKTstate0 + here->BSIM3qdef) * here->BSIM3gtau;
+	    gdpr = here->BSIM3drainConductance;
+	    gspr = here->BSIM3sourceConductance;
+	    gds = here->BSIM3gds;
+	    gbd = here->BSIM3gbd;
+	    gbs = here->BSIM3gbs;
+	    capbd = here->BSIM3capbd;
+	    capbs = here->BSIM3capbs;
+
+	    GSoverlapCap = here->BSIM3cgso;
+	    GDoverlapCap = here->BSIM3cgdo;
+	    GBoverlapCap = here->pParam->BSIM3cgbo;
+
+	    xcdgb = (cdgb - GDoverlapCap) * omega;
+	    xcddb = (cddb + capbd + GDoverlapCap) * omega;
+	    xcdsb = cdsb * omega;
+	    xcsgb = -(cggb + cbgb + cdgb + GSoverlapCap) * omega;
+	    xcsdb = -(cgdb + cbdb + cddb) * omega;
+	    xcssb = (capbs + GSoverlapCap - (cgsb + cbsb + cdsb)) * omega;
+	    xcggb = (cggb + GDoverlapCap + GSoverlapCap + GBoverlapCap)
+		* omega;
+	    xcgdb = (cgdb - GDoverlapCap ) * omega;
+	    xcgsb = (cgsb - GSoverlapCap) * omega;
+	    xcbgb = (cbgb - GBoverlapCap) * omega;
+	    xcbdb = (cbdb - capbd ) * omega;
+	    xcbsb = (cbsb - capbs ) * omega;
 
               
-              m = here->BSIM3m;
-
-              *(here->BSIM3GgPtr +1) += m * xcggb;
-              *(here->BSIM3BbPtr +1) -= xcbgb + xcbdb + xcbsb;
-              *(here->BSIM3DPdpPtr +1) += m * xcddb;
-              *(here->BSIM3SPspPtr +1) += m * xcssb;
-              *(here->BSIM3GbPtr +1) -= xcggb + xcgdb + xcgsb;
-              *(here->BSIM3GdpPtr +1) += m * xcgdb;
-              *(here->BSIM3GspPtr +1) += m * xcgsb;
-              *(here->BSIM3BgPtr +1) += m * xcbgb;
-              *(here->BSIM3BdpPtr +1) += m * xcbdb;
-              *(here->BSIM3BspPtr +1) += m * xcbsb;
-              *(here->BSIM3DPgPtr +1) += m * xcdgb;
-              *(here->BSIM3DPbPtr +1) -= xcdgb + xcddb + xcdsb;
-              *(here->BSIM3DPspPtr +1) += m * xcdsb;
-              *(here->BSIM3SPgPtr +1) += m * xcsgb;
-              *(here->BSIM3SPbPtr +1) -= xcsgb + xcsdb + xcssb;
-              *(here->BSIM3SPdpPtr +1) += m * xcsdb;
-
-              *(here->BSIM3DdPtr) += m * gdpr;
-              *(here->BSIM3SsPtr) += m * gspr;
-              *(here->BSIM3BbPtr) += m * (gbd + gbs - here->BSIM3gbbs);
-              *(here->BSIM3DPdpPtr) += m * (gdpr + gds + gbd + RevSum 
-                                    +dxpart * xgtd + T1 * ddxpart_dVd + gbdpdp);
-              *(here->BSIM3SPspPtr) += m * (gspr + gds + gbs + FwdSum 
-                                    +sxpart * xgts + T1 * dsxpart_dVs + gbspsp);
-
-              *(here->BSIM3DdpPtr) -= m * gdpr;
-              *(here->BSIM3SspPtr) -= m * gspr;
-
-              *(here->BSIM3BgPtr) -= m * here->BSIM3gbgs;
-              *(here->BSIM3BdpPtr) -= m * (gbd - gbbdp);
-              *(here->BSIM3BspPtr) -= m * (gbs - gbbsp);
-
-              *(here->BSIM3DPdPtr) -= m * gdpr;
-              *(here->BSIM3DPgPtr) += m * (Gm + dxpart * xgtg + T1 * ddxpart_dVg
-				   + gbdpg);
-              *(here->BSIM3DPbPtr) -= m * (gbd - Gmbs - dxpart * xgtb
-				   - T1 * ddxpart_dVb - gbdpb);
-              *(here->BSIM3DPspPtr) -= m * (gds + FwdSum - dxpart * xgts 
-				    - T1 * ddxpart_dVs - gbdpsp);
-
-              *(here->BSIM3SPgPtr) -= m * (Gm - sxpart * xgtg - T1 * dsxpart_dVg
-				   - gbspg);
-              *(here->BSIM3SPsPtr) -= m * gspr;
-              *(here->BSIM3SPbPtr) -= m * (gbs + Gmbs - sxpart * xgtb
-				   - T1 * dsxpart_dVb - gbspb);
-              *(here->BSIM3SPdpPtr) -= m * (gds + RevSum - sxpart * xgtd 
-				    - T1 * dsxpart_dVd - gbspdp);
-
-              *(here->BSIM3GgPtr) -= m * xgtg;
-              *(here->BSIM3GbPtr) -= m * xgtb;
-              *(here->BSIM3GdpPtr) -= m * xgtd;
-              *(here->BSIM3GspPtr) -= m * xgts;
-
-              if (here->BSIM3nqsMod)
-              {   *(here->BSIM3QqPtr +1) += m * (omega * ScalingFactor);
-                  *(here->BSIM3QgPtr +1) -= m * xcqgb;
-                  *(here->BSIM3QdpPtr +1) -= m * xcqdb;
-                  *(here->BSIM3QspPtr +1) -= m * xcqsb;
-                  *(here->BSIM3QbPtr +1) -= m * xcqbb;
-
-                  *(here->BSIM3QqPtr) += m * here->BSIM3gtau;
-
-                  *(here->BSIM3DPqPtr) += m * (dxpart * here->BSIM3gtau);
-                  *(here->BSIM3SPqPtr) += m * (sxpart * here->BSIM3gtau);
-                  *(here->BSIM3GqPtr) -=  m * here->BSIM3gtau;
-
-                  *(here->BSIM3QgPtr) +=  m * xgtg;
-                  *(here->BSIM3QdpPtr) += m * xgtd;
-                  *(here->BSIM3QspPtr) += m * xgts;
-                  *(here->BSIM3QbPtr) += m * xgtb;
-              }
+	    m = here->BSIM3m;
+
+	    *(here->BSIM3GgPtr +1) += m * xcggb;
+	    *(here->BSIM3BbPtr +1) -= xcbgb + xcbdb + xcbsb;
+	    *(here->BSIM3DPdpPtr +1) += m * xcddb;
+	    *(here->BSIM3SPspPtr +1) += m * xcssb;
+	    *(here->BSIM3GbPtr +1) -= xcggb + xcgdb + xcgsb;
+	    *(here->BSIM3GdpPtr +1) += m * xcgdb;
+	    *(here->BSIM3GspPtr +1) += m * xcgsb;
+	    *(here->BSIM3BgPtr +1) += m * xcbgb;
+	    *(here->BSIM3BdpPtr +1) += m * xcbdb;
+	    *(here->BSIM3BspPtr +1) += m * xcbsb;
+	    *(here->BSIM3DPgPtr +1) += m * xcdgb;
+	    *(here->BSIM3DPbPtr +1) -= xcdgb + xcddb + xcdsb;
+	    *(here->BSIM3DPspPtr +1) += m * xcdsb;
+	    *(here->BSIM3SPgPtr +1) += m * xcsgb;
+	    *(here->BSIM3SPbPtr +1) -= xcsgb + xcsdb + xcssb;
+	    *(here->BSIM3SPdpPtr +1) += m * xcsdb;
+
+	    *(here->BSIM3DdPtr) += m * gdpr;
+	    *(here->BSIM3SsPtr) += m * gspr;
+	    *(here->BSIM3BbPtr) += m * (gbd + gbs - here->BSIM3gbbs);
+	    *(here->BSIM3DPdpPtr) += m * (gdpr + gds + gbd + RevSum 
+					  +dxpart * xgtd + T1 * ddxpart_dVd + gbdpdp);
+	    *(here->BSIM3SPspPtr) += m * (gspr + gds + gbs + FwdSum 
+					  +sxpart * xgts + T1 * dsxpart_dVs + gbspsp);
+
+	    *(here->BSIM3DdpPtr) -= m * gdpr;
+	    *(here->BSIM3SspPtr) -= m * gspr;
+
+	    *(here->BSIM3BgPtr) -= m * here->BSIM3gbgs;
+	    *(here->BSIM3BdpPtr) -= m * (gbd - gbbdp);
+	    *(here->BSIM3BspPtr) -= m * (gbs - gbbsp);
+
+	    *(here->BSIM3DPdPtr) -= m * gdpr;
+	    *(here->BSIM3DPgPtr) += m * (Gm + dxpart * xgtg + T1 * ddxpart_dVg
+					 + gbdpg);
+	    *(here->BSIM3DPbPtr) -= m * (gbd - Gmbs - dxpart * xgtb
+					 - T1 * ddxpart_dVb - gbdpb);
+	    *(here->BSIM3DPspPtr) -= m * (gds + FwdSum - dxpart * xgts 
+					  - T1 * ddxpart_dVs - gbdpsp);
+
+	    *(here->BSIM3SPgPtr) -= m * (Gm - sxpart * xgtg - T1 * dsxpart_dVg
+					 - gbspg);
+	    *(here->BSIM3SPsPtr) -= m * gspr;
+	    *(here->BSIM3SPbPtr) -= m * (gbs + Gmbs - sxpart * xgtb
+					 - T1 * dsxpart_dVb - gbspb);
+	    *(here->BSIM3SPdpPtr) -= m * (gds + RevSum - sxpart * xgtd 
+					  - T1 * dsxpart_dVd - gbspdp);
+
+	    *(here->BSIM3GgPtr) -= m * xgtg;
+	    *(here->BSIM3GbPtr) -= m * xgtb;
+	    *(here->BSIM3GdpPtr) -= m * xgtd;
+	    *(here->BSIM3GspPtr) -= m * xgts;
+
+	    if (here->BSIM3nqsMod) {
+		*(here->BSIM3QqPtr +1) += m * (omega * ScalingFactor);
+		*(here->BSIM3QgPtr +1) -= m * xcqgb;
+		*(here->BSIM3QdpPtr +1) -= m * xcqdb;
+		*(here->BSIM3QspPtr +1) -= m * xcqsb;
+		*(here->BSIM3QbPtr +1) -= m * xcqbb;
+
+		*(here->BSIM3QqPtr) += m * here->BSIM3gtau;
+
+		*(here->BSIM3DPqPtr) += m * (dxpart * here->BSIM3gtau);
+		*(here->BSIM3SPqPtr) += m * (sxpart * here->BSIM3gtau);
+		*(here->BSIM3GqPtr) -=  m * here->BSIM3gtau;
+
+		*(here->BSIM3QgPtr) +=  m * xgtg;
+		*(here->BSIM3QdpPtr) += m * xgtd;
+		*(here->BSIM3QspPtr) += m * xgts;
+		*(here->BSIM3QbPtr) += m * xgtb;
+	    }
         }
     }
     return(OK);

src/spicelib/devices/bsim3/b3set.c

@@ -851,9 +851,6 @@ CKTnode *tmp;
 	    if (here->BSIM3owner == ARCHme) {
 	    /* allocate a chunk of the state vector */
             
-            CKTnode *tmpNode;
-            IFuid tmpName;
-            
             here->BSIM3states = *states;
             *states += BSIM3numStates;
 	    }
@@ -891,10 +888,14 @@ CKTnode *tmp;
             if ((model->BSIM3sheetResistance > 0.0) && 
                 (here->BSIM3drainSquares > 0.0 ) &&
                 (here->BSIM3dNodePrime == 0))
-	    {   error = CKTmkVolt(ckt,&tmp,here->BSIM3name,"drain");
+	    {
+		    error = CKTmkVolt(ckt,&tmp,here->BSIM3name,"drain");
                 if(error) return(error);
                 here->BSIM3dNodePrime = tmp->number;
                  if (ckt->CKTcopyNodesets) {
+            CKTnode *tmpNode;
+            IFuid tmpName;
+            
                   if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 
@@ -915,6 +916,9 @@ CKTnode *tmp;
                 if(error) return(error);
                 here->BSIM3sNodePrime = tmp->number;
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 

src/spicelib/devices/bsim3/bsim3def.h

@@ -21,7 +21,6 @@ typedef struct sBSIM3instance
     struct sBSIM3instance *BSIM3nextInstance;
     IFuid BSIM3name;
     int BSIM3owner;   /* number of owner process */
-    int BSIM3states;  /* index into state table for this device */
     int BSIM3dNode;
     int BSIM3gNode;
     int BSIM3sNode;
@@ -44,6 +43,7 @@ typedef struct sBSIM3instance
 
     double BSIM3l;
     double BSIM3w;
+    double BSIM3m;
     double BSIM3drainArea;
     double BSIM3sourceArea;
     double BSIM3drainSquares;
@@ -154,7 +154,7 @@ typedef struct sBSIM3instance
     double *BSIM3SPqPtr;
     double *BSIM3BqPtr;
 
-int BSIM3states;     /* index into state table for this device */
+    int BSIM3states;     /* index into state table for this device */
 #define BSIM3vbd BSIM3states+ 0
 #define BSIM3vbs BSIM3states+ 1
 #define BSIM3vgs BSIM3states+ 2

src/spicelib/devices/csw/cswtrunc.c

@@ -6,22 +6,19 @@ Modified: 2000 AlansFixes
 /*
  */
 
-#include "spice.h"
+#include "ngspice.h"
 #include <stdio.h>
 #include "cktdefs.h"
-#include "csw\cswdefs.h"
 #include "sperror.h"
 #include "suffix.h"
 
+#include "cswdefs.h"
 
 int
-CSWtrunc(inModel,ckt,timeStep)
-    GENmodel *inModel;
-    register CKTcircuit *ckt;
-    register double *timeStep;
+CSWtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
-    register CSWmodel *model = (CSWmodel*)inModel;
-    register CSWinstance *here;
+    CSWmodel *model = (CSWmodel*)inModel;
+    CSWinstance *here;
 
     double   lastChange, maxChange, maxStep, ref;
 

src/spicelib/devices/dio/diodset.c

@@ -11,14 +11,11 @@ Author:  1988 Jaijeet S Roychowdhury
 #include "sperror.h"
 #include "suffix.h"
 
-int
-DIOdSetup(model,ckt)
 
-DIOmodel *model;
-CKTcircuit *ckt;
-/* actually load the current resistance value into the 
-         * sparse matrix previously provided 
-         */
+/* actually load the current resistance value into the sparse matrix
+ * previously provided */
+int
+DIOdSetup(DIOmodel *model, CKTcircuit *ckt)
 {
 	DIOinstance *here;
 	double arg;

src/spicelib/devices/dio/dioinit.c

@@ -1,7 +1,9 @@
 #include <config.h>
 
 #include <devdefs.h>
+#include <cktdefs.h>
 
+#include "diodefs.h"
 #include "dioitf.h"
 #include "dioext.h"
 #include "dioinit.h"

src/spicelib/devices/jfet/jfetset.c

@@ -96,9 +96,6 @@ JFETsetup(matrix,inModel,ckt,states)
                 here=here->JFETnextInstance) {
 	    if (here->JFETowner != ARCHme) goto matrixpointers;
             
-            CKTnode *tmpNode;
-            IFuid tmpName;
-            
             if(!here->JFETareaGiven) {
                 here->JFETarea = 1;
             }
@@ -112,6 +109,9 @@ matrixpointers:
                 here->JFETsourcePrimeNode = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+            
                   if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 
@@ -129,6 +129,9 @@ matrixpointers:
                 here->JFETdrainPrimeNode = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 

src/spicelib/devices/mes/messetup.c

@@ -82,9 +82,6 @@ MESsetup(matrix,inModel,ckt,states)
                 here=here->MESnextInstance) {
 	    if (here->MESowner != ARCHme) goto matrixpointers;
             
-            CKTnode *tmpNode;
-            IFuid tmpName;
-            
             if(!here->MESareaGiven) {
                 here->MESarea = 1;
             }
@@ -98,6 +95,9 @@ matrixpointers:
                 here->MESsourcePrimeNode = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 
@@ -115,6 +115,9 @@ matrixpointers:
                 here->MESdrainPrimeNode = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 

src/spicelib/devices/mos1/mos1ask.c

@@ -196,7 +196,7 @@ MOS1ask(ckt,inst,which,value,select)
             return(OK);
         case MOS1_CAPGD:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS1capgd);
-            * add overlap capacitance */
+            /* add overlap capacitance */
             value->rValue += (here->sMOS1modPtr->MOS1gateSourceOverlapCapFactor)
                              * here->MOS1m
                              * (here->MOS1w);

src/spicelib/devices/mos1/mos1set.c

@@ -105,9 +105,6 @@ MOS1setup(matrix,inModel,ckt,states)
 		}
 	    }
 
-            CKTnode *tmpNode;
-            IFuid tmpName;
-
             if(!here->MOS1drainPerimiterGiven) {
                 here->MOS1drainPerimiter = 0;
             }
@@ -145,6 +142,9 @@ MOS1setup(matrix,inModel,ckt,states)
                 here->MOS1dNodePrime = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 
@@ -166,6 +166,9 @@ MOS1setup(matrix,inModel,ckt,states)
                 here->MOS1sNodePrime = tmp->number;
                 
                 if (ckt->CKTcopyNodesets) {
+		    CKTnode *tmpNode;
+		    IFuid tmpName;
+
                   if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
                      if (tmpNode->nsGiven) {
                        tmp->nodeset=tmpNode->nodeset; 

src/spicelib/devices/mos1/mos1temp.c

@@ -311,7 +311,6 @@ MOS1temp(inModel,ckt)
             } else if (model->MOS1sheetResistanceGiven) {
                 if ((model->MOS1sheetResistance != 0) &&
                                    (here->MOS1sourceSquares != 0)) {
-#else
                     here->MOS1sourceConductance = 
                         here->MOS1m /
                           (model->MOS1sheetResistance*here->MOS1sourceSquares);

src/spicelib/devices/mos6/mos6set.c

@@ -116,11 +116,11 @@ MOS6setup(matrix,inModel,ckt,states)
         /* loop through all the instances of the model */
         for (here = model->MOS6instances; here != NULL ;
                 here=here->MOS6nextInstance) {
-	    if (here->MOS6owner != ARCHme) goto matrixpointers;
-
             CKTnode *tmpNode;
             IFuid tmpName;
             
+	    if (here->MOS6owner != ARCHme) goto matrixpointers;
+
             if(!here->MOS6drainPerimiterGiven) {
                 here->MOS6drainPerimiter = 0;
             }

src/spicelib/devices/sw/swtrunc.c

@@ -6,13 +6,13 @@ Modified: 2000 AlansFixes
 /*
  */
 
-#include "spice.h"
+#include "ngspice.h"
 #include <stdio.h>
 #include "cktdefs.h"
-#include "sw\swdefs.h"
 #include "sperror.h"
 #include "suffix.h"
 
+#include "swdefs.h"
 
 int
 SWtrunc(inModel,ckt,timeStep)

src/spicelib/parser/inppas2.c

@@ -10,9 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 #include "inppas2.h"
 
-/* pass 2 - Scan through the lines.  ".model" cards have processed
- *  in pass1 and are ignored here.
- */
+/* pass 2 - Scan through the lines.  ".model" cards have processed in
+ *  pass1 and are ignored here.  */
 
 void INPpas2(void *ckt, card * data, INPtables * tab, void *task)
 {
@@ -45,103 +44,133 @@ void INPpas2(void *ckt, card * data, INPtables * tab, void *task)
 
 	switch (c) {
 
-	case ' ':		/* blank line (space leading) */
-	case '\t':		/* blank line (tab leading) */
+	case ' ':
+	    /* blank line (space leading) */
+	case '\t':
+	    /* blank line (tab leading) */
 	    break;
 
-	case 'R':		/* Rname <node> <node> [<val>][<mname>][w=<val>][l=<val>] */
+	case 'R':
+	    /* Rname <node> <node> [<val>][<mname>][w=<val>][l=<val>] */
 	    INP2R(ckt, tab, current);
 	    break;
-	case 'C':		/* Cname <node> <node> <val> [IC=<val>] */
+
+	case 'C':
+	    /* Cname <node> <node> <val> [IC=<val>] */
 	    INP2C(ckt, tab, current);
 	    break;
-	case 'L':		/* Lname <node> <node> <val> [IC=<val>] */
+
+	case 'L':
+	    /* Lname <node> <node> <val> [IC=<val>] */
 	    INP2L(ckt, tab, current);
 	    break;
-	case 'G':		/* Gname <node> <node> <node> <node> <val> */
+
+	case 'G':
+	    /* Gname <node> <node> <node> <node> <val> */
 	    INP2G(ckt, tab, current);
 	    break;
-	case 'E':		/* Ename <node> <node> <node> <node> <val> */
+
+	case 'E':
+	    /* Ename <node> <node> <node> <node> <val> */
 	    INP2E(ckt, tab, current);
 	    break;
-	case 'F':		/* Fname <node> <node> <vname> <val> */
+
+	case 'F':
+	    /* Fname <node> <node> <vname> <val> */
 	    INP2F(ckt, tab, current);
 	    break;
-	case 'H':		/* Hname <node> <node> <vname> <val> */
+
+	case 'H':
+	    /* Hname <node> <node> <vname> <val> */
 	    INP2H(ckt, tab, current);
 	    break;
-	case 'D':		/* Dname <node> <node> <model> [<val>] [OFF] [IC=<val>] */
+
+	case 'D':
+	    /* Dname <node> <node> <model> [<val>] [OFF] [IC=<val>] */
 	    INP2D(ckt, tab, current);
 	    break;
-	case 'J':		/* Jname <node> <node> <node> <model> [<val>] [OFF] 
-				 *       [IC=<val>,<val>] */
+
+	case 'J':
+	    /* Jname <node> <node> <node> <model> [<val>] [OFF]
+               [IC=<val>,<val>] */
 	    INP2J(ckt, tab, current);
 	    break;
-	case 'Z':		/* Zname <node> <node> <node> <model> [<val>] [OFF] 
-				 *       [IC=<val>,<val>] */
+
+	case 'Z':
+	    /* Zname <node> <node> <node> <model> [<val>] [OFF] 
+	       [IC=<val>,<val>] */
 	    INP2Z(ckt, tab, current);
 	    break;
-	case 'M':		/* Mname <node> <node> <node> <node> <model> [L=<val>]
-				 *       [W=<val>] [AD=<val>] [AS=<val>] [PD=<val>]
-				 *       [PS=<val>] [NRD=<val>] [NRS=<val>] [OFF] 
-				 *       [IC=<val>,<val>,<val>] */
+
+	case 'M':
+	    /* Mname <node> <node> <node> <node> <model> [L=<val>]
+	       [W=<val>] [AD=<val>] [AS=<val>] [PD=<val>]
+	       [PS=<val>] [NRD=<val>] [NRS=<val>] [OFF] 
+	       [IC=<val>,<val>,<val>] */
 	    INP2M(ckt, tab, current);
 	    break;
 
-	case 'O':		/* Oname <node> <node> <node> <node> <model>
-				   *       [IC=<val>,<val>,<val>,<val>] */
+	case 'O':
+	    /* Oname <node> <node> <node> <node> <model>
+	       [IC=<val>,<val>,<val>,<val>] */
 	    INP2O(ckt, tab, current);
 	    break;
 
-	case 'V':		/* Vname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
-				 *       [<tran function>] */
+	case 'V':
+	    /* Vname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
+	       [<tran function>] */
 	    INP2V(ckt, tab, current);
 	    break;
-	case 'I':		/* Iname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
-				 *       [<tran function>] */
+
+	case 'I':
+	    /* Iname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]
+	       [<tran function>] */
 	    INP2I(ckt, tab, current);
 	    break;
 
-	case 'Q':		/* Qname <node> <node> <node> [<node>] <model> [<val>] [OFF]
-				 *       [IC=<val>,<val>] */
+	case 'Q':
+	    /* Qname <node> <node> <node> [<node>] <model> [<val>] [OFF]
+	       [IC=<val>,<val>] */
 	    INP2Q(ckt, tab, current, gnode);
 	    break;
 
-	case 'T':		/* Tname <node> <node> <node> <node> [TD=<val>] 
-				 *       [F=<val> [NL=<val>]][IC=<val>,<val>,<val>,<val>] */
+	case 'T':
+	    /* Tname <node> <node> <node> <node> [TD=<val>] 
+	       [F=<val> [NL=<val>]][IC=<val>,<val>,<val>,<val>] */
 	    INP2T(ckt, tab, current);
 	    break;
 
-	case 'S':		/* Sname <node> <node> <node> <node> [<modname>] [IC] */
+	case 'S':
+	    /* Sname <node> <node> <node> <node> [<modname>] [IC] */
 	    INP2S(ckt, tab, current);
 	    break;
 
-	case 'W':		/* Wname <node> <node> <vctrl> [<modname>] [IC] */
+	case 'W':
+	    /* Wname <node> <node> <vctrl> [<modname>] [IC] */
 	    /* CURRENT CONTROLLED SWITCH */
 	    INP2W(ckt, tab, current);
 	    break;
 
-	case 'U':		/* Uname <node> <node> <model> [l=<val>] [n=<val>] */
+	case 'U':
+	    /* Uname <node> <node> <model> [l=<val>] [n=<val>] */
 	    INP2U(ckt, tab, current);
 	    break;
 
-	case 'K':		/* Kname Lname Lname <val> */
+	case 'K':
+	    /* Kname Lname Lname <val> */
 	    INP2K(ckt, tab, current);
 	    break;
 
-	case '*':		/* *<anything> - a comment - ignore */
+	case '*':
+	    /* *<anything> - a comment - ignore */
 	    break;
 
-	case 'B':		/* Bname <node> <node> [V=expr] [I=expr] */
+	case 'B':
+	    /* Bname <node> <node> [V=expr] [I=expr] */
 	    /* Arbitrary source. */
 	    INP2B(ckt, tab, current);
 	    break;
 
-	case '.':		/* .<something> Many possibilities */
-	    if (INP2dot(ckt, tab, current, task, gnode))
-		goto end;
-	    break;
-
 	case 0:
 	    break;
 
@@ -151,6 +180,6 @@ void INPpas2(void *ckt, card * data, INPtables * tab, void *task)
 	    break;
 	}
     }
-  end:
+
     return;
 }

src/spicelib/parser/inppas3.c

@@ -7,100 +7,112 @@ Modified: AlansFixes
 #include <config.h>
 #include <ngspice.h>
 #include <iferrmsg.h>
+#include <ifsim.h>
 #include <inpmacs.h>
 
 #include "inppas3.h"
 
+extern IFsimulator *ft_sim;
 
-/* pass 3 - Read all nodeset and IC lines. All circuit nodes will have been
- * created by now, (except for internal device nodes), so any nodeset or IC
- * nodes which have to be created are flagged with a warning.
- */
+
+/* pass 3 - Read all nodeset and IC lines. All circuit nodes will have
+ * been created by now, (except for internal device nodes), so any
+ * nodeset or IC nodes which have to be created are flagged with a
+ * warning.  */
 
 void
-INPpas3(void *ckt, card *data, INPtables *tab, void *task)
+INPpas3(void *ckt, card *data, INPtables *tab, void *task,
+	IFparm *nodeParms, int numNodeParms)
 {
 
-card *current;
-int error;  /* used by the macros defined above */
-char *line; /* the part of the current line left to parse */
-char *name; /* the node's name */
-char *token;    /* a token from the line */
-IFparm *prm;    /* pointer to parameter to search through array */
-IFvalue ptemp;  /* a value structure to package resistance into */
-int which;      /* which analysis we are performing */
-int length;     /* length of a name */
-void *node1; /* the first node's node pointer */
+    card *current;
+    int error;			/* used by the macros defined above */
+    char *line;			/* the part of the current line left
+                                   to parse */
+    char *name;			/* the node's name */
+    char *token;		/* a token from the line */
+    IFparm *prm;		/* pointer to parameter to search
+                                   through array */
+    IFvalue ptemp;		/* a value structure to package
+                                   resistance into */
+    int which;			/* which analysis we are performing */
+    int length;			/* length of a name */
+    void *node1;		/* the first node's node pointer */
 
     for(current = data; current != NULL; current = current->nextcard) {
+	line = current->line;
+	INPgetTok(&line,&token,1);
+
+	if (strcmp(token,".nodeset")==0) {
+	    which = -1;
+
+	    for(prm = nodeParms; prm < nodeParms + numNodeParms; prm++) {
+		if(strcmp(prm->keyword,"nodeset")==0) {
+		    which = prm->id;
+		    break;
+		}
+	    }
+
+	    if(which == -1) {
+		LITERR("nodeset unknown to simulator. \n")
+		    return;
+	    }
+
+	    for(;;) {
+		/* loop until we run out of data */
+		INPgetTok(&line,&name,1);
+
+		/* check to see if in the form V(xxx) and grab the xxx */
+		if( *name == (char)NULL) break; /* end of line */
+		length = strlen(name);
+		if( (*name == 'V' || *(name) == 'v') && (length == 1)){
+		    /* looks like V - must be V(xx) - get xx now*/
+		    INPgetTok(&line,&name,1);
+		    if (INPtermInsert(ckt,&name,tab,&node1)!=E_EXISTS)
+			fprintf(stderr,
+				"Warning : Nodeset on non-existant node - %s\n", name);
+		    ptemp.rValue = INPevaluate(&line,&error,1);
+		    IFC(setNodeParm,(ckt,node1,which,&ptemp,(IFvalue*)NULL));
+		    continue;
+		}
+		LITERR(" Error: .nodeset syntax error.\n")
+		    break;
+	    }
+	} else if ((strcmp(token,".ic") == 0)) {
+	    /* .ic */
+	    which = -1;
+	    for(prm = nodeParms; prm < nodeParms + numNodeParms; prm++) {
+		if(strcmp(prm->keyword,"ic")==0) {
+		    which = prm->id;
+		    break;
+		}
+	    }
+
+	    if(which==-1) {
+		LITERR("ic unknown to simulator. \n")
+		    return;
+	    }
 
-      line = current->line;
-      INPgetTok(&line,&token,1);
-
-      if (strcmp(token,".nodeset")==0) {
-        which = -1;
-        for(prm=ft_sim->nodeParms;
-                prm<ft_sim->nodeParms+ft_sim->numNodeParms;prm++) {
-            if(strcmp(prm->keyword,"nodeset")==0) {
-                which=prm->id;
-                break;
-            }
-        }
-        if(which == -1) {
-            LITERR("nodeset unknown to simulator. \n")
-            return;
-        }
-        for(;;) { /* loop until we run out of data */
-            INPgetTok(&line,&name,1);
-            /* check to see if in the form V(xxx) and grab the xxx */
-            if( *name == (char)NULL) break; /* end of line */
-            length = strlen(name);
-            if( (*name == 'V' || *(name) == 'v') && (length == 1)){
-                /* looks like V - must be V(xx) - get xx now*/
-                INPgetTok(&line,&name,1);
-                if (INPtermInsert(ckt,&name,tab,&node1)!=E_EXISTS)
-                  fprintf(stderr,
-                    "Warning : Nodeset on non-existant node - %s\n", name);
-                ptemp.rValue = INPevaluate(&line,&error,1);
-                IFC(setNodeParm,(ckt,node1,which,&ptemp,(IFvalue*)NULL))
-                continue;
-            }
-            LITERR(" Error: .nodeset syntax error.\n")
-            break;
-        }
-      } else if ( (strcmp(token,".ic")==0)){
-          /* .ic */
-          which = -1;
-          for(prm=ft_sim->nodeParms;
-                  prm<ft_sim->nodeParms+ft_sim->numNodeParms;prm++) {
-              if(strcmp(prm->keyword,"ic")==0) {
-                  which=prm->id;
-                  break;
-              }
-          }
-          if(which==-1) {
-              LITERR("ic unknown to simulator. \n")
-              return;
-          }
-          for(;;) { /* loop until we run out of data */
-              INPgetTok(&line,&name,1);
-              /* check to see if in the form V(xxx) and grab the xxx */
-            if( *name == 0) break; /* end of line */
-              length = strlen(name);
-              if( (*name == 'V' || *(name) == 'v') && (length == 1)){
-                  /* looks like V - must be V(xx) - get xx now*/
-                  INPgetTok(&line,&name,1);
-                  if (INPtermInsert(ckt,&name,tab,&node1)!=E_EXISTS)
-                    fprintf(stderr,
-                      "Warning : IC on non-existant node - %s\n", name);
-                  ptemp.rValue = INPevaluate(&line,&error,1);
-                  IFC(setNodeParm,(ckt,node1,which,&ptemp,(IFvalue*)NULL))
-                  continue;
-              }
-              LITERR(" Error: .ic syntax error.\n")
-              break;
-          }
-      }
+	    for(;;) {
+		/* loop until we run out of data */
+		INPgetTok(&line,&name,1);
+		/* check to see if in the form V(xxx) and grab the xxx */
+		if( *name == 0) break; /* end of line */
+		length = strlen(name);
+		if( (*name == 'V' || *(name) == 'v') && (length == 1)){
+		    /* looks like V - must be V(xx) - get xx now*/
+		    INPgetTok(&line,&name,1);
+		    if (INPtermInsert(ckt,&name,tab,&node1)!=E_EXISTS)
+			fprintf(stderr,
+				"Warning : IC on non-existant node - %s\n", name);
+		    ptemp.rValue = INPevaluate(&line,&error,1);
+		    IFC(setNodeParm,(ckt,node1,which,&ptemp,(IFvalue*)NULL))
+			continue;
+		}
+		LITERR(" Error: .ic syntax error.\n")
+		    break;
+	    }
+	}
     }
     return;
 }

src/spicelib/parser/inppas3.h

@@ -4,7 +4,8 @@
 
 #include <inpdefs.h>
 
-void INPpas3(void *ckt, card *data, INPtables *tab, void *task);
+void INPpas3(void *ckt, card *data, INPtables *tab, void *task,
+	     IFparm *nodeParms, int numNodeParams);
 
 
 #endif