Update at Wed Aug 9 09:04:43 EDT 2017 by tim

for subcircuits (.subckt ... .ends pair with cellname and pin names
and pin order, but no contents) are automatically treated as black-
box circuits if found and if the "-blackbox" option is passed to the
"lvs" (scripted) command.  The "equate pins" command can be used
outside of a comparison to force two circuits (black-box or
otherwise) to be matched by pin name (if not a black-box circuit,
then this is a provisional name match, as a circuit comparison will
order based on connectivity first, not pin names).  So two sets of
black-box circuit libraries can be used as long as their pin names
match.  One hack added to ignore the "!" at the end of global names
when comparing pin names for matching.  Otherwise, pin names must
compare by case-insensitive string match.

.gitignore

@@ -1,12 +1,13 @@
-*.*%
-*.cdslck
-.inca.db.*
-inca.*.pak
-*.swp
-*.log
+netgen
+netgenexec
+defs.mak
+Depend
+config.cache
+config.log
+config.status
+*.o
 *.so
 *~
-*/av_extracted*/
-.nfs*
-*.cd-
-*/mommdl/
+*.log
+UPDATE_ME
+VERSION

TO_DO

@@ -1,15 +1,14 @@
 TO_DO list for version 1.5
 ------------------------------
 
- 1) Parallel (transistors and capacitors) and serial (resistors)
-    device merging, plus methods for describing how any device
-    class may be merged.
+ As of version 1.5.70, the major to-do item list is complete.
 
 Possible useful additions (not critical)
 ----------------------
 
  1) Add new output style allowing netlists to be described by Tcl scripts
-    (similar to the C-Code format, but does not require compiling).
+    (similar to the C-Code format, but does not require compiling) (this
+    was done in 1.5.72, but now needs some scripts to make use of it.)
  2) Add automatic file format guessing from file extension for "write" command
  3) Add Tk GUI to match (and improve upon!) the original X11 GUI.
  4) Incorporate into Tcl-based xcircuit
@@ -33,5 +32,7 @@ Possible useful additions (not critical)
     ntk and ext formats, SPICE format writing, and sim format reading).
 11) Add a "property" command to add/remove properties to check, and change
     the slop values (done).
-12) Add a "subcircuit" command to mimic a SPICE ".SUBCKT ... .ENDS" card.
+12) Add a "subcircuit" command to mimic a SPICE ".SUBCKT ... .ENDS" card
+    (i.e., the ability to add subcircuit "stub" definitions from the
+    command line or from a setup file).
 

VERSION

@@ -1 +1 @@
-1.5.67
+1.5.84

base/ext.c

@@ -170,7 +170,7 @@ char *ReadExt(char *fname, int doflat, int *fnum)
 
     SetExtension(name, fname, EXT_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ext file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
@@ -643,7 +643,7 @@ char *ReadSim(char *fname, int *fnum)
 
     SetExtension(name, fname, SIM_EXTENSION);
     if (OpenParseFile(name, *fnum) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ext file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    

base/flatten.c

@@ -486,24 +486,30 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       }
 
       /* splice instance out of parent */
-      if (ParentParams == ThisCell->cell) {
-	/* ParentParams are the very first thing in the list */
-	ThisCell->cell = ChildObjList;
-	for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+      if ((ParentParams == ThisCell->cell) && (ChildObjList == NULL)) {
+	ThisCell->cell = ob2;	/* Child cell was empty */
+	tmp = ob2;
       }
       else {
-	/* find ParentParams in ThisCell list */
-	for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
-	if (ob2)
-	   for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
-      }
-      /* now, ob2 is last element in child list, so skip and reclaim parent */
+         if (ParentParams == ThisCell->cell) {
+	   /* ParentParams are the very first thing in the list */
+	   ThisCell->cell = ChildObjList;
+	   for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+         }
+         else {
+	   /* find ParentParams in ThisCell list */
+	   for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
+	   if (ob2)
+	      for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
+         }
+         /* now, ob2 is last element in child list, so skip and reclaim parent */
 
-      tmp = ParentParams;
-      do {
-	tmp = tmp->next;
-      } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
-      if (ob2) ob2->next = tmp;
+         tmp = ParentParams;
+         do {
+	   tmp = tmp->next;
+         } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
+         if (ob2) ob2->next = tmp;
+      }
       while (ParentParams != tmp) {
 	ob2 = ParentParams->next;
 	FreeObjectAndHash(ParentParams, ThisCell);
@@ -1224,6 +1230,10 @@ int CleanupPins(char *name, int filenum)
       return 0;
    }
 
+   // If cell is type MODULE, this is a black-box circuit and
+   // pins are expected to be disconnected (so don't remove them).
+   if (ThisCell->class == CLASS_MODULE) return 0;
+
    // Avoid a loop through all cells unless we have to do it.
 
    for (ob = ThisCell->cell; ob != NULL; ob = ob->next) {

base/netcmp.h

@@ -9,6 +9,7 @@ extern struct nlist *Circuit2;
 extern int ExhaustiveSubdivision;
 
 #ifdef TCL_NETGEN
+#include <tcl.h>
 extern int InterruptPending;
 #endif
 
@@ -17,10 +18,11 @@ extern int InterruptPending;
 extern void PrintElementClasses(struct ElementClass *EC, int type, int dolist);
 extern void PrintNodeClasses(struct NodeClass *NC, int type, int dolist);
 extern void SummarizeNodeClasses(struct NodeClass *NC);
-extern void PrintPropertyResults(void);
+extern void PrintPropertyResults(int do_list);
 extern void PrintCoreStats(void);
 extern void ResetState(void);
-extern void CreateTwoLists(char *name1, int file1, char *name2, int file2);
+extern void CreateTwoLists(char *name1, int file1, char *name2, int file2,
+		int dolist);
 extern int Iterate(void);
 extern int VerifyMatching(void);
 extern void PrintAutomorphisms(void);
@@ -33,7 +35,8 @@ extern int EquivalenceElements(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
 extern int IgnoreClass(char *name, int file, unsigned char type);
-extern int MatchPins(struct nlist *tp1, struct nlist *tp2);
+extern int MatchPins(struct nlist *tp1, struct nlist *tp2, int dolist);
+extern int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run, int serial);
 
 extern int  CreateCompareQueue(char *, int, char *, int);
 extern int  GetCompareQueueTop(char **, int *, char **, int *);
@@ -50,5 +53,8 @@ extern int EquivalentElement();
 
 extern void enable_interrupt();
 extern void disable_interrupt();
+
+extern Tcl_Obj *ListNodeClasses(int legal);
+extern Tcl_Obj *ListElementClasses(int legal);
 #endif
 

base/netfile.c

@@ -77,8 +77,9 @@ extern char *SetExtension(char *buffer, char *path, char *extension)
   strcat(tmpbuf, extension);
 
   /* step 4: lower-case the entire name */
-  for (pt = tmpbuf; *pt != '\0'; pt++)
-    if (isupper(*pt)) *pt = tolower(*pt);
+  /* (Commented out because this is really stupid.) */
+  // for (pt = tmpbuf; *pt != '\0'; pt++)
+  //   if (isupper(*pt)) *pt = tolower(*pt);
 
   if (buffer != NULL) {
     strcpy(buffer, tmpbuf);
@@ -567,7 +568,7 @@ char *ReadNetgenFile (char *fname, int *fnum)
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
     SetExtension(name, fname, NETGEN_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in netgen read: No file %s\n",name);
       *fnum = -1;
       return NULL;
     }    
@@ -803,7 +804,7 @@ char *ReadNetgenFile (char *fname, int *fnum)
   if ((File = open(fname, O_RDONLY, FILE_ACCESS_BITS)) == -1) {
     SetExtension(name, fname, NETGEN_EXTENSION);
     if ((File = open(name, O_RDONLY, FILE_ACCESS_BITS)) == -1) {
-      Printf("No file: %s\n",name);
+      Printf("Error in netgen read: No file %s\n",name);
       return NULL;
     }    
   }

base/netgen.c

@@ -49,6 +49,7 @@ int NextNode;
 
 int Composition = NONE;
 int QuickSearch = 0;
+int GlobalParallelNone = FALSE;
 
 int AddToExistingDefinition = 0;  /* default: overwrite cell when reopened */
 
@@ -870,6 +871,32 @@ int ReduceExpressions(struct objlist *instprop, struct objlist *parprops,
     return 0;
 }
 
+/*----------------------------------------------------------------------*/
+/* Set/clear the flag bit COMB_NO_PARALLEL on all cells.  Note that the	*/
+/* function is called with value for enabling combine parallel, so	*/
+/* value TRUE means clear bit, value FALSE means set bit.		*/
+/*----------------------------------------------------------------------*/
+
+struct nlist *SetParallelCombineFlag(struct hashlist *p, void *clientdata)
+{
+  struct nlist *ptr;
+  int *value = (int *)clientdata;
+
+  ptr = (struct nlist *)(p->ptr);
+  if (*value == TRUE)
+     ptr->flags &= (~COMB_NO_PARALLEL);
+  else
+     ptr->flags |= COMB_NO_PARALLEL;
+
+  return NULL;	/* NULL keeps search alive */
+}
+
+void SetParallelCombine(int value)
+{
+  ClearDumpedList();
+  RecurseCellHashTable2(SetParallelCombineFlag, (void *)(&value));
+}
+
 /*----------------------------------------------------------------------*/
 /* Delete a property from the master cell record.			*/
 /*----------------------------------------------------------------------*/
@@ -948,10 +975,10 @@ PropertyTolerance(char *name, int fnum, char *key, int ival, double dval)
         switch (kl->type) {
 	    case PROP_DOUBLE:
 	    case PROP_VALUE:
+	    case PROP_STRING:
 		kl->slop.dval = dval;
 		break;
 	    case PROP_INTEGER:
-	    case PROP_STRING:
 	    case PROP_EXPRESSION:
 		kl->slop.ival = ival;
 		break;
@@ -1103,15 +1130,15 @@ struct property *PropertyInteger(char *name, int fnum, char *key,
 
 /*----------------------------------------------------------------------*/
 
-struct property *PropertyString(char *name, int fnum, char *key, int range,
+struct property *PropertyString(char *name, int fnum, char *key, double dval,
 		char *pdefault)
 {
    struct property *kl = NULL;
    struct nlist *tc;
 
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
-      PropertyString(name, Circuit1->file, key, range, pdefault);
-      PropertyString(name, Circuit2->file, key, range, pdefault);
+      PropertyString(name, Circuit1->file, key, dval, pdefault);
+      PropertyString(name, Circuit2->file, key, dval, pdefault);
       return;
    }
 
@@ -1127,7 +1154,7 @@ struct property *PropertyString(char *name, int fnum, char *key, int range,
       kl->idx = 0;
       kl->merge = MERGE_NONE;
       kl->type = PROP_STRING;
-      kl->slop.ival = (range >= 0) ? range : 0;
+      kl->slop.dval = dval;
       if (pdefault != NULL)
          kl->pdefault.string = strsave(pdefault);
       else
@@ -1192,7 +1219,7 @@ void CellDef(char *name, int fnum)
 	np = InstallInCellHashTable(name, fnum);
 	CurrentCell = LookupCellFile(name, fnum);
 	CurrentCell->class = CLASS_SUBCKT;	/* default */
-	CurrentCell->flags = 0;
+	CurrentCell->flags = (GlobalParallelNone) ? COMB_NO_PARALLEL : 0;
 
 	LastPlaced = NULL;
 	CurrentTail = NULL;
@@ -2054,7 +2081,7 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
 		kl->idx = 0;
 		kl->merge = MERGE_NONE;
 		kl->type = PROP_STRING;
-		kl->slop.ival = 0;
+		kl->slop.dval = 0.0;
 		kl->pdefault.string = NULL;
 		HashPtrInstall(kl->key, kl, &(cell->propdict));
 	    }
@@ -2318,7 +2345,7 @@ void ResolveProperties(char *name1, int file1, char *name2, int file2)
 	    switch (kl1->type) {
 		case PROP_STRING:
 		    kl2 = PropertyString(tp2->name, tp2->file, kl1->key,
-				kl1->slop.ival, kl1->pdefault.string); 
+				kl1->slop.dval, kl1->pdefault.string); 
 		    break;
 		case PROP_INTEGER:
 		    kl2 = PropertyInteger(tp2->name, tp2->file, kl1->key,
@@ -2350,7 +2377,7 @@ void ResolveProperties(char *name1, int file1, char *name2, int file2)
 	    switch (kl2->type) {
 		case PROP_STRING:
 		    kl1 = PropertyString(tp1->name, tp1->file, kl2->key,
-				kl2->slop.ival, kl2->pdefault.string); 
+				kl2->slop.dval, kl2->pdefault.string); 
 		    break;
 		case PROP_INTEGER:
 		    kl1 = PropertyInteger(tp1->name, tp1->file, kl2->key,
@@ -2849,6 +2876,157 @@ void ConnectAllNodes(char *model, int file)
     if (ob->node == -1) ob->node = nodenum++;
 }
 
+/*----------------------------------------------------------------------*/
+/* Serial and Parallel combination:					*/
+/* All devices of the same type that exist in serial and parallel	*/
+/* combinations will be treated as a single device in a network.	*/
+/* Serial connections are only allowed for resistors and inductors.	*/
+/* Any device may be connected in parallel.  For combinations of serial	*/
+/* and parallel, as in a resistor network, there is a set of rules:	*/
+/*									*/
+/* Running parallel and serial checks:					*/
+/* 1. Run parallel once.  If a repeat run and no devices are merged,	*/
+/*    then go to 4.							*/
+/* 2. Run serial until no devices are merged.				*/
+/* 3. If serial ran more than once, then go to 1.			*/
+/* 4. End merge								*/
+/*									*/
+/* Each merge procedure, when it finds two devices that can be merged,	*/
+/* removes the second device from the netlist and adds its properties	*/
+/* to the first device.  If a serial merge, then the nodes are adjusted	*/
+/* appropriately.  Where A is the property list of the first device and	*/
+/* B is the property list of the second device, the first and last	*/
+/* properties of A and the first property of B may require a marker to	*/
+/* indicate the topology of the network, as follows (in order):		*/
+/*									*/
+/* For a parallel merge:						*/
+/*    1) If A has serial components then tag first property of A with	*/
+/*	 "open" and tag first property of B with "close".		*/
+/*    2) If B has serial components then tag first property of B with	*/
+/*	 "open". 							*/
+/*									*/
+/* For a serial merge:							*/
+/*    1) If A has unbalanced "opens", then add "close" to first		*/
+/*	 property of B to balance the "opens".				*/
+/*    2) Always tag B with "serial".					*/
+/*									*/
+/* Tags are indicated by a property named "_tag" which has a string	*/
+/* value of ordered characters, "+" for serial, "(" for open, and ")"	*/
+/* for close.  A device with only one property record has no "_tag"	*/
+/* record.  A device which is in parallel with the device(s) in front	*/
+/* of it is implicitly parallel by not having an "+" tag, and may not	*/
+/* have a tag at all.							*/
+/*									*/
+/* The property check routine is responsible for comparing device	*/
+/* serial/parallel networks against each other.  Otherwise, each	*/
+/* serial/parallel network is considered topologically as a single	*/
+/* device, and any differences in the serial/parallel networks between	*/
+/* two circuits being matched will be treated as a property error.	*/
+/*----------------------------------------------------------------------*/
+
+/* add_prop_tag --- add the tag character tagc to the property list of	*/
+/* obr.  obr points to the first property record.			*/
+
+int add_prop_tag(struct objlist *obr, char tagc)
+{
+   struct objlist *nob;
+   int i, k, l;
+   struct valuelist *kv, *kv2;
+   int hastag;
+   char *tmpstr;
+
+   hastag = FALSE;
+   for (nob = obr; nob->next && nob->next->type == PROPERTY; nob = nob->next) {
+      for (i = 0; ; i++) {
+         kv = &(nob->instance.props[i]);
+	 if (kv->type == PROP_ENDLIST) break;
+         if (kv->type == PROP_STRING) {
+	    if (!strcmp(kv->key, "_tag")) {
+	       hastag = TRUE;
+	       break;
+	    }
+	 }
+      }
+   }
+   if (hastag) {
+      if (nob == obr) {
+         // If _tag was first in the list, then just prepend tagc to the tag value
+	 tmpstr = kv->value.string;
+         kv->value.string = (char *)MALLOC(strlen(tmpstr) + 2);
+	 sprintf(kv->value.string, "%c%s", tagc, tmpstr);
+	 FREE(tmpstr);
+      }
+      else {
+         // Add a _tag key to the first property list and set value to tagc
+
+	 kv = &(obr->instance.props[i]);
+	 k = 0;
+	 for (k = 0; ; k++) {
+	    kv = &(obr->instance.props[k]);
+	    if (kv->type == PROP_ENDLIST)
+	       break;
+         }
+	 kv2 = (struct valuelist *)MALLOC((k + 2) * sizeof(struct valuelist));
+	 kv2->key = strsave("_tag");
+	 kv2->type = PROP_STRING;
+	 /* Value is set to tagc */
+	 kv2->value.string = (char *)MALLOC(2);
+	 sprintf(kv2->value.string, "%c", tagc);
+	 for (l = 0; l <= k; l++)
+	    kv2[l + 1] = obr->instance.props[l];
+	 FREE(obr->instance.props);
+	 obr->instance.props = kv2;
+      }
+   }
+   return hastag;
+}
+
+/* add_balancing_close --- find the number of unbalanced 'open'		*/
+/* records in ob1's property list, and prepend the correct number of	*/
+/* 'C' closures to the property list of ob2.				*/
+
+void add_balancing_close(struct objlist *ob1, struct objlist *ob2)
+{
+   struct objlist *nob;
+   int i, k, l;
+   struct valuelist *kv, *kv2;
+   int opentags;
+   char *tmpstr, *tag;
+
+   /* Find the first property record in ob1. */
+   for (nob = ob1->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == PROPERTY)
+	 break;
+   if (nob->type != PROPERTY) return;	// shouldn't happen
+
+   opentags = 0;
+   for (; nob->next && nob->next->type == PROPERTY; nob = nob->next) {
+      for (i = 0; ; i++) {
+         kv = &(nob->instance.props[i]);
+	 if (kv->type == PROP_ENDLIST) break;
+         if (kv->type == PROP_STRING) {
+	    if (!strcmp(kv->key, "_tag")) {
+	       for (tag = kv->value.string; *tag != '\0'; tag++) {
+		  if (*tag == '(') opentags++;
+		  else if (*tag == ')') opentags--;
+	       }
+               break;
+	    }
+	 }
+      }
+   }
+   if (opentags == 0) return;
+
+   /* Find the first property record in ob2. */
+   for (nob = ob2->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == PROPERTY)
+	 break;
+   if (nob->type != PROPERTY) return;	// shouldn't happen
+
+   // This is slow but it's the easiest way to do it
+   while (opentags-- > 0) add_prop_tag(nob, ')');
+}
+
 /*----------------------------------------------------------------------*/
 /* Find all devices that are of the same class and check for parallel	*/
 /* combinations, and combine them where found, adjusting property "M"	*/
@@ -2865,23 +3043,26 @@ void ConnectAllNodes(char *model, int file)
 /*									*/
 /* If the device has permutable pins, then duplicate hashes are made	*/
 /* for each permutation.						*/
+/*									*/
+/* Return the number of devices merged.					*/
 /*----------------------------------------------------------------------*/
 
-void CombineParallel(char *model, int file)
+int CombineParallel(char *model, int file)
 {
    struct nlist *tp, *tsub;
    struct objlist *ob, *ob2, *nextob;
-   struct objlist *sob, *lob, *tlob, *nob, *pob, *obr;
+   struct objlist *sob, *lob, *nob, *pob, *obr;
+   struct objlist *propfirst, *proplast, *spropfirst, *sproplast;
    struct hashdict devdict;
    struct Permutation *perm;
    size_t pcnt;
-   int dcnt = 0;
+   int i, dcnt = 0, hastag;
    char *pstr, *p2str, *pptr;
    struct valuelist *kv;
 
    if ((tp = LookupCellFile(model, file)) == NULL) {
       Printf("Cell: %s does not exist.\n", model);
-      return;
+      return -1;
    }
 
    InitializeHashTable(&devdict, OBJHASHSIZE);
@@ -2890,12 +3071,21 @@ void CombineParallel(char *model, int file)
    for (ob = tp->cell; ob; ) {
       if (ob->type == FIRSTPIN) {
 
+         /* Watch for devices prohibited from parallel combination.	*/
+	 /* All devices allow parallel combination by default.		*/
+
+	 tsub = LookupCellFile(ob->model.class, file);
+         if ((tsub != NULL) && (tsub->flags & COMB_NO_PARALLEL)) {
+            lob = ob;
+	    ob = ob->next;
+	    continue;
+         }
+
 	 /* ------------------------------------*/
 	 /* Generate hash key from pins 	*/
 	 /* Handle pin permuations		*/
 	 /* ------------------------------------*/
 
-	 tsub = LookupCellFile(ob->model.class, file);
 	 if ((tsub != NULL) && (tsub->permutes != NULL))
 	    perm = tsub->permutes;
 	 else
@@ -2903,14 +3093,17 @@ void CombineParallel(char *model, int file)
 
 	 pcnt = strlen(ob->model.class) + 2;
 	 pptr = (char *)pcnt;
+
+	 propfirst = proplast = NULL;
 	 for (ob2 = ob; ob2 && (ob2->type > FIRSTPIN || ob2 == ob); ob2 = ob2->next) {
-	    tlob = ob2;
+	    pob = ob2;
 	    pcnt += 10;
 	 }
+	 if (ob2 && (ob2->type == PROPERTY)) propfirst = ob2;
 
 	 /* Find last record in device and first record in next object */
 	 while (ob2 && ob2->type == PROPERTY) {
-	    tlob = ob2;
+	    proplast = ob2;
 	    ob2 = ob2->next;
 	 }
 	 nextob = ob2;
@@ -2967,70 +3160,157 @@ void CombineParallel(char *model, int file)
 		FREE((char *)p2str);
 	    }
 
-	    /* Set last object ptr to end of this record */
-	    lob = tlob;
+	    /* Move last object marker to end of sob record */
+	    if (proplast != NULL)
+	       lob = proplast;
+	    else
+	       lob = pob;
 	 }
 	 else {
-	    /* Remove parallel device "ob" and append properties of	*/
+	    /* Find parallel device "ob" and append properties of	*/
 	    /* "sob" to it.  If "ob" does not have properties, then	*/
 	    /* create a property record and set property "M" to 2.	*/
 
-	    for (obr = ob; obr != ob2 ; ) {
+	    /* Find last non-property record of sob ( = pob) */
+	    /* Find first property record of sob ( = spropfirst) */
+	    /* Find last property record of sob ( = sproplast)	*/
+
+	    spropfirst = sproplast = NULL;
+	    for (ob2 = sob; ob2->type > FIRSTPIN || ob2 == sob; ob2 = ob2->next)
+	       pob = ob2;
+	    if (ob2->type == PROPERTY) spropfirst = ob2;
+	    for (; ob2->type == PROPERTY; ob2 = ob2->next)
+	       sproplast = ob2;
+	    
+            if (spropfirst == NULL) {
+	       /* Create new property instance record if one doesn't exist */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = strsave(sob->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "M" and set to 1 */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("M");
+	       kv->type = PROP_INTEGER;
+	       kv->value.ival = 1;
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       nob->next = pob->next;
+	       pob->next = nob;
+
+	       if (lob == pob) lob = nob;
+	       spropfirst = sproplast = nob;
+	    }
+	    if (propfirst == NULL) {
+	       /* Create new property instance record if one doesn't exist */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = strsave(ob->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "M" and set to 1 */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("M");
+	       kv->type = PROP_INTEGER;
+	       kv->value.ival = 1;
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       /* Append to sob's property list */
+	       nob->next = sproplast->next;
+	       sproplast->next = nob;
+	       if (lob == sproplast) lob = nob;
+	    }
+		
+	    if (propfirst != NULL) {
+
+	       // Serial/Parallel logic:
+	       // If propfirst has _tag in properties,
+	       // then add an "open" tag at propfirst
+               add_prop_tag(propfirst, '(');
+
+	       // if spropfirst has _tag in properties then add an "open" tag
+	       // to spropfirst and a "close" tag to propfirst
+	       if (add_prop_tag(spropfirst, '(')) add_prop_tag(propfirst, ')');
+
+	       /* Append ob's property list to sob */
+	       proplast->next = sproplast->next;
+	       sproplast->next = propfirst;
+	       if (lob == sproplast) lob = proplast;
+	    }
+
+            /* Link up around object to be removed */
+	    lob->next = nextob;
+
+	    /* Remove the object */
+	    for (obr = ob; obr != propfirst && obr != nextob; ) {
 	       nob = obr->next;
 	       FreeObjectAndHash(obr, tp);
 	       obr = nob;
 	    }
 	    dcnt++;
-	    /* Find (first) property record of sob */
-	    for (pob = sob->next; pob->type > FIRSTPIN; pob = pob->next) {
-	       if (pob->next->type == PROPERTY)
-		  break;
-	       else if (pob->next->type == FIRSTPIN) {
-		  /* Create new property instance record if one doesn't exist */
-		  nob = GetObject();
-		  nob->type = PROPERTY;
-		  nob->name = strsave("properties");
-		  nob->node = -2;	/* Don't report as disconnected node */
-		  nob->model.class = strsave(sob->model.class);
-		  nob->instance.props = NewPropValue(2);
 
-		  /* Create property record for property "M" and set to 1 */
-		  kv = &(nob->instance.props[0]);
-		  kv->key = strsave("M");
-		  kv->type = PROP_INTEGER;
-		  kv->value.ival = (obr->type != PROPERTY) ? 2 : 1;
-
-		  /* End of property list */
-		  kv = &(nob->instance.props[1]);
-		  kv->key = NULL;
-		  kv->type = PROP_ENDLIST;
-		  kv->value.ival = 0;
-
-		  nob->next = pob->next;
-		  pob->next = nob;
-		  break;
-	       }
-	    }
-		
-	    if (lob == pob) lob = tlob;
-	    if (obr->type == PROPERTY) {
-	       /* Pull out property records and append to sob's	*/
-	       /* property list					*/
-	       tlob->next = pob->next;
-	       pob->next = obr;
-	    }
-	    lob->next = nextob;
 	 }
 	 FREE((char *)pstr);
       }
-      else
+      else {
+         lob = ob;
 	 nextob = ob->next;
+      }
       ob = nextob;
    }
    HashKill(&devdict);
    if (dcnt > 0) {
       Fprintf(stdout, "Class %s:  Merged %d devices.\n", model, dcnt);
    }
+   return dcnt;
+}
+
+/*----------------------------------------------------------------------*/
+/* For the purposes of serial connection checking, find if all pins	*/
+/* of two instances after the first two pins are connected to the name	*/
+/* nodes.  This depends on the definition of a serial device as having	*/
+/* two ports, but any additional ports (such as a substrate connection)	*/
+/* must be the same for all devices in series.				*/
+/*----------------------------------------------------------------------*/
+
+int check_pin_nodes(struct objlist *ob1, struct objlist *ob2)
+{
+   struct objlist *nob, *pob;
+
+   /* A dummy device may have both terminals connected to the same	*/
+   /* point, triggering a false check for a serial device.		*/
+   if (ob1 == ob2) return FALSE;
+
+   for (nob = ob1->next; nob && nob->type != FIRSTPIN; nob = nob->next)
+      if (nob->type == 3) break;
+
+   for (pob = ob2->next; pob && pob->type != FIRSTPIN; pob = pob->next)
+      if (pob->type == 3) break;
+
+   while (nob && pob && nob->type > FIRSTPIN && pob->type > FIRSTPIN) {
+      if (nob->node != pob->node)
+          return FALSE;
+      nob = nob->next;
+      pob = pob->next;
+   }
+
+   if (nob->type > FIRSTPIN || pob->type > FIRSTPIN) return FALSE;
+   return TRUE;
 }
 
 /*----------------------------------------------------------------------*/
@@ -3041,23 +3321,25 @@ void CombineParallel(char *model, int file)
 /*									*/
 /* This routine depends on CombineParallel() being run first so that no	*/
 /* parallel devices are reported as serial.				*/
+/*									*/
+/* Return the number of devices merged.					*/
 /*----------------------------------------------------------------------*/
 
-void CombineSerial(char *model, int file)
+int CombineSerial(char *model, int file)
 {
    struct nlist *tp, *tp2;
    struct objlist ***instlist;
    struct objlist *ob, *ob2, *obs, *obp, *obn;
-   int i, j;
+   int i, j, scnt = 0;
    struct valuelist *kv;
 
-   // Work in progress. . .
-   return;
-
    if ((tp = LookupCellFile(model, file)) == NULL) {
       Printf("Cell: %s does not exist.\n", model);
-      return;
+      return -1;
    }
+   /* Diagnostic */
+   /* Printf("CombineSerial start model = %s file = %d\n", model, file); */
+
    instlist = (struct objlist ***)CALLOC((tp->nodename_cache_maxnodenum + 1),
 		sizeof(struct objlist **));
 
@@ -3065,106 +3347,126 @@ void CombineSerial(char *model, int file)
       if ((ob->type >= FIRSTPIN) && (ob->node >= 0)) {
           if (ob->type == FIRSTPIN)
 	     obp = ob;	// Save pointer to first pin of device
+
           if (instlist[ob->node] == NULL) {
              /* Node has not been seen before, so add it to list */
 	     instlist[ob->node] = (struct objlist **)CALLOC(2,
 			sizeof(struct objlist *));
 
-	     /* For now, simple rule:  Device must be a resistor */
+	     /* Device must be marked as able to be combined in	serial.	*/
+	     /* Note that devices with more than two pins are expected	*/
+	     /* to serial connect along the first two pins, and the 	*/
+	     /* remaining pins must all connect to the same nodes.  By	*/
+	     /* default, CLASS_RES, CLASS_RES3, and CLASS_INDUCTOR are	*/
+	     /* all allowed to combine in serial.  All other devices	*/
+	     /* must have serial combination explicitly enabled.	*/
+	     /* NOTE:  Arbitrarily, the first two pins of a device are	*/
+	     /* assumed to be the ones that make serial connections.	*/
+	     /* Additional pins, if any, do not.			*/
+	
              tp2 = LookupCellFile(ob->model.class, file);
-             if (tp2->class != CLASS_RES)
-	        /* invalidate node */
-	         instlist[ob->node][0] = NULL;
-	     else
+             if ((tp2->flags & COMB_SERIAL) && (ob->type <= 2))
 	         instlist[ob->node][0] = obp;
+	     else
+	         /* invalidate node */
+	         instlist[ob->node][0] = NULL;
           }
           else if (instlist[ob->node][0] == NULL) {
              /* Node is not valid for serial connection */
           }
           else if (instlist[ob->node][1] == NULL) {
              /* Check if first instance is the same type */
-             if ((*matchfunc)(instlist[ob->node][0]->model.class, ob->model.class))
-	         instlist[ob->node][1] = obp;
+             if ((*matchfunc)(instlist[ob->node][0]->model.class, ob->model.class)) {
+                 if (check_pin_nodes(instlist[ob->node][0], obp))
+	             instlist[ob->node][1] = obp;
+		 else
+		    /* invalidate node */
+		    instlist[ob->node][0] = NULL;
+	     }
 	     else
 		/* invalidate node */
 		instlist[ob->node][0] = NULL;
           }
+	  else {
+	     /* More than two devices connect here, so invalidate */
+	     instlist[ob->node][0] = NULL;
+	  }
       }
    }
    for (i = 0; i <= tp->nodename_cache_maxnodenum; i++) {
       if (instlist[i] != NULL) {
          if ((instlist[i][0] != NULL) && (instlist[i][1] != NULL)) {
-	    Fprintf(stdout, "Found serial instances %s and %s\n",
+	    int k, l;
+	    struct valuelist *kv2;
+
+            /* Diagnostic */
+	    /* Fprintf(stdout, "Found serial instances %s and %s\n",
 			instlist[i][0]->instance.name,
-			instlist[i][1]->instance.name);
+			instlist[i][1]->instance.name); */
+            scnt++;
 
-	    /* To maintain knowledge of the topology, each device gets	*/
-	    /* a parameter 'S', string value set to "<node1>/<node2>".	*/
+	    /* To maintain knowledge of the topology, 2nd device gets	*/
+	    /* a parameter '_tag', string value set to "+".		*/
 
-	    for (j = 0; j <= 1; j++) {
-               for (obp = instlist[i][j]; ; obp = obp->next) {
-		  int found = FALSE;
-		  int k, l;
-		  char *nodename1, *nodename2;
-		  struct valuelist *kv2;
+            for (obn = instlist[i][1]; obn->next &&
+			obn->next->type > FIRSTPIN; obn = obn->next);
+	    obp = obn->next;
 
-		  nodename1 = tp->nodename_cache[instlist[i][j]->node]->name;
-		  nodename2 = tp->nodename_cache[instlist[i][j]->next->node]->name;
-	          if (obp->type == PROPERTY) {
-		     /* Add to properties */
-		     k = 0;
-		     for (k = 0; ; k++) {
-		        kv = &(obp->instance.props[k]);
-			if (kv->type == PROP_ENDLIST)
-			   break;
-		     }
+	    if (obp == NULL || obp->type != PROPERTY) {
+	       struct objlist *nob;
+	       /* No property record, so insert one */
+	       nob = GetObject();
+	       nob->type = PROPERTY;
+	       nob->name = strsave("properties");
+	       nob->node = -2;	/* Don't report as disconnected node */
+	       nob->model.class = (obp->model.class == NULL) ? NULL :
+				strsave(obp->model.class);
+	       nob->instance.props = NewPropValue(2);
+
+	       /* Create property record for property "_tag" */
+	       kv = &(nob->instance.props[0]);
+	       kv->key = strsave("_tag");
+	       kv->type = PROP_STRING;
+	       /* Value is set to "+" */
+	       kv->value.string = (char *)MALLOC(2);
+	       sprintf(kv->value.string, "+");
+
+	       /* End of property list */
+	       kv = &(nob->instance.props[1]);
+	       kv->key = NULL;
+	       kv->type = PROP_ENDLIST;
+	       kv->value.ival = 0;
+
+	       nob->next = obp;
+	       obn->next = nob;
+	    }
+	    else if (obp->type == PROPERTY) {
+	       /* Add to properties */
+	       k = 0;
+	       for (k = 0; ; k++) {
+		  kv = &(obp->instance.props[k]);
+		  if (kv->type == PROP_ENDLIST) {
 		     kv2 = (struct valuelist *)MALLOC((k + 2) *
 				sizeof(struct valuelist));
-		     kv2->key = strsave("S");
+		     kv2->key = strsave("_tag");
 		     kv2->type = PROP_STRING;
-		     /* Value is set to "<node1>/<node2>" */
-		     kv2->value.string = (char *)MALLOC(strlen(nodename1) +
-				strlen(nodename2) + 2);
-		     sprintf(kv2->value.string, "%s/%s", nodename1, nodename2);
-
+		     /* Value is set to "+" */
+		     kv2->value.string = (char *)MALLOC(2);
+		     sprintf(kv2->value.string, "+");
 		     for (l = 0; l <= k; l++)
-			kv2[l + 1] = obp->instance.props[l];
+		        kv2[l + 1] = obp->instance.props[l];
 		     FREE(obp->instance.props);
 		     obp->instance.props = kv2;
-		     found = TRUE;
-	          }
-	          if (obp->next == NULL || obp->next->type == FIRSTPIN) {
-		     struct objlist *nob;
-		     /* No property record, so insert one */
-		     if (found == FALSE) {
-		        nob = GetObject();
-		        nob->type = PROPERTY;
-		        nob->name = strsave("properties");
-		        nob->node = -2;	/* Don't report as disconnected node */
-		        nob->model.class = (obp->model.class == NULL) ? NULL :
-					strsave(obp->model.class);
-		        nob->instance.props = NewPropValue(2);
-
-		        /* Create property record for property "S" */
-		        kv = &(nob->instance.props[0]);
-		        kv->key = strsave("S");
-		        kv->type = PROP_STRING;
-		        /* Value is set to "<node1>/<node2>" */
-		        kv->value.string = (char *)MALLOC(strlen(nodename1) +
-				strlen(nodename2) + 2);
-		        sprintf(kv->value.string, "%s/%s", nodename1, nodename2);
-
-		        /* End of property list */
-		        kv = &(nob->instance.props[1]);
-		        kv->key = NULL;
-		        kv->type = PROP_ENDLIST;
-		        kv->value.ival = 0;
-
-		        nob->next = obp->next;
-		        obp->next = nob;
-		     }
 		     break;
-	          }
+		  }
+		  else if (!strcmp(kv->key, "_tag")) {
+		     int l = strlen(kv->value.string);
+		     char *newstr = (char *)MALLOC(l + 2);
+		     sprintf(newstr, "S%s", kv->value.string);
+		     FREE(kv->value.string);
+		     kv->value.string = newstr;
+		     break;
+		  }
 	       }
 	    }
 
@@ -3182,13 +3484,18 @@ void CombineSerial(char *model, int file)
 
 	    /* Excise the 2nd instance.  instlist[i][1] remains as the	*/
 	    /* only pointer to it.					*/
-            for (obp = instlist[i][0]; obp->next->type != FIRSTPIN; obp = obp->next);
+            for (obp = instlist[i][0]; obp->next->type > FIRSTPIN ||
+			obp->next->type == PROPERTY; obp = obp->next);
             for (ob2 = obp; ob2->next != instlist[i][1]; ob2 = ob2->next);
-	    for (obs = ob2->next; obs->next && obs->next->type != FIRSTPIN;
-			obs = obs->next);
+	    for (obs = ob2->next; obs->next && (obs->next->type > FIRSTPIN
+			|| obs->next->type == PROPERTY); obs = obs->next);
 	    ob2->next = obs->next;
 	    if (obs->next) obs->next = NULL;	// Terminate 2nd instance record
 
+	    /* If 1st device has unbalanced 'open' records, then add 'close'	*/
+	    /* records to the 2nd device to balance.				*/
+            add_balancing_close(instlist[i][0], instlist[i][1]);
+
 	    /* Move property record(s) of the 2nd device to the first */
 	    for (obs = instlist[i][1]; obs && obs->type != PROPERTY; obs = obs->next);
 	    while (obs && (obs->type == PROPERTY)) {
@@ -3201,10 +3508,19 @@ void CombineSerial(char *model, int file)
 	    /* If 2nd device appears anywhere else in the serial device	*/
 	    /* list, replace it with the 1st device.			*/
 	    for (j = i + 1; j <= tp->nodename_cache_maxnodenum; j++) {
+               if (instlist[j] == NULL) continue;
+
 	       if (instlist[j][0] == instlist[i][1])
 		  instlist[j][0] = instlist[i][0];
 	       if (instlist[j][1] == instlist[i][1])
 		  instlist[j][1] = instlist[i][0];
+
+               /* If instlist[j]'s two entries point to the same device */
+	       /* then invalidate it.					*/
+	       if (instlist[j][0] == instlist[j][1]) {
+		  FREE(instlist[j]);
+		  instlist[j] = NULL;
+	       }
 	    }
 
 	    /* Free 2nd device's object */
@@ -3228,6 +3544,7 @@ void CombineSerial(char *model, int file)
       }
    }
    FREE(instlist);
+   return scnt;
 }
 
 /*----------------------------------------------------------------------*/

base/netgen.h

@@ -33,8 +33,9 @@ extern struct property *PropertyDouble(char *name, int fnum, char *key,
 extern struct property *PropertyInteger(char *name, int fnum, char *key,
 		int slop, int pdefault);
 extern struct property *PropertyString(char *name, int fnum, char *key,
-		int range, char *pdefault);
+		double slop, char *pdefault);
 extern int  PropertyDelete(char *name, int fnum, char *key);
+extern void SetParallelCombine(int value);
 extern int  PropertyTolerance(char *name, int fnum, char *key, int ival,
 		double dval);
 extern int  PropertyMerge(char *name, int fnum, char *key, int merge_type);
@@ -53,6 +54,8 @@ extern void PortList(char *prefix, char *list_template);
 extern char *Cell(char *inststr, char *model, ...);
 extern int  IsIgnored(char *, int);
 
+extern int auto_blackbox;	/* For handling empty subcircuits */
+
 /* netcmp.c */
 extern struct nlist *LookupClassEquivalent(char *model, int file1, int file2);
 extern void AssignCircuits(char *name1, int file1, char *name2, int file2);
@@ -100,9 +103,9 @@ extern char *Res(char *fname, char *inststr, char *, char *);
 extern char *XLine(char *fname, char *inststr, char *, char *, char *, char *);
 extern char *Inductor(char *fname, char *inststr, char *, char *);
 
-extern int StringIsValue(char *);
+extern int  StringIsValue(char *);
 extern char *ConvertParam(char *);
-extern int ConvertStringToFloat(char *, double *);
+extern int  ConvertStringToFloat(char *, double *);
 extern char *ScaleStringFloatValue(char *, double);
 extern void join(char *node1, char *node2);
 extern void Connect(char *tplt1, char *tplt2);
@@ -116,8 +119,8 @@ extern void FlattenCurrent();
 extern void ConvertGlobals(char *name, int fnum);
 extern int  CleanupPins(char *name, int fnum);
 extern void ConnectAllNodes(char *model, int fnum);
-extern void CombineParallel(char *model, int fnum);
-extern void CombineSerial(char *model, int fnum);
+extern int  CombineParallel(char *model, int fnum);
+extern int  CombineSerial(char *model, int fnum);
 extern int  NoDisconnectedNodes;
 extern int  PropertyKeyMatch(char *, char *);
 extern int  PropertyValueMatch(char *, char *);
@@ -132,6 +135,7 @@ extern int IgnoreRC;	  /* set this to 1 to ignore capacitance and resistance */
 extern int NoOutput;      /* set this to 1 to disable stdout output */
 extern int Composition;	  /* direction of composition */
 extern int UnixWildcards; /* TRUE if *,?,{},[] only; false if full REGEXP */
+extern int GlobalParallelNone;	/* If TRUE, don't parallel combine any cells */
 /* magic internal flag to restrict searches to recently placed cells */
 extern int QuickSearch;
 /* does re"CellDef"ing a cell add to it or overwrite it??? */

base/ntk.c

@@ -186,7 +186,7 @@ char *ReadNtk (char *fname, int *fnum)
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
     SetExtension(name, fname, NTK_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Printf("No file: %s\n",name);
+      Printf("Error in ntk file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    

base/objlist.c

@@ -563,8 +563,11 @@ static int PrintCellHashTableElement(struct hashlist *p)
     /* only print primitive cells if Debug is enabled */
     if (Debug == 1)  Printf("Cell: %s (instanced %d times); Primitive\n",
 		       ptr->name, ptr->number);
+    else if (Debug == 3) {	/* list */
+       Tcl_AppendElement(netgeninterp, ptr->name);
+    }
   }
-  else if (Debug == 2) {	/* list only */
+  else if ((Debug == 2) || (Debug == 3)) {	/* list only */
 #ifdef TCL_NETGEN
      Tcl_AppendElement(netgeninterp, ptr->name);
 #else
@@ -595,7 +598,7 @@ void PrintCellHashTable(int full, int filenum)
 
   bins  = RecurseHashTable(&cell_dict, CountHashTableBinsUsed);
   total = RecurseHashTable(&cell_dict, CountHashTableEntries);
-  if (full != 2)
+  if (full < 2)
      Printf("Hash table: %d of %d bins used; %d cells total (%.2f per bin)\n",
 		bins, CELLHASHSIZE, total, (bins == 0) ? 0 :
 		(float)((float)total / (float)bins));
@@ -605,7 +608,7 @@ void PrintCellHashTable(int full, int filenum)
   RecurseHashTable(&cell_dict, PrintCellHashTableElement);
   Debug = OldDebug;
 #ifndef TCL_NETGEN
-  if (full == 2) Printf("\n");
+  if (full >= 2) Printf("\n");
 #endif
 }
 

base/objlist.h

@@ -104,10 +104,12 @@ struct valuelist {
 /* Part 3:  Keys & Defaults (kept in the cell record as a hash table) */
 
 #define MERGE_NONE	0	/* Property does not change when devices merge */
-#define MERGE_ADD	1	/* Properties sum with device merge */
-#define MERGE_ADD_CRIT	2	/* Properties sum with device merge */
+#define MERGE_ADD	1	/* Properties sum with device parallel merge */
+#define MERGE_ADD_CRIT	2	/* Properties sum with device parallel merge */
 #define MERGE_PAR	3	/* Properties add in parallel with device merge */
 #define MERGE_PAR_CRIT	4	/* Properties add in parallel with device merge */
+#define MERGE_SER	5	/* Properties sum with device parallel merge */
+#define MERGE_SER_CRIT	6	/* Properties sum with device parallel merge */
 
 /* Note:  A "critical" merge means that the property causes the number of	*/
 /* devices to change.  e.g., transistor width is critical;  transistor drain	*/
@@ -213,10 +215,10 @@ struct nlist {
 #define CELL_PROPSMATCHED	0x10	/* properties matched to matching cell */
 #define CELL_DUPLICATE		0x20	/* cell has a duplicate */
 
-/* Flags for combination allowances */
+/* Flags for combination allowances and prohibitions */
 
-#define COMB_SERIAL		0x20
-#define COMB_PARALLEL		0x40
+#define COMB_SERIAL		0x40
+#define COMB_NO_PARALLEL	0x80
 
 extern struct nlist *CurrentCell;
 extern struct objlist *CurrentTail;

base/spice.c

@@ -25,8 +25,10 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdarg.h>  /* what about varargs, like in pdutils.c ??? */
 #endif
 
-#ifdef IBMPC
-#include <stdlib.h>  /* for calloc(), free() */
+#include <stdlib.h>  /* for calloc(), free(), getenv() */
+#ifndef IBMPC
+#include <sys/types.h>	/* for getpwnam() tilde expansion */
+#include <pwd.h>
 #endif
 
 #ifdef TCL_NETGEN
@@ -42,6 +44,10 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 // Global storage for parameters from .PARAM
 struct hashdict spiceparams;
 
+// Global setting for auto-detect of empty subcircuits as
+// black-box subcells.
+int auto_blackbox = FALSE;
+
 // Check if a token represents a numerical value (with
 // units) or an expression.  This is basically a hack
 // to see if it either passes StringIsValue() or is
@@ -398,6 +404,7 @@ int renamepins(struct hashlist *p, int file)
 
 void CleanupSubcell() {
    int maxnode = 0;
+   int has_devices = FALSE;
    struct objlist *sobj, *nobj, *lobj, *pobj;
 
    if (CurrentCell == NULL) return;
@@ -409,6 +416,8 @@ void CleanupSubcell() {
    lobj = NULL;
    for (sobj = CurrentCell->cell; sobj != NULL;) {
       nobj = sobj->next;
+      if (sobj->type == FIRSTPIN)
+	 has_devices = TRUE;
       if (sobj->node < 0) {
          if (IsGlobal(sobj)) {
  	    if (lobj != NULL)
@@ -437,6 +446,8 @@ void CleanupSubcell() {
          lobj = sobj;
       sobj = nobj;
    }
+   if ((has_devices == FALSE) && (auto_blackbox == TRUE))
+      SetClass(CLASS_MODULE);
 }
 
 /*------------------------------------------------------*/
@@ -615,7 +626,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	    }
 	    SpiceTokNoNewline();
          }
-         SetClass((blackbox) ? CLASS_MODULE : CLASS_SUBCKT);
+	 SetClass((blackbox) ? CLASS_MODULE : CLASS_SUBCKT);
 
 	 if (hasports == 0) {
 	    // If the cell defines no ports, then create a proxy
@@ -743,7 +754,7 @@ skip_ends:
       SpiceSkipNewLine();
     }
     else if (matchnocase(nexttok, ".INCLUDE")) {
-      char *iname, *iptr, *quotptr, *pathend;
+      char *iname, *iptr, *quotptr, *pathend, *userpath = NULL;
 
       SpiceTokNoNewline();
       if (nexttok == NULL) continue;	/* Ignore if no filename */
@@ -755,12 +766,44 @@ skip_ends:
       pathend = strrchr(fname, '/');
       iptr = nexttok;
       while (*iptr == '\'' || *iptr == '\"' || *iptr == '`') iptr++;
-      if ((pathend != NULL) && (*iptr != '/')) {
+      if ((pathend != NULL) && (*iptr != '/') && (*iptr != '~')) {
 	 *pathend = '\0';
 	 iname = (char *)MALLOC(strlen(fname) + strlen(iptr) + 2);
 	 sprintf(iname, "%s/%s", fname, iptr);
 	 *pathend = '/';
       }
+#ifndef IBMPC
+      else if ((*iptr == '~') && (*(iptr + 1) == '/')) {
+	 /* For ~/<path>, substitute tilde from $HOME */
+	 userpath = getenv("HOME");
+	 iname = (char *)MALLOC(strlen(userpath) + strlen(iptr));
+	 sprintf(iname, "%s%s", userpath, iptr + 1);
+      }
+      else if (*iptr == '~') {
+	 /* For ~<user>/<path>, substitute tilde from getpwnam() */
+	 struct passwd *passwd;
+	 char *pathstart;
+         pathstart = strchr(iptr, '/');
+	 if (pathstart) *pathstart = '\0';
+	 passwd = getpwnam(iptr + 1);
+	 if (passwd != NULL) {
+	    userpath = passwd->pw_dir;
+	    if (pathstart) {
+	       *pathstart = '/';
+	       iname = (char *)MALLOC(strlen(userpath) + strlen(pathstart) + 1);
+	       sprintf(iname, "%s%s", userpath, pathstart);
+	    }
+	    else {
+	       /* Almost certainly an error, but make the substitution anyway */
+	       iname = STRDUP(userpath);
+	    }
+	 }
+	 else {
+	    /* Probably an error, but copy the filename verbatim */
+	    iname = STRDUP(iptr);
+	 }
+      }
+#endif
       else
 	 iname = STRDUP(iptr);
 
@@ -795,7 +838,7 @@ skip_ends:
 	    kl->key = strsave(nexttok);
 	    kl->idx = 0;
 	    kl->type = PROP_STRING;
-	    kl->slop.ival = 0;
+	    kl->slop.dval = 0.0;
 	    kl->pdefault.string = strsave(eqptr + 1);
 	    HashPtrInstall(nexttok, kl, &spiceparams);
 	 }
@@ -1808,7 +1851,7 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
 
     SetExtension(name, fname, SPICE_EXTENSION);
     if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-      Fprintf(stderr,"No file: %s\n",name);
+      Fprintf(stderr,"Error in SPICE file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
     }    
@@ -1903,7 +1946,7 @@ void IncludeSpice(char *fname, int parent, struct cellstack **CellStackPtr,
 
         SetExtension(name, fname, SPICE_EXTENSION);
         if ((filenum = OpenParseFile(name, parent)) < 0) {
-           Fprintf(stderr,"No file: %s\n",name);
+           Fprintf(stderr,"Error in SPICE file read: No file %s\n",name);
            return;
         }    
      }

base/xnetgen.c

@@ -271,7 +271,7 @@ void initialize_netcmp_datastructures(Widget w, Widget textwidget,
 {
   X_START();
   Printf("Comparing cells '%s' and '%s'\n", get_cell(), get_other());
-  CreateTwoLists(get_cell(), get_other());
+  CreateTwoLists(get_cell(), get_other(), 0);
   Permute();
 #ifdef DEBUG_ALLOC
   PrintCoreStats();

tcltk/netgen.tcl.in

@@ -26,6 +26,333 @@ if {${tcl_version} >= 8.6} {
    load TCL_DIR/tclnetgenSHDLIB_EXT
 }
 
+#----------------------------------------------------------------
+# Convert LVS list result into a JSON file 
+#----------------------------------------------------------------
+
+proc netgen::convert_to_json {filename lvs_final} {
+   set pidx [string last . $filename]
+   set jsonname [string replace $filename $pidx end ".json"]
+   if {![catch {open $jsonname w} fjson]} {
+      puts $fjson "\["
+      # Outer list is of each cell compared
+      set clen [llength $lvs_final]
+      set cidx 0
+      foreach circuit $lvs_final {
+         incr cidx
+         puts $fjson "  \{"
+         set nkeys [llength $circuit]
+         set kidx 0
+	 foreach {key value} $circuit {
+            incr kidx 2
+	    switch $key {
+	       name {
+	          puts $fjson "   \"${key}\": \["
+		  set cktval [lindex $value 0]
+		  puts $fjson "      \"${cktval}\","
+		  set cktval [lindex $value 1]
+		  puts $fjson "      \"${cktval}\""
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       pins {
+	          puts $fjson "   \"${key}\": \["
+	          puts $fjson "      \["
+		  set cktval [lindex $value 0]
+		  foreach pin [lrange $cktval 0 end-1] {
+		     puts $fjson "        \"$pin\","
+		  }
+		  set pin [lindex $cktval end]
+		  puts $fjson "        \"$pin\""
+	          puts $fjson "      \], \["
+		  set cktval [lindex $value 1]
+		  foreach pin [lrange $cktval 0 end-1] {
+		     puts $fjson "        \"$pin\","
+		  }
+		  set pin [lindex $cktval end]
+		  puts $fjson "        \"$pin\""
+	          puts $fjson "      \]"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+               nets {
+	          puts $fjson "   \"${key}\": \["
+		  set cktval [lindex $value 0]
+		  puts $fjson "    $cktval,"
+		  set cktval [lindex $value 1]
+		  puts $fjson "    $cktval"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+               }
+	       devices {
+	          puts $fjson "   \"${key}\": \["
+	          puts $fjson "       \["
+		  set cktval [lindex $value 0]
+		  foreach dev [lrange $cktval 0 end-1] {
+		     set devname [lindex $dev 0]
+		     set devnum  [lindex $dev 1]
+		     puts $fjson "         \[\"${devname}\", ${devnum}\],"
+		  }
+		  set dev [lindex $cktval end]
+		  set devname [lindex $dev 0]
+		  set devnum  [lindex $dev 1]
+		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
+	          puts $fjson "       \], \["
+		  set cktval [lindex $value 1]
+		  foreach dev [lrange $cktval 0 end-1] {
+		     set devname [lindex $dev 0]
+		     set devnum  [lindex $dev 1]
+		     puts $fjson "         \[\"${devname}\", ${devnum} \],"
+		  }
+		  set dev [lindex $cktval end]
+		  set devname [lindex $dev 0]
+		  set devnum  [lindex $dev 1]
+		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
+	          puts $fjson "       \]"
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       goodnets -
+	       badnets {
+	          puts $fjson "   \"${key}\": \["
+		  set glen [llength $value]
+		  set gidx 0
+		  foreach group $value {
+		     incr gidx
+	             puts $fjson "      \["
+	             puts $fjson "        \["
+		     set cktval [lindex $group 0]
+		     set nlen [llength $cktval]
+		     set nidx 0
+		     foreach net $cktval {
+			incr nidx
+	                puts $fjson "          \["
+			set netname [lindex $net 0]
+		        puts $fjson "            \"$netname\","
+		        puts $fjson "            \["
+			set netconn [lindex $net 1]
+			foreach fanout [lrange $netconn 0 end-1] {
+			   set devname [lindex $fanout 0]
+			   set pinname [lindex $fanout 1]
+			   set count [lindex $fanout 2]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
+			}
+			set fanout [lindex $netconn end]
+			set devname [lindex $fanout 0]
+			set pinname [lindex $fanout 1]
+			set count [lindex $fanout 2]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$nidx == $nlen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \], \["
+		     set cktval [lindex $group 1]
+		     set nlen [llength $cktval]
+		     set nidx 0
+		     foreach net $cktval {
+			incr nidx
+	                puts $fjson "          \["
+			set netname [lindex $net 0]
+		        puts $fjson "            \"$netname\","
+		        puts $fjson "            \["
+			set netconn [lindex $net 1]
+			foreach fanout [lrange $netconn 0 end-1] {
+			   set devname [lindex $fanout 0]
+			   set pinname [lindex $fanout 1]
+			   set count [lindex $fanout 2]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
+			}
+			set fanout [lindex $netconn end]
+			set devname [lindex $fanout 0]
+			set pinname [lindex $fanout 1]
+			set count [lindex $fanout 2]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$nidx == $nlen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \]"
+		     if {$gidx == $glen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       goodelements -
+	       badelements {
+	          puts $fjson "   \"${key}\": \["
+		  set glen [llength $value]
+		  set gidx 0
+		  foreach group $value {
+		     incr gidx
+	             puts $fjson "      \["
+	             puts $fjson "        \["
+		     set cktval [lindex $group 0]
+		     set ilen [llength $cktval]
+		     set iidx 0
+		     foreach inst $cktval {
+			incr iidx
+	                puts $fjson "          \["
+			set instname [lindex $inst 0]
+		        puts $fjson "            \"$instname\","
+		        puts $fjson "            \["
+			set instpins [lindex $inst 1]
+			foreach fanout [lrange $instpins 0 end-1] {
+			   set pinname [lindex $fanout 0]
+			   set count [lindex $fanout 1]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$pinname\", $count \],"
+			}
+			set fanout [lindex $instpins end]
+			set pinname [lindex $fanout 0]
+			set count [lindex $fanout 1]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$iidx == $ilen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \], \["
+		     set cktval [lindex $group 1]
+		     set ilen [llength $cktval]
+		     set iidx 0
+		     foreach inst $cktval {
+			incr iidx
+	                puts $fjson "          \["
+			set instname [lindex $inst 0]
+		        puts $fjson "            \"$instname\","
+		        puts $fjson "            \["
+			set instpins [lindex $inst 1]
+			foreach fanout [lrange $instpins 0 end-1] {
+			   set pinname [lindex $fanout 0]
+			   set count [lindex $fanout 1]
+			   if {$count == {}} {set count 0}
+		           puts $fjson "              \[ \"$pinname\", $count \],"
+			}
+			set fanout [lindex $instpins end]
+			set pinname [lindex $fanout 0]
+			set count [lindex $fanout 1]
+			if {$count == {}} {set count 0}
+		        puts $fjson "              \[ \"$pinname\", $count \]"
+		        puts $fjson "            \]"
+			if {$iidx == $ilen} {
+	                   puts $fjson "          \]"
+			} else {
+	                   puts $fjson "          \],"
+			}
+		     }
+	             puts $fjson "        \]"
+		     if {$gidx == $glen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	       properties {
+	          puts $fjson "   \"${key}\": \["
+		  set plen [llength $value]
+                  set pidx 0
+		  foreach instance $value {
+		     incr pidx
+	             puts $fjson "      \["
+		     set instnames [lindex $instance 0]
+		     set instname0 [lindex $instnames 0]
+	             puts $fjson "         \["
+		     puts $fjson "           \"${instname0}\","
+	             puts $fjson "           \["
+		     foreach property [lrange $instance 1 end-1] {
+		        set prop0 [lindex $property 0]
+			set propname [lindex $prop0 0]
+			set propval [lindex $prop0 1]
+		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
+		     }
+		     set property [lindex $instance end]
+		     set prop0 [lindex $property 0]
+		     set propname [lindex $prop0 0]
+		     set propval [lindex $prop0 1]
+		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
+	             puts $fjson "           \]"
+	             puts $fjson "         \],"
+		     set instname1 [lindex $instnames 1]
+	             puts $fjson "         \["
+		     puts $fjson "           \"${instname1}\","
+	             puts $fjson "           \["
+		     foreach property [lrange $instance 1 end-1] {
+		        set prop1 [lindex $property 1]
+			set propname [lindex $prop1 0]
+			set propval [lindex $prop1 1]
+		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
+		     }
+		     set property [lindex $instance end]
+		     set prop1 [lindex $property 1]
+		     set propname [lindex $prop1 0]
+		     set propval [lindex $prop1 1]
+		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
+	             puts $fjson "           \]"
+	             puts $fjson "         \]"
+		     if {$pidx == $plen} {
+	                puts $fjson "      \]"
+		     } else {
+	                puts $fjson "      \],"
+		     }
+		  }
+		  if {$kidx == $nkeys} {
+		     puts $fjson "   \]"
+		  } else {
+		     puts $fjson "   \],"
+		  }
+	       }
+	    }
+	 }
+         if {$cidx == $clen} {
+            puts $fjson "  \}"
+	 } else {
+            puts $fjson "  \},"
+	 }
+      }
+      puts $fjson "\]"
+   }
+   close $fjson
+}
+
 #----------------------------------------------------------------
 # Define the "lvs" command as a way of calling the netgen options
 # for standard compare, essentially the same as the old "netcomp"
@@ -34,9 +361,30 @@ if {${tcl_version} >= 8.6} {
 # Use the "canonical" command to parse the file and cell names,
 # although if the cells have not been read in yet, then the
 # original syntax of filename or {filename cellname} is required.
+#
+# "args" is passed to verify and may therefore contain only the
+# value "-list" or nothing.  If "-list", then output is returned
+# as a nested list.
 #----------------------------------------------------------------
 
-proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
+proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
+   set dolist 0
+   set dojson 0
+   foreach arg $args {
+      if {$arg == "-list"} {
+	 puts stdout "Generating list result"
+	 set dolist 1
+	 set lvs_final {}
+      } elseif {$arg == "-json"} {
+	 puts stdout "Generating JSON file result"
+	 set dolist 1
+	 set dojson 1
+	 set lvs_final {}
+      } elseif {$arg == "-blackbox"} {
+	 puts stdout "Treating empty subcircuits as black-box cells"
+	 netgen::model blackbox on
+      }
+   }
 
    # Allow name1 or name2 to be a list of {filename cellname},
    # A single <filename>, or any valid_cellname form if the
@@ -137,24 +485,40 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
    netgen::log file $logfile
    netgen::log start
    netgen::log echo off
-   set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   if {$dolist == 1} {
+      set endval [netgen::compare -list hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   } else {
+      set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
+   }
    if {$endval == {}} {
       netgen::log put "No cells in queue!\n"
       return
    }
    set properr {}
    while {$endval != {}} {
-      netgen::run converge
+      if {$dolist == 1} {
+         netgen::run -list converge
+      } else {
+         netgen::run converge
+      }
       netgen::log echo on
       if {[verify equivalent]} {
 	 # Resolve automorphisms by pin and property
-         netgen::run resolve
+	 if {$dolist == 1} {
+            netgen::run -list resolve
+	 } else {
+            netgen::run resolve
+	 }
 	 set uresult [verify unique]
          if {$uresult == 0} {
 	    netgen::log put "   Networks match locally but not globally.\n"
 	    netgen::log put "   Probably connections are swapped.\n"
 	    netgen::log put "   Check the end of logfile ${logfile} for implicated nodes.\n"
-	    netgen::verify nodes
+	    if {$dolist == 1} {
+	       verify -list nodes
+	    } else {
+	       verify nodes
+	    }
 
 	    # Flatten the non-matching subcircuit (but not the top-level cells)
             if {[netgen::print queue] != {}} {
@@ -183,17 +547,28 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
 	 }
       }
       netgen::log echo off
-      set endval [netgen::compare hierarchical]
+      if {$dolist == 1} {
+         catch {lappend lvs_final $lvs_out}
+         set lvs_out {}
+         set endval [netgen::compare -list hierarchical]
+      } else {
+         set endval [netgen::compare hierarchical]
+      }
    }
    netgen::log echo off
    puts stdout "Result: " nonewline
    netgen::log echo on
-   netgen::verify only
+   verify only
    if {$properr != {}} {
       netgen::log put "The following cells had property errors: $properr\n"
    }
    netgen::log end
    puts stdout "LVS Done."
+   if {$dojson == 1} {
+      netgen::convert_to_json $logfile $lvs_final
+   } elseif {$dolist == 1} {
+      return $lvs_final
+   }
 }
 
 # It is important to make sure no netgen commands overlap with Tcl built-in

tcltk/tclnetgen.c

@@ -497,7 +497,9 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 		fnum = -1;
 	    }
 	    else
-		filename = Tcl_GetString(fobj);
+		/* Both file numbers have been provided, so a	*/
+		/* filename is not required.			*/
+		filename = NULL;
 	}
 	else {
 	    filename = NULL;
@@ -1435,9 +1437,9 @@ _netgen_cells(ClientData clientData,
    char *optstart;
    int filenum = -1;
    struct nlist *np = NULL;
-   int result, dolist = 0;
+   int result, printopt, dolist = 0, doall = 0, dotop = 0;
 
-   if (objc > 1) {
+   while (objc > 1) {
       optstart = Tcl_GetString(objv[1]);
       if (*optstart == '-') optstart++;
       if (!strcmp(optstart, "list")) {
@@ -1445,27 +1447,41 @@ _netgen_cells(ClientData clientData,
 	 objv++;
 	 objc--;
       }
+      else if (!strcmp(optstart, "all")) {
+	 doall = 1;
+	 objv++;
+	 objc--;
+      }
+      else if (!strcmp(optstart, "top")) {
+	 dotop = 1;
+	 objv++;
+	 objc--;
+      }
+      else {
+	 result = CommonParseCell(interp, objv[1], &np, &filenum);
+	 if (result != TCL_OK) return result;
+	 objv++;
+	 objc--;
+      }
    }
 
-   if (objc == 1) {
-      PrintCellHashTable((dolist) ? 2 : 0, -1);
-   }
-   else if (objc != 2) {
-      Tcl_WrongNumArgs(interp, 1, objv, "[list] [-all|-top|valid_filename]");
+   if (objc != 1) {
+      Tcl_WrongNumArgs(interp, 1, objv, "[list] [-top] [-all] [valid_filename]");
       return TCL_ERROR;
    }
    else {
       Tcl_Obj *lobj;
 
-      repstr = Tcl_GetString(objv[1]);
-      if (!strncmp(repstr, "-top", 4)) {
+      if (dotop) {
 	 if (dolist)
 	     lobj = Tcl_NewListObj(0, NULL);
 	 else
 	     Fprintf(stdout, "Top level cells: ");
 	 np = FirstCell();
 	 while (np != NULL) {
-	    if (np->flags & CELL_TOP) {
+	    if ((np->flags & CELL_TOP) && ((filenum == -1) ||
+			(np->file == filenum))) {
+		
 		if (dolist)
 		    Tcl_ListObjAppendElement(interp, lobj,
 			Tcl_NewStringObj(np->name, -1));
@@ -1481,11 +1497,13 @@ _netgen_cells(ClientData clientData,
 
 	 return TCL_OK;
       }
-      else if (strncmp(repstr, "-all", 4)) {
-	 result = CommonParseCell(interp, objv[1], &np, &filenum);
-	 if (result != TCL_OK) return result;
+      else {
+	 if (dolist)
+	    printopt = (doall) ? 3 : 2;
+	 else
+	    printopt = (doall) ? 1 : 0;
+         PrintCellHashTable(printopt, filenum);
       }
-      PrintCellHashTable((dolist) ? 2 : 1, filenum);
    }
    return TCL_OK;
 }
@@ -1526,8 +1544,27 @@ _netgen_model(ClientData clientData,
       return TCL_ERROR;
    }
 
+   /* Check for "model blackbox on|off"	*/
+   /* Behavior is to treat empty subcircuits as blackbox cells */
+
+   if ((objc > 1) && !strcmp(Tcl_GetString(objv[1]), "blackbox")) {
+      if ((objc > 2) && !strcmp(Tcl_GetString(objv[2]), "on")) {
+	 auto_blackbox = TRUE;
+	 return TCL_OK;
+      }
+      else if ((objc > 2) && !strcmp(Tcl_GetString(objv[2]), "off")) {
+	 auto_blackbox = FALSE;
+	 return TCL_OK;
+      }
+      else if (objc == 2) {
+	 Tcl_SetObjResult(interp, Tcl_NewBooleanObj(auto_blackbox));
+	 return TCL_OK;
+      }
+   }
+
    result = CommonParseCell(interp, objv[1], &tp, &fnum);
-   if (result != TCL_OK) return result;
+   if (result != TCL_OK)
+      return result;
 
    if (objc == 3) {
       model = Tcl_GetString(objv[2]);
@@ -1639,6 +1676,13 @@ _netgen_model(ClientData clientData,
 	    retclass = modelclasses[SUBCKT_IDX];
 	    break;
 
+	 case CLASS_MODULE:
+	    if (auto_blackbox)
+		retclass = modelclasses[BLACKBOX_IDX];
+	    else
+		retclass = modelclasses[MODULE_IDX];
+	    break;
+
 	 default: /* (includes case CLASS_UNDEF) */
 	    retclass = modelclasses[UNDEF_IDX];
 	    break;
@@ -1937,13 +1981,24 @@ int
 _netcmp_compare(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-   char *name1, *name2, *file1, *file2;
-   int fnum1, fnum2;
+   char *name1, *name2, *file1, *file2, *optstart;
+   int fnum1, fnum2, dolist = 0;
    int dohierarchy = FALSE;
    int assignonly = FALSE;
    int argstart = 1, qresult, llen, result;
    struct Correspond *nextcomp;
    struct nlist *tp;
+   Tcl_Obj *flist = NULL;
+
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc > 1) {
       if (!strncmp(Tcl_GetString(objv[argstart]), "assign", 6)) {
@@ -2022,10 +2077,6 @@ _netcmp_compare(ClientData clientData,
       return TCL_ERROR;
    }
 
-   // WIP!
-   // CleanupPins(name1, fnum1);		// Remove unconnected pins
-   // CleanupPins(name2, fnum2);		// Remove unconnected pins
-
    UniquePins(name1, fnum1);		// Check for and remove duplicate pins
    UniquePins(name2, fnum2);		// Check for and remove duplicate pins
 
@@ -2035,22 +2086,15 @@ _netcmp_compare(ClientData clientData,
       ConvertGlobals(name2, fnum2);
    }
 
-   // Run cleanup a 2nd time;  this corrects for cells that have no ports
-   // but define global nodes that are brought out as ports by
-   // ConvertGlobals().
-
-   // WIP!
-   // CleanupPins(name1, fnum1);
-   // CleanupPins(name2, fnum2);
-
-   CreateTwoLists(name1, fnum1, name2, fnum2);
+   CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
    while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
       Fprintf(stdout, "Making another compare attempt.\n");
-      CreateTwoLists(name1, fnum1, name2, fnum2);
+      CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
    }
 
    // Return the names of the two cells being compared, if doing "compare
-   // hierarchical"
+   // hierarchical".  If "-list" was specified, then append the output
+   // to the end of the list.
 
    if (dohierarchy) {
       Tcl_Obj *lobj;
@@ -2248,6 +2292,19 @@ _netcmp_run(ClientData clientData,
    };
    int result, index;
    int automorphisms;
+   char *optstart;
+   int dolist;
+
+   dolist = 0;
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc == 1)
       index = RESOLVE_IDX;
@@ -2266,8 +2323,13 @@ _netcmp_run(ClientData clientData,
 	 else {
 	    enable_interrupt();
 	    while (!Iterate() && !InterruptPending);
-	    _netcmp_verify(clientData, interp, 1, NULL);
+	    if (dolist) {
+	       result = _netcmp_verify(clientData, interp, 2, objv - 1);
+	    }
+	    else
+	       result = _netcmp_verify(clientData, interp, 1, NULL);
 	    disable_interrupt();
+	    if (result != TCL_OK) return result;
 	 }
 	 break;
       case RESOLVE_IDX:
@@ -2310,7 +2372,7 @@ _netcmp_run(ClientData clientData,
 	    }
 	    if (PropertyErrorDetected) {
 	       Fprintf(stdout, "There were property errors.\n");
-	       PrintPropertyResults();
+	       PrintPropertyResults(dolist);
 	    }
 	    disable_interrupt();
          }
@@ -2324,9 +2386,17 @@ _netcmp_run(ClientData clientData,
 /* Syntax: netgen::verify [option]			*/
 /* 	options: nodes, elements, only, all,		*/
 /*		 equivalent, or unique.			*/
+/* 	option "-list" may be used with nodes, elements	*/
+/*		 all, or no option.			*/
 /* Formerly: v						*/
 /* Results:						*/
+/*	For only, equivalent, unique:  Return 1 if 	*/
+/*	verified, zero if not.				*/
 /* Side Effects:					*/
+/*	For options elements, nodes, and all without	*/
+/*	option -list:  Write output to log file.	*/
+/*	For -list options, append list to global	*/
+/*	variable "lvs_out", if it exists.		*/
 /*------------------------------------------------------*/
 
 int
@@ -2339,8 +2409,23 @@ _netcmp_verify(ClientData clientData,
    enum OptionIdx {
       NODE_IDX, ELEM_IDX, PROP_IDX, ONLY_IDX, ALL_IDX, EQUIV_IDX, UNIQUE_IDX
    };
+   char *optstart;
    int result, index = -1;
    int automorphisms;
+   int dolist = 0;
+   Tcl_Obj *egood, *ebad, *ngood, *nbad;
+
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 egood = ngood = NULL;
+	 ebad = nbad = NULL;
+	 objv++;
+	 objc--;
+      }
+   }
 
    if (objc != 1 && objc != 2) {
       Tcl_WrongNumArgs(interp, 1, objv,	
@@ -2371,14 +2456,28 @@ _netcmp_verify(ClientData clientData,
 	 if (objc == 1 || index == NODE_IDX || index == ALL_IDX) {
 	     if (Debug == TRUE)
 	        PrintIllegalNodeClasses();	// Old style
-	     else
-	        FormatIllegalNodeClasses();	// Side-by-side
+	     else {
+	        FormatIllegalNodeClasses(); // Side-by-side, to log file
+	        if (dolist) {
+	           nbad = ListNodeClasses(FALSE);	// As Tcl nested list
+#if 0
+	           ngood = ListNodeClasses(TRUE);	// As Tcl nested list
+#endif
+		}
+	     }
 	 }
 	 if (objc == 1 || index == ELEM_IDX || index == ALL_IDX) {
 	     if (Debug == TRUE)
 	        PrintIllegalElementClasses();	// Old style
-	     else
-	        FormatIllegalElementClasses();	// Side-by-side
+	     else {
+	        FormatIllegalElementClasses();	// Side-by-side, to log file
+	        if (dolist) {
+	           ebad = ListElementClasses(FALSE); // As Tcl nested list
+#if 0
+	           egood = ListElementClasses(TRUE); // As Tcl nested list
+#endif
+		}
+	     }
 	 }
 	 disable_interrupt();
 	 if (index == EQUIV_IDX || index == UNIQUE_IDX)
@@ -2409,9 +2508,57 @@ _netcmp_verify(ClientData clientData,
 		   Fprintf(stdout, "Property errors were found.\n");
 	    }
 	 }
-         if ((index == PROP_IDX) && (PropertyErrorDetected != 0)) {
-	    PrintPropertyResults();
+#if 0
+	 if (dolist) {
+	    ngood = ListNodeClasses(TRUE);	// As Tcl nested list
+	    egood = ListElementClasses(TRUE);	// As Tcl nested list
 	 }
+#endif
+         if ((index == PROP_IDX) && (PropertyErrorDetected != 0)) {
+	    PrintPropertyResults(dolist);
+	 }
+      }
+   }
+
+   /* If "dolist" has been specified, then return the	*/
+   /* list-formatted output.  For "verify nodes" or	*/
+   /* "verify elements", return the associated list.	*/
+   /* For "verify" or "verify all", return a nested	*/
+   /* list of {node list, element list}.		*/
+
+   if (dolist)
+   {
+      if (objc == 1 || index == NODE_IDX || index == ALL_IDX) {
+	 if (nbad == NULL) nbad = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("badnets", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, nbad,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#if 0
+	 if (ngood == NULL) ngood = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("goodnets", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, ngood,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#endif
+      }
+      if (objc == 1 || index == ELEM_IDX || index == ALL_IDX) {
+	 if (ebad == NULL) ebad = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("badelements", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, ebad,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#if 0
+	 if (egood == NULL) egood = Tcl_NewListObj(0, NULL);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL,
+		Tcl_NewStringObj("goodelements", -1),
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+	 Tcl_SetVar2Ex(interp, "lvs_out", NULL, egood,
+		TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
+#endif
       }
    }
    return TCL_OK;
@@ -2572,13 +2719,23 @@ _netcmp_equate(ClientData clientData,
       NODE_IDX, ELEM_IDX, CLASS_IDX, PINS_IDX
    };
    int result, index;
-   char *name1 = NULL, *name2 = NULL;
-   struct nlist *tp1, *tp2;
+   char *name1 = NULL, *name2 = NULL, *optstart;
+   struct nlist *tp1, *tp2, *SaveC1, *SaveC2;
    struct objlist *ob1, *ob2;
    int file1, file2;
-   int i, l1, l2, ltest, lent;
+   int i, l1, l2, ltest, lent, dolist = 0;
    Tcl_Obj *tobj1, *tobj2, *tobj3;
 
+   if (objc > 1) {
+      optstart = Tcl_GetString(objv[1]);
+      if (*optstart == '-') optstart++;
+      if (!strcmp(optstart, "list")) {
+	 dolist = 1;
+	 objv++;
+	 objc--;
+      }
+   }
+
    if ((objc != 2) && (objc != 4) && (objc != 6)) {
       Tcl_WrongNumArgs(interp, 1, objv, "?nodes|elements|classes|pins? name1 name2");
       return TCL_ERROR;
@@ -2734,7 +2891,7 @@ _netcmp_equate(ClientData clientData,
 	 break;
 
       case PINS_IDX:
-	 if (ElementClasses == NULL) {
+	 if ((ElementClasses == NULL) && (auto_blackbox == FALSE)) {
 	    if (CurrentCell == NULL)
 		Fprintf(stderr, "Equate elements:  no current cell.\n");
 	    Fprintf(stderr, "Equate pins:  cell %s and/or %s has no elements.\n",
@@ -2742,19 +2899,30 @@ _netcmp_equate(ClientData clientData,
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
 	    return TCL_OK;
 	 }
-	 if (tp1 == Circuit1 && tp2 == Circuit2) {
-	    if (MatchPins(tp1, tp2)) {
-	       Fprintf(stdout, "Cell pin lists are equivalent.\n");
-	       Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
-	    }
-	    else {
-	       Fprintf(stdout, "Cell pin lists for %s and %s altered to match.\n",
-			name1, name2);
-	       Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-	    }
+	 else if (ElementClasses == NULL) {
+	    /* This has been called outside of a netlist compare,	*/
+	    /* probably to force name matching of pins on black-box	*/
+	    /* devices.  But MatchPins only works if tp1 == Circuit1	*/
+	    /* and tp2 == Circuit2, so preserve these values and 	*/
+	    /* recover afterward (what a hack).				*/
+	    SaveC1 = Circuit1;
+	    SaveC2 = Circuit2;
+	    Circuit1 = tp1;
+	    Circuit2 = tp2;
+	 }
+	 if (MatchPins(tp1, tp2, dolist)) {
+	    Fprintf(stdout, "Cell pin lists are equivalent.\n");
+	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
 	 }
 	 else {
-	    Fprintf(stderr, "Function not yet defined outside of LVS scope.\n");
+	    Fprintf(stdout, "Cell pin lists for %s and %s altered to match.\n",
+			name1, name2);
+	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
+	 }
+	 if (ElementClasses == NULL) {
+	    /* Recover temporarily set global variables (see above) */
+	    Circuit1 = SaveC1;
+	    Circuit2 = SaveC2;
 	 }
 	 break;
 
@@ -2973,6 +3141,17 @@ _netcmp_equate(ClientData clientData,
 /*	merge	  --- set property merge behavior	*/
 /* or							*/
 /*	netgen::property default			*/
+/* or							*/
+/*	netgen::property <device>|<model> <option>	*/
+/*		yes|no					*/
+/* Where <option> is one of:				*/
+/*     serial	--- allow/prohibit serial combination	*/
+/*     parallel --- allow/prohibit parallel combination	*/
+/* or							*/
+/*	netgen::property parallel none			*/
+/*		--- prohibit parallel combinations by	*/
+/*		    default.				*/
+/*							*/
 /* Formerly: (none)					*/
 /* Results:						*/
 /* Side Effects:					*/
@@ -2990,10 +3169,12 @@ _netcmp_property(ClientData clientData,
     int ival, argstart;
 
     char *options[] = {
-	"add", "create", "remove", "delete", "tolerance", "merge", NULL
+	"add", "create", "remove", "delete", "tolerance", "merge", "serial",
+	"parallel", NULL
     };
     enum OptionIdx {
-	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX, MERGE_IDX
+	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX, MERGE_IDX,
+	SERIAL_IDX, PARALLEL_IDX
     };
     int result, index, idx2;
 
@@ -3005,10 +3186,18 @@ _netcmp_property(ClientData clientData,
     };
 
     char *mergeoptions[] = {
-	"none", "add", "add_critical", "par", "par_critical", NULL
+	"none", "add", "add_critical", "par", "par_critical",
+	"parallel", "parallel_critical", "ser_critical", "ser",
+	"serial_critical", "serial", NULL
     };
     enum MergeOptionIdx {
-	NONE_IDX, ADD_ONLY_IDX, ADD_CRIT_IDX, PAR_ONLY_IDX, PAR_CRIT_IDX
+	NONE_IDX, ADD_ONLY_IDX, ADD_CRIT_IDX,
+	PAR_ONLY_IDX, PAR_CRIT_IDX, PAR2_ONLY_IDX, PAR2_CRIT_IDX,
+	SER_CRIT_IDX, SER_IDX, SER2_CRIT_IDX, SER2_IDX
+    };
+    char *yesno[] = {
+	"on", "yes", "true", "enable", "allow",
+	"off", "no", "false", "disable", "prohibit", NULL
     };
 
     if (objc < 2) {
@@ -3025,8 +3214,8 @@ _netcmp_property(ClientData clientData,
 	/* compare source/drain area and perimeter.		*/
 
 	tp = FirstCell();
-	 while (tp != NULL) {
-	     switch (tp->class) {
+	while (tp != NULL) {
+	    switch (tp->class) {
 		case CLASS_NMOS: case CLASS_PMOS: case CLASS_FET3:
 		case CLASS_NMOS4: case CLASS_PMOS4: case CLASS_FET4:
 		case CLASS_FET:
@@ -3037,7 +3226,9 @@ _netcmp_property(ClientData clientData,
 		    PropertyDelete(tp->name, tp->file, "pd");
 		    break;
 		case CLASS_RES: case CLASS_RES3:
-		    PropertyMerge(tp->name, tp->file, "l", MERGE_PAR_CRIT);
+		    PropertyMerge(tp->name, tp->file, "w", MERGE_ADD_CRIT);
+		    PropertyMerge(tp->name, tp->file, "l", MERGE_SER_CRIT);
+		    tp->flags |= COMB_SERIAL;
 		    break;
 		case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3:
 		    // NOTE:  No attempt to combine area, width, or length;
@@ -3046,12 +3237,29 @@ _netcmp_property(ClientData clientData,
 		    break;
 		case CLASS_INDUCTOR:
 		    PropertyMerge(tp->name, tp->file, "value", MERGE_PAR_CRIT);
+		    tp->flags |= COMB_SERIAL;
 		    break;
 	    }
 	    tp = NextCell();
 	}
 	return TCL_OK;
     }
+    else if ((objc == 3) && (!strcmp(Tcl_GetString(objv[1]), "parallel"))) {
+	if (!strcmp(Tcl_GetString(objv[2]), "none")) {
+	    GlobalParallelNone = TRUE;
+	    SetParallelCombine(FALSE);
+	}
+	else if (!strcmp(Tcl_GetString(objv[2]), "all")) {
+	    GlobalParallelNone = FALSE;
+	    SetParallelCombine(TRUE);
+	}
+	else {
+	    Tcl_SetResult(interp, "Bad option, should be property parallel none|all",
+			NONE);
+	    return TCL_ERROR;
+	}
+	return TCL_OK;
+    }
 
     result = CommonParseCell(interp, objv[1], &tp, &fnum);
     if (result != TCL_OK) return result;
@@ -3101,6 +3309,45 @@ _netcmp_property(ClientData clientData,
 	    argstart = 3;
 
 	switch (index) {
+	    case SERIAL_IDX:
+	    case PARALLEL_IDX:
+                if (objc == 3) {
+		    if (index == SERIAL_IDX) {
+			tobj1 = Tcl_NewBooleanObj((tp->flags & COMB_SERIAL) ? 1 : 0);
+			Tcl_SetObjResult(interp, tobj1);
+			return TCL_OK;
+		    }
+		    else {
+			tobj1 = Tcl_NewBooleanObj((tp->flags & COMB_NO_PARALLEL) ? 0 : 1);
+			Tcl_SetObjResult(interp, tobj1);
+			return TCL_OK;
+		    }
+		}
+		else if (objc == 4) {
+		    if (Tcl_GetIndexFromObj(interp, objv[3],
+				(CONST84 char **)yesno,
+				"combine", 0, &idx2) != TCL_OK) {
+		        Tcl_WrongNumArgs(interp, 3, objv, "enable|disable");
+		        return TCL_ERROR;
+                    }
+                    if (idx2 <= 4) {	/* true, enable, etc. */
+			if (index == SERIAL_IDX)
+			    tp->flags |= COMB_SERIAL;
+			else
+			    tp->flags &= ~COMB_NO_PARALLEL;
+		    }
+		    else {	/* false, disable, etc. */
+			if (index == SERIAL_IDX)
+			    tp->flags &= ~COMB_SERIAL;
+			else
+			    tp->flags |= COMB_NO_PARALLEL;
+		    }
+		}
+		else {
+		    Tcl_WrongNumArgs(interp, 2, objv, "serial|parallel enable|disable");
+		    return TCL_ERROR;
+		}
+		break;
 
 	    case ADD_IDX:
 	    case CREATE_IDX:
@@ -3304,11 +3551,21 @@ _netcmp_property(ClientData clientData,
 				mergeval = MERGE_ADD_CRIT;
 				break;
 			    case PAR_ONLY_IDX:
+			    case PAR2_ONLY_IDX:
 				mergeval = MERGE_PAR;
 				break;
 			    case PAR_CRIT_IDX:
+			    case PAR2_CRIT_IDX:
 				mergeval = MERGE_PAR_CRIT;
 				break;
+			    case SER_CRIT_IDX:
+			    case SER2_CRIT_IDX:
+				mergeval = MERGE_SER_CRIT;
+				break;
+			    case SER_IDX:
+			    case SER2_IDX:
+				mergeval = MERGE_SER;
+				break;
 			}
 			PropertyMerge(tp->name, fnum, Tcl_GetString(tobj1), mergeval);
 		    }