Update at Thu Aug 10 22:41:12 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.71
+1.5.85

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.c

@@ -5002,10 +5002,12 @@ PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print,
 
    /* Find the first property record of each circuit.  obn1, obn2 are	*/
    /* the last device record before the properties for each device.	*/
-   for (tp1 = ob1; (tp1 != NULL) && tp1->type >= FIRSTPIN; tp1 = tp1->next)
+   for (tp1 = ob1->next; (tp1 != NULL) && tp1->type > FIRSTPIN; tp1 = tp1->next)
       obn1 = tp1;
-   for (tp2 = ob2; (tp2 != NULL) && tp2->type >= FIRSTPIN; tp2 = tp2->next)
+   for (tp2 = ob2->next; (tp2 != NULL) && tp2->type > FIRSTPIN; tp2 = tp2->next)
       obn2 = tp2;
+   if (tp1 && (tp1->type == FIRSTPIN)) tp1 = NULL;	/* tp1 had no properties */
+   if (tp2 && (tp2->type == FIRSTPIN)) tp2 = NULL;	/* tp2 had no properties */
 
    /* Check if there are any properties to match */
 
@@ -5076,7 +5078,6 @@ PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print,
 	 // t1 has no properties.  See if t2's properties are required
 	 // to be checked.  If so, flag t2 instance as unmatched
 
-	 mismatches++;
 	 for (i = 0;; i++) {
 	    vl2 = &(tp2->instance.props[i]);
 	    if (vl2->type == PROP_ENDLIST) break;
@@ -5086,6 +5087,7 @@ PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print,
 	    if (kl2 != NULL) break;	// Property is required
 	 }
 	 if (vl2->type != PROP_ENDLIST) {
+	    mismatches++;
 	    if (do_print) Fprintf(stdout, "Circuit 2 %s instance %s has no"
 			" property match in circuit 1.\n",
 			Circuit2->name, inst2);
@@ -6272,6 +6274,7 @@ struct nlist *addproxies(struct hashlist *p, void *clientdata)
 int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 {
    char *cover, *ctemp;
+   char *bangptr1, *bangptr2;
    struct objlist *ob1, *ob2, *obn, *obp, *ob1s, *ob2s, *obt;
    struct NodeClass *NC;
    struct Node *N1, *N2;
@@ -6373,11 +6376,11 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 			   if (Debug == 0) {
 			      for (m = 0; m < 43; m++) *(ostr + m) = ' ';
 			      for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-			      sprintf(ostr, "%s", obn->name);
+			      snprintf(ostr, 43, "%s", obn->name);
 			      if (!strcasecmp(obn->name, obp->name))
-			         sprintf(ostr + 44, "%s", obp->name);
+			         snprintf(ostr + 44, 43, "%s", obp->name);
 			      else
-			         sprintf(ostr + 44, "%s **Mismatch**", obp->name);
+			         snprintf(ostr + 44, 43, "%s **Mismatch**", obp->name);
 			      for (m = 0; m < 88; m++)
 				 if (*(ostr + m) == '\0') *(ostr + m) = ' ';
 			      Fprintf(stdout, ostr);
@@ -6411,8 +6414,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 			   if (strcmp(obn->name, "(no pins)")) {
 			      for (m = 0; m < 43; m++) *(ostr + m) = ' ';
 			      for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-			      sprintf(ostr, "%s", obn->name);
-			      sprintf(ostr + 44, "(no matching pin)");
+			      snprintf(ostr, 32, "%s", obn->name);
+			      snprintf(ostr + 44, 43, "(no matching pin)");
 			      for (m = 0; m < 88; m++)
 				 if (*(ostr + m) == '\0') *(ostr + m) = ' ';
 			      Fprintf(stdout, ostr);
@@ -6456,8 +6459,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 		  if (Debug == 0) {
 		     for (m = 0; m < 43; m++) *(ostr + m) = ' ';
 		     for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-		     sprintf(ostr, "%s", obn->name);
-		     sprintf(ostr + 44, "(no matching pin)");
+		     snprintf(ostr, 43, "%s", obn->name);
+		     snprintf(ostr + 44, 43, "(no matching pin)");
 		     for (m = 0; m < 88; m++)
 			if (*(ostr + m) == '\0') *(ostr + m) = ' ';
 		     Fprintf(stdout, ostr);
@@ -6484,13 +6487,25 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 
    /* Do any unmatched pins have the same name? 		  */
    /* (This should not happen if unconnected pins are eliminated) */
+   /* (Semi-hack: Allow "!" global flag) */
 
    ob1 = tc1->cell;
+   bangptr1 = strrchr(ob1->name, '!');
+   if (bangptr1 && (*(bangptr1 + 1) == '\0'))
+      *bangptr1 = '\0';
+   else bangptr1 = NULL;
+  
    for (i = 0; i < numorig; i++) {
       if (*(cover + i) == (char)0) {
 	 j = 0;
          for (ob2 = tc2->cell; ob2 != NULL; ob2 = ob2->next) {
 	    if (!IsPort(ob2)) break;
+
+	    bangptr2 = strrchr(ob2->name, '!');
+	    if (bangptr2 && (*(bangptr2 + 1) == '\0'))
+	       *bangptr2 = '\0';
+	    else bangptr2 = NULL;
+
 	    if ((*matchfunc)(ob1->name, ob2->name)) {
 	       ob2->model.port = i;		/* save order */
 	       *(cover + i) = (char)1;
@@ -6498,8 +6513,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	       if (Debug == 0) {
 		  for (m = 0; m < 43; m++) *(ostr + m) = ' ';
 		  for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-		  sprintf(ostr, "%s", ob1->name);
-		  sprintf(ostr + 44, "%s", ob2->name);
+		  snprintf(ostr, 43, "%s", ob1->name);
+		  snprintf(ostr + 44, 43, "%s", ob2->name);
 		  for (m = 0; m < 88; m++)
 		     if (*(ostr + m) == '\0') *(ostr + m) = ' ';
 		  Fprintf(stdout, ostr);
@@ -6519,11 +6534,13 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	       }
 #endif
 	    }
+	    if (bangptr2) *bangptr2 = '!';
 	    j++;
 	 }
       }
       ob1 = ob1->next;
    }
+   if (bangptr1) *bangptr1 = '!';
 
    /* Find the end of the pin list in tc1, for adding proxy pins */
 
@@ -6545,8 +6562,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	    if (strcmp(ob2->name, "(no pins)")) {
 	       for (m = 0; m < 43; m++) *(ostr + m) = ' ';
 	       for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-	       sprintf(ostr, "(no matching pin)");
-	       sprintf(ostr + 44, "%s", ob2->name);
+	       snprintf(ostr, 43, "(no matching pin)");
+	       snprintf(ostr + 44, 43, "%s", ob2->name);
 	       for (m = 0; m < 88; m++)
 		  if (*(ostr + m) == '\0') *(ostr + m) = ' ';
 	       Fprintf(stdout, ostr);
@@ -6595,8 +6612,14 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
          obn->model.port = -1;
          obn->instance.name = NULL;
          obn->node = -1;
-         obn->next = ob1->next;
-         ob1->next = obn;
+	 if (ob1 == tc1->cell) {
+	    obn->next = ob1;
+	    tc1->cell = obn;
+	 }
+	 else {
+            obn->next = ob1->next;
+            ob1->next = obn;
+	 }
          ob1 = obn;
 	 hasproxy1 = 1;
 
@@ -6653,8 +6676,15 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
          obn->model.port = (i - j);
          obn->instance.name = NULL;
          obn->node = -1;
-         obn->next = ob2->next;
-         ob2->next = obn;
+
+	 if (ob2 == tc2->cell) {
+	    obn->next = ob2;
+	    tc2->cell = obn;
+	 }
+	 else {
+            obn->next = ob2->next;
+            ob2->next = obn;
+	 }
          ob2 = obn;
 	 hasproxy2 = 1;
 
@@ -6694,7 +6724,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 
    /* Clean up "UNKNOWN" records from Circuit1 */
 
-   for (obn = tc1->cell; ; obn = obn->next) {
+   for (obn = tc1->cell; obn; obn = obn->next) {
       if (obn->type == UNKNOWN) obn->type = PORT;
       else if (obn->type != PORT) break;
    }
@@ -6713,13 +6743,13 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 
    /* Clean up "UNKNOWN" records from Circuit2 */
 
-   for (obn = tc2->cell; ; obn = obn->next) {
+   for (obn = tc2->cell; obn; obn = obn->next) {
       if (obn->type == UNKNOWN) obn->type = PORT;
       else if (obn->type != PORT) break;
    }
 
    /* Check for ports that did not get ordered */
-   for (obn = tc2->cell; obn->type == PORT; obn = obn->next) {
+   for (obn = tc2->cell; obn && (obn->type == PORT); obn = obn->next) {
       if (obn->model.port == -1) {
 	 if (obn->node == -1) {
 	    // This only happens when pins have become separated from any net.

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.			*/
 /*----------------------------------------------------------------------*/
@@ -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;
@@ -3306,11 +3333,6 @@ int CombineSerial(char *model, int file)
    int i, j, scnt = 0;
    struct valuelist *kv;
 
-   // To avoid posting a non-working version, serial combination is
-   // disabled here until code is finished to compare the serial/parallel
-   // property networks.
-   // return 0;
-
    if ((tp = LookupCellFile(model, file)) == NULL) {
       Printf("Cell: %s does not exist.\n", model);
       return -1;
@@ -3387,11 +3409,10 @@ int CombineSerial(char *model, int file)
 	    /* a parameter '_tag', string value set to "+".		*/
 
             for (obn = instlist[i][1]; obn->next &&
-			obn->next->type != PROPERTY &&
-			obn->next->type != FIRSTPIN; obn = obn->next);
+			obn->next->type > FIRSTPIN; obn = obn->next);
 	    obp = obn->next;
 
-	    if (obp == NULL || obp->type == FIRSTPIN) {
+	    if (obp == NULL || obp->type != PROPERTY) {
 	       struct objlist *nob;
 	       /* No property record, so insert one */
 	       nob = GetObject();
@@ -3463,10 +3484,11 @@ int 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
 

base/netgen.h

@@ -35,6 +35,7 @@ extern struct property *PropertyInteger(char *name, int fnum, char *key,
 extern struct property *PropertyString(char *name, int fnum, char *key,
 		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);
@@ -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/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/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);
 

tcltk/netgen.tcl.in

@@ -84,9 +84,9 @@ proc netgen::convert_to_json {filename lvs_final} {
                nets {
 	          puts $fjson "   \"${key}\": \["
 		  set cktval [lindex $value 0]
-		  puts $fjson "    \"$cktval\","
+		  puts $fjson "    $cktval,"
 		  set cktval [lindex $value 1]
-		  puts $fjson "    \"$cktval\""
+		  puts $fjson "    $cktval"
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -194,15 +194,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -275,15 +273,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -326,9 +322,9 @@ proc netgen::convert_to_json {filename lvs_final} {
 		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
 		     }
 		     set property [lindex $instance end]
-		     set prop0 [lindex $property 0]
-		     set propname [lindex $prop0 0]
-		     set propval [lindex $prop0 1]
+		     set prop1 [lindex $property 1]
+		     set propname [lindex $prop1 0]
+		     set propval [lindex $prop1 1]
 		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
 	             puts $fjson "           \]"
 	             puts $fjson "         \]"
@@ -374,7 +370,6 @@ proc netgen::convert_to_json {filename lvs_final} {
 proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
    set dolist 0
    set dojson 0
-   puts stdout "Diagnostic version"
    foreach arg $args {
       if {$arg == "-list"} {
 	 puts stdout "Generating list result"
@@ -385,6 +380,9 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
 	 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
       }
    }
 

tcltk/tclnetgen.c

@@ -1437,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")) {
@@ -1447,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));
@@ -1483,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;
 }
@@ -1528,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]);
@@ -1641,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;
@@ -2678,10 +2720,10 @@ _netcmp_equate(ClientData clientData,
    };
    int result, index;
    char *name1 = NULL, *name2 = NULL, *optstart;
-   struct nlist *tp1, *tp2;
+   struct nlist *tp1, *tp2, *SaveC1, *SaveC2;
    struct objlist *ob1, *ob2;
    int file1, file2;
-   int i, l1, l2, ltest, lent, dolist;
+   int i, l1, l2, ltest, lent, dolist = 0;
    Tcl_Obj *tobj1, *tobj2, *tobj3;
 
    if (objc > 1) {
@@ -2849,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",
@@ -2857,20 +2899,30 @@ _netcmp_equate(ClientData clientData,
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
 	    return TCL_OK;
 	 }
-	 if (tp1 == Circuit1 && tp2 == Circuit2) {
-	    int result;
-	    if (MatchPins(tp1, tp2, dolist)) {
-	       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 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;
 
@@ -3093,8 +3145,12 @@ _netcmp_equate(ClientData clientData,
 /*	netgen::property <device>|<model> <option>	*/
 /*		yes|no					*/
 /* Where <option> is one of:				*/
-/*     serial	 --- allow/prohibit serial combination	*/
+/*     serial	--- allow/prohibit serial combination	*/
 /*     parallel --- allow/prohibit parallel combination	*/
+/* or							*/
+/*	netgen::property parallel none			*/
+/*		--- prohibit parallel combinations by	*/
+/*		    default.				*/
 /*							*/
 /* Formerly: (none)					*/
 /* Results:						*/
@@ -3188,6 +3244,22 @@ _netcmp_property(ClientData clientData,
 	}
 	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;