Merge branch 'master' into netgen-1.5

VERSION

@@ -1 +1 @@
-1.5.312
+1.5.306

base/actel.c

@@ -22,7 +22,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <strings.h>
 #include <ctype.h>
 #ifdef IBMPC
 #include <stdlib.h>  /* for strtol on PC */

base/flatten.c

@@ -300,6 +300,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       return 0;
     }
   }
+  /* Placeholder cells must not be flattened */
+  if (ThisCell->flags & CELL_PLACEHOLDER) return 0;
 
   FreeNodeNames(ThisCell);
 
@@ -337,10 +339,6 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 	   LastObj = ParentParams;
 	   continue;
       }
-      if (ChildCell->flags & CELL_PLACEHOLDER) {
-	   LastObj = ParentParams;
-	   continue;	// Placeholder cells must not be flattened
-      }
       if (ChildCell == ThisCell) {
 	   LastObj = ParentParams;
 	   continue;	// Avoid infinite loop
@@ -1755,8 +1753,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
 				" makes a better match\n", ecomp->cell1->name,
 				name1, file1);
-		    if (flattenInstancesOf(name1, file1, ecomp->cell1->name) > 0)
-			modified1++;
+		    flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		    modified1++;
 		}
 		else if (ecomp->cell1 && (ecomp->num1 > 0)) {
 		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
@@ -1768,8 +1766,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
 				" makes a better match\n", ecomp->cell2->name,
 				name2, file2);
-		    if (flattenInstancesOf(name2, file2, ecomp->cell2->name) > 0)
-			modified2++;
+		    flattenInstancesOf(name2, file2, ecomp->cell2->name); 
+		    modified2++;
 		}
 		else if (ecomp->cell2 && (ecomp->num2 > 0)) {
 		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
@@ -1863,8 +1861,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    	Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
 				" makes a better match\n", ecomp->cell2->name,
 				name2, file2);
-		    	if (flattenInstancesOf(name2, file2, ecomp->cell2->name) > 0)
-			    modified2++;
+		    	flattenInstancesOf(name2, file2, ecomp->cell2->name); 
+		    	modified2++;
 		    }
 		    else if (ecomp->cell2) {
 			Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
@@ -1934,8 +1932,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    	Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
 				" makes a better match\n", ecomp->cell1->name,
 				name1, file1);
-		    	if (flattenInstancesOf(name1, file1, ecomp->cell1->name) > 0)
-			    modified1++;
+		    	flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		        modified1++;
 		    }
 		    else if (ecomp->cell1) {
 			Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
@@ -2297,12 +2295,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 				    Fprintf(stdout, "Flattening instances of %s in cell"
 						" %s (%d) makes a better match\n",
 						ecompX0->cell1->name, name1, file1);
-				    if (flattenInstancesOf(name1, file1,
-						ecompX0->cell1->name) > 0) {
-					ecompX0->num1 = 0;
-					ecomp0X->num1 += ecompX0->num1;
-					modified1++;
-				    }
+				    flattenInstancesOf(name1, file1,
+						ecompX0->cell1->name); 
+				    ecompX0->num1 = 0;
+				    ecomp0X->num1 += ecompX0->num1;
+				    modified1++;
 				}
 				else
 				{
@@ -2334,12 +2331,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 				    Fprintf(stdout, "Flattening instances of %s in cell"
 						" %s (%d) makes a better match\n",
 						ecomp0X->cell2->name, name2, file2);
-				    if (flattenInstancesOf(name2, file2,
-						ecomp0X->cell2->name) > 0) {
-					ecomp0X->num2 = 0;
-					ecompX0->num2 += ecomp0X->num2;
-					modified2++;
-				    }
+				    flattenInstancesOf(name2, file2,
+						ecomp0X->cell2->name); 
+				    ecomp0X->num2 = 0;
+				    ecompX0->num2 += ecomp0X->num2;
+				    modified2++;
 				}
 				else {
 				    Fprintf(stdout, "Flattening instances of %s in "

base/netcmp.c

@@ -24,7 +24,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdarg.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <strings.h> /* for strncasecmp() */
 #include <time.h>    /* for time() as a seed for random number generator */
 #include <limits.h>
 #include <math.h>    /* for fabs() */
@@ -3582,7 +3581,7 @@ int FlattenUnmatched(struct nlist *tc, char *parent, int stoplevel, int loclevel
 				tc->name, parent, tc->file);
       changed = flattenInstancesOf(parent, tc->file, tc->name);
       Fprintf(stdout, "(%d instance%s)\n", changed, ((changed == 1) ? "" : "s"));
-      return (changed != 0);
+      return 1;
    }
 
    if (tc->cell == NULL) return 0;
@@ -7544,11 +7543,6 @@ struct nlist *addproxies(struct hashlist *p, void *clientdata)
 	     }
 	     else {
 		lob = ob;
-		if (ob == NULL) {
-		    Fprintf(stdout, "Error:  Premature end of pin list on "
-			"instance %s.\n", firstpin->instance.name);
-		    break;
-		}
 		ob->type = i++;
 		ob = ob->next;
 	     }

base/netgen.c

@@ -25,8 +25,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdio.h>
 #include <stdlib.h>	/* for strtof() */
 #include <stdarg.h>
-#include <string.h>
-#include <strings.h>
 #include <ctype.h>	/* toupper() */
 #ifdef IBMPC
 #include <alloc.h>

base/spice.c

@@ -21,9 +21,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
 #if 0
 #include <stdarg.h>  /* what about varargs, like in pdutils.c ??? */
 #endif

base/verilog.c

@@ -76,8 +76,7 @@ struct hashdict verilogparams;
 // Global storage for verilog definitions
 struct hashdict verilogdefs;
 // Record file pointer that is associated with the hash tables
-int hashfilep = -1;	/* for parameters */
-int hashfiled = -1;	/* for definitions */
+int hashfile = -1;
 
 // Global storage for wire buses
 struct hashdict buses;
@@ -157,8 +156,7 @@ struct expr_stack {
 //-------------------------------------------------------------------------
 // Evaluate an expression for an array bound.  This is much like
 // ReduceOneExpression() in netgen.c, but only handles basic integer
-// arithmetic (+,-,*,/), grouping by parentheses, bit shifts, and
-// if-else operators.
+// arithmetic (+,-,*,/) and grouping by parentheses.
 //
 // Returns 1 if successful, 0 on error.
 // Evaluated result is placed in the integer pointed to by "valptr".
@@ -222,39 +220,6 @@ int EvalExpr(struct expr_stack **stackptr, int *valptr)
 	    }
 	}
 
-	/* Reduce (a << b) and (a >> b) */
-
-	for (texp = start; texp; texp = texp->next) {
-	    if ((texp->last != NULL) && (texp->next != NULL) && (texp->oper != '\0')) {
-		if ((texp->last->oper == '\0') && (texp->next->oper == '\0')) {
-		    if (texp->oper == '<') {
-			/* Left shift */
-			texp->last->value <<= texp->next->value;
-			/* Remove two items from the stack */
-			tmp = texp;
-			texp = texp->last;
-			texp->next = tmp->next->next;
-			if (tmp->next->next) tmp->next->next->last = texp;
-			FREE(tmp->next);
-			FREE(tmp);
-			modified = TRUE;
-		    }
-		    if (texp->oper == '>') {
-			/* Right shift */
-			texp->last->value >>= texp->next->value;
-			/* Remove two items from the stack */
-			tmp = texp;
-			texp = texp->last;
-			texp->next = tmp->next->next;
-			if (tmp->next->next) tmp->next->next->last = texp;
-			FREE(tmp->next);
-			FREE(tmp);
-			modified = TRUE;
-		    }
-		} 
-	    }
-	}
-
 	/* Reduce (a * b) and (a / b) */
 
 	for (texp = start; texp; texp = texp->next) {
@@ -330,39 +295,6 @@ int EvalExpr(struct expr_stack **stackptr, int *valptr)
 	    }
 	}
 
-	/* Reduce (a ? b : c) */
-
-	for (texp = start; texp; texp = texp->next) {
-	    /* There must be at least five objects on the stack */
-	    if ((texp->last != NULL) && (texp->next != NULL) && (texp->oper != '\0')
-			&& (texp->next->next != NULL)
-			&& (texp->next->next->next != NULL)) {
-		if ((texp->last->oper == '\0') && (texp->next->oper == '\0')
-			&& (texp->next->next->next->oper == '\0')) {
-		    if ((texp->oper == '?') && (texp->next->next->oper == ':')) {
-			/* If-Else conditional */
-			if (texp->last->value)
-			    texp->last->value = texp->next->value;
-			else
-			    texp->last->value = texp->next->next->next->value;
-
-			/* Remove four items from the stack */
-			tmp = texp;
-			texp = texp->last;
-			texp->next = tmp->next->next->next->next;
-			if (tmp->next->next->next->next)
-			    tmp->next->next->next->next->last = texp;
-			FREE(tmp->next->next->next);
-			FREE(tmp->next->next);
-			FREE(tmp->next);
-			FREE(tmp);
-
-			modified = TRUE;
-		    }
-		} 
-	    }
-	}
-
 	/* Reduce (a) */
 
 	for (texp = start; texp; texp = texp->next) {
@@ -441,15 +373,8 @@ int ParseIntegerExpression(char *expr, int *iptr)
 
 	if (match(sptr, "+") || match(sptr, "-")
 	    	|| match(sptr, "*") || match(sptr, "/")
-	    	|| match(sptr, "(") || match(sptr, ")")
-	    	|| match(sptr, "<<") || match(sptr, ">>")
-	    	|| match(sptr, "?") || match(sptr, ":")) {
+	    	|| match(sptr, "(") || match(sptr, ")")) {
 	    newexp = (struct expr_stack *)MALLOC(sizeof(struct expr_stack));
-	    /* Note that "oper" is one character and that "<<" and ">>"
-	     * become '<' and '>', respectively.  The less-than and greater-
-	     * than operators are not (yet) handled but will need to be
-	     * recast to some other character in "oper".
-	     */
 	    newexp->oper = *sptr;
 	    newexp->value = 0;
 	    newexp->next = NULL;
@@ -464,7 +389,7 @@ int ParseIntegerExpression(char *expr, int *iptr)
 	if ((result = sscanf(sptr, "%d", &value)) != 1) {
 
 	    // Is name in the parameter list?
-	    kl = (struct property *)HashLookup(sptr, &verilogparams);
+	    kl = (struct property *)HashLookup(nexttok, &verilogparams);
 	    if (kl == NULL) {
 		Printf("Value %s in expression is not a number or a parameter.\n",
 				sptr);
@@ -477,29 +402,27 @@ int ParseIntegerExpression(char *expr, int *iptr)
 		    if (result != 1) {
 		        Printf("Parameter %s has value %s that cannot be parsed"
 				" as an integer.\n",
-				sptr, kl->pdefault.string);
+				nexttok, kl->pdefault.string);
 		    	value = 0;
 			break;
 		    }
 		}
 		else if (kl->type == PROP_INTEGER) {
 		    value = kl->pdefault.ival;
-		    result = 1;		// Assert valid result
 		}
 		else if (kl->type == PROP_DOUBLE) {
 		    value = (int)kl->pdefault.dval;
 		    if ((double)value != kl->pdefault.dval) {
 		        Printf("Parameter %s has value %g that cannot be parsed"
 				" as an integer.\n",
-				sptr, kl->pdefault.dval);
+				nexttok, kl->pdefault.dval);
 		    	value = 0;
 			break;
 		    }
-		    result = 1;		// Assert valid result
 		}
 		else {
 		    Printf("Parameter %s has unknown type; don't know how"
-				" to parse.\n", sptr);
+				" to parse.\n", nexttok);
 		    value = 0;
 		    break;
 		}
@@ -593,8 +516,7 @@ int GetBusTok(struct bus *wb)
 	    }
 	    else if (match(nexttok, "+") || match(nexttok, "-")
 	    		|| match(nexttok, "*") || match(nexttok, "/")
-	    		|| match(nexttok, "(") || match(nexttok, ")")
-	    		|| match(nexttok, "<<") || match(nexttok, ">>")) {
+	    		|| match(nexttok, "(") || match(nexttok, ")")) {
 		newexp = (struct expr_stack *)MALLOC(sizeof(struct expr_stack));
 		newexp->oper = *nexttok;
 		newexp->value = 0;
@@ -1957,8 +1879,7 @@ skip_endmodule:
 	// Allowed uses of "assign" for netlists:
 	//    "assign a = b" joins two nets.
 	//    "assign a = {b, c, ...}" creates a bus from components.
-	//    "assign" using if-else constructs or bit shifts.
-	//   ("assign" using any other boolean arithmetic is not structural verilog.)
+	//    "assign" using any boolean arithmetic is not structural verilog.
 	//    "assign a = {x{b}}" creates a bus by repeating a component.
 
 	if (nexttok && match(nexttok, "=")) {
@@ -2219,19 +2140,6 @@ nextinst:
 	 }
 	 SkipTokComments(VLOG_DELIMITERS);
       }
-      else if (loop.loopvar != NULL) {
-	 /* Instances created within a generate block for loop have an
-	  * implicit array
-	  */
-	 int loopval;
-	 struct property *klr;
-
-	 klr = (struct property *)HashLookup(loop.loopvar, &verilogparams);
-	 loopval = klr->pdefault.ival;
-
-         arraystart = arrayend = loopval;
-         sprintf(instancename + strlen(instancename), "[%d]", loopval);
-      }
 
       if (match(nexttok, "(")) {
 	 char savetok = (char)0;
@@ -2294,8 +2202,7 @@ nextinst:
 			 strcat(new_wire_bundle, nexttok);
 			 FREE(wire_bundle);
 			 wire_bundle = new_wire_bundle;
-			 if (!strcmp(nexttok, "}"))
-			    break;
+			 if (!strcmp(nexttok, "}")) break;
 			 SkipTokComments(VLOG_PIN_CHECK_DELIMITERS);
 		     }
 		     if (!nexttok) {
@@ -2671,7 +2578,6 @@ nextinst:
 	 char *brackptr;
 	 int j;
 	 char locinst[MAX_STR_LEN];
-	 int arraypos = (arraystart > arrayend) ? arraymax - i : i;
 
          if (i != -1)
 	    sprintf(locinst, "%s[%d]", instancename, i);
@@ -2721,14 +2627,7 @@ nextinst:
 	       else if (GetBus(scan->net, &wb) == 0) {
 		   char *bptr2;
 		   char *scanroot;
-		   int isbundle = FALSE;
-		   /* Skip over a bundle delimiter */
-		   if (*scan->net == '{') {
-		      scanroot = strsave(scan->net + 1);
-		      isbundle = TRUE;
-		   }
-		   else
-		      scanroot = strsave(scan->net);
+		   scanroot = strsave(scan->net);
 		   brackptr = strvchr(scanroot, '[');
 		   if (brackptr) *brackptr = '\0';
 
@@ -2761,7 +2660,6 @@ nextinst:
 		   else {
 		       // Instance must be an array
 		       char netname[MAX_STR_LEN];
-		       char *spos = scanroot;
 		       int slice, portlen, siglen;
 
 		       /* Get the array size of the port for bit slicing */
@@ -2773,49 +2671,27 @@ nextinst:
 		       if (siglen < 0) siglen = -siglen;
 		       siglen++;
 
-		       // If this is a bundle, then count out to the current
-		       // slice and read off the index.  NOTE:  Need to
-		       // handle multiple bits per bundle entry!
-		       if (isbundle) {
-			   int j;
-			   if (brackptr) *brackptr = '[';
-			   for (j = 0; j < arraypos * portlen; j++) {
-			       spos = strvchr(spos, ',');
-			       if (spos == NULL) break;
-			       spos++;
-			   }
-			   if (spos != NULL) {
-			       brackptr = strvchr(spos, '[');
-			       *brackptr = '\0';
-			       sscanf(brackptr + 1, "%d", &slice);
-			   }
-			   else spos = scanroot;  /* should emit an error here */
+		       // If signal array is smaller than the portlength *
+		       // length of instance array, then the signal wraps.
+
+		       if (wb2.start >= wb2.end && arraystart >= arrayend) {
+			   slice = wb.start - (arraystart - i) * portlen;
+			   while (slice < wb2.end) slice += siglen;
 		       }
-		       else {	/* not a bundle */
-
-		          // If signal array is smaller than the portlength *
-		          // length of instance array, then the signal wraps.
-
-		          if (wb2.start >= wb2.end && arraystart >= arrayend) {
-			      slice = wb.start - (arraystart - i) * portlen;
-			      while (slice < wb2.end) slice += siglen;
-		          }
-		          else if (wb2.start < wb2.end && arraystart > arrayend) {
-			      slice = wb.start + (arraystart - i) * portlen;
-			      while (slice > wb2.end) slice -= siglen;
-		          }
-		          else if (wb2.start > wb2.end && arraystart < arrayend) {
-			      slice = wb.start - (arraystart + i) * portlen;
-			      while (slice < wb2.end) slice += siglen;
-		          }
-		          else { // (wb2.start < wb2.end && arraystart < arrayend)
-			      slice = wb.start + (arraystart + i) * portlen;
-			      while (slice > wb2.end) slice -= siglen;
-		          }
-			  spos = scanroot;
+		       else if (wb2.start < wb2.end && arraystart > arrayend) {
+			   slice = wb.start + (arraystart - i) * portlen;
+			   while (slice > wb2.end) slice -= siglen;
+		       }
+		       else if (wb2.start > wb2.end && arraystart < arrayend) {
+			   slice = wb.start - (arraystart + i) * portlen;
+			   while (slice < wb2.end) slice += siglen;
+		       }
+		       else { // (wb2.start < wb2.end && arraystart < arrayend)
+			   slice = wb.start + (arraystart + i) * portlen;
+			   while (slice > wb2.end) slice -= siglen;
 		       }
 
-		       sprintf(netname, "%s[%d]", spos, slice);
+		       sprintf(netname, "%s[%d]", scanroot, slice);
 	               if (LookupObject(netname, CurrentCell) == NULL) Node(netname);
 	               join(netname, obptr->name);
 		   }
@@ -3000,25 +2876,18 @@ char *ReadVerilogTop(char *fname, int *fnum, int blackbox)
      hashfunc = hashcase;
   }
 
-  if ((hashfilep != -1) && (hashfilep != *fnum)) {
-      /* Started a new file, so remove all the parameters */
+  if ((hashfile != -1) && (hashfile != *fnum)) {
+      /* Started a new file, so remove all the parameters and definitions */
       RecurseHashTable(&verilogparams, freeprop);
       HashKill(&verilogparams);
-      hashfilep = -1;
-  }
-  if ((hashfiled != -1) && (hashfiled != *fnum)) {
-      /* Started a new file, so remove all the definitions */
       RecurseHashTable(&verilogdefs, freeprop);
       HashKill(&verilogdefs);
-      hashfiled = -1;
+      hashfile = -1;
   }
-  if (hashfilep == -1) {
+  if (hashfile == -1) {
       InitializeHashTable(&verilogparams, OBJHASHSIZE);
-      hashfilep = filenum;
-  }
-  if (hashfiled == -1) {
       InitializeHashTable(&verilogdefs, OBJHASHSIZE);
-      hashfiled = filenum;
+      hashfile = *fnum;
   }
   definitions = &verilogdefs;
 

scripts/defs.mak.in

@@ -68,7 +68,6 @@ LIB_SPECS              = @LIB_SPECS@
 LIB_SPECS_NOSTUB       = @LIB_SPECS_NOSTUB@
 WISH_EXE	       = @WISH_EXE@
 TCL_LIB_DIR	       = @TCL_LIB_DIR@
-EXTRA_CFLAGS	       =
 
 CC                     = @CC@
 CPP                    = @CPP@
@@ -77,7 +76,7 @@ CXX                    = @CXX@
 CPPFLAGS               = -I. -I${NETGENDIR} @CPPFLAGS@
 DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
 DFLAGS_NOSTUB          = @extra_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
-CFLAGS                 = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@ ${EXTRA_CFLAGS}
+CFLAGS                 = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
 
 DEPEND_FILE            = Depend
 DEPEND_FLAG            = @DEPEND_FLAG@

tcltk/netgen.tcl.in

@@ -429,7 +429,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
          set file1 $name1
          set cell1 $name1
       }
-      puts stdout "Reading netlist file $file1 for $name1"
+      puts stdout "Reading netlist file $file1"
       set fnum1 [netgen::readnet $file1]
    } else {
       set cell1 [lindex $flist1 0]
@@ -446,7 +446,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
          set file2 $name2
          set cell2 $name2
       }
-      puts stdout "Reading netlist file $file2 for $name2"
+      puts stdout "Reading netlist file $file2"
       set fnum2 [netgen::readnet $file2]
    } else {
       set cell2 [lindex $flist2 0]
@@ -461,7 +461,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
    }
 
    set clist1 [cells list $fnum1]
-   set cidx [lsearch -exact $clist1 $cell1]
+   set cidx [lsearch -regexp $clist1 ^$cell1$]
    if {$cidx < 0} {
       puts stderr "Cannot find cell $cell1 in file $file1"
       return
@@ -469,7 +469,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       set cell1 [lindex $clist1 $cidx]
    }
    set clist2 [cells list $fnum2]
-   set cidx [lsearch -exact $clist2 $cell2]
+   set cidx [lsearch -regexp $clist2 ^$cell2$]
    if {$cidx < 0} {
       puts stderr "Cannot find cell $cell2 in file $file2"
       return

tcltk/tclnetgen.c

@@ -21,8 +21,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdio.h>
 #include <stdlib.h>	/* for getenv */
 #include <string.h>
-#include <strings.h>
-#include <stdarg.h>	/* for va_list */
 
 #include <tcl.h>
 
@@ -45,14 +43,14 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #define FALSE 0
 #endif
 
-#if TCL_MAJOR_VERSION < 9
-typedef int Tcl_Size;
-#endif
-
 /*-----------------------*/
 /* Tcl 8.4 compatibility */
 /*-----------------------*/
 
+#ifndef CONST84
+#define CONST84
+#endif
+
 Tcl_Interp *netgeninterp;
 Tcl_Interp *consoleinterp;
 int ColumnBase = 0;
@@ -62,47 +60,47 @@ extern int PropertyErrorDetected;
 
 /* Function prototypes for all Tcl command callbacks */
 
-int _netgen_readnet(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_readlib(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_canonical(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_writenet(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_flatten(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_nodes(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_elements(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_debug(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_protochip(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_instances(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_contents(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_describe(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_cells(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_ports(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_model(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_leaves(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_quit(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_reinit(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netgen_log(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_readnet(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_readlib(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_canonical(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_writenet(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_flatten(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_nodes(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_elements(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_debug(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_protochip(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_instances(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_contents(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_describe(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_cells(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_ports(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_model(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_leaves(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_quit(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_reinit(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_log(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 #ifdef HAVE_MALLINFO
-int _netgen_printmem(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_printmem(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 #endif
-int _netgen_help(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_matching(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_compare(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_iterate(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_summary(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_print(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_format(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_run(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_verify(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_automorphs(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_equate(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_ignore(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_permute(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_property(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_exhaustive(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_symmetry(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_restart(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_global(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
-int _netcmp_convert(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_help(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_matching(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_compare(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_iterate(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_summary(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_print(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_format(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_run(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_verify(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_automorphs(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_equate(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_ignore(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_permute(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_property(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_exhaustive(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_symmetry(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_restart(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_global(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netcmp_convert(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 
 typedef struct _Cmd {
    char 	*name;
@@ -289,7 +287,7 @@ GetTopCell(int fnum)
 int
 CommonGetFilenameOrFile(Tcl_Interp *interp, Tcl_Obj *fobj, int *fnumptr)
 {
-    int result;
+    int result, llen;
     int fnum, ftest;
     char *filename;
     struct nlist *tp;
@@ -372,8 +370,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 	struct nlist **tpr, int *fnumptr)
 {
     Tcl_Obj *tobj, *fobj;
-    int result;
-    Tcl_Size llen;
+    int result, llen;
     int fnum, ftest, index;
     char *filename, *cellname;
     struct nlist *tp, *tp2;
@@ -402,7 +399,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 	    Tcl_ResetResult(interp);
 
 	    /* Is 1st argument a special keyword? */
-	    if (Tcl_GetIndexFromObj(interp, tobj, (const char **)suboptions,
+	    if (Tcl_GetIndexFromObj(interp, tobj, (CONST84 char **)suboptions,
 			"special", 0, &index) == TCL_OK) {
 		switch (index) {
 		    case CIRCUIT1_IDX:
@@ -458,7 +455,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 
 		    /* Check if 2nd item is a reserved keyword */
 		    if (Tcl_GetIndexFromObj(interp, fobj,
-				(const char **)suboptions,
+				(CONST84 char **)suboptions,
 				"special", 0, &index) == TCL_OK) {
 			switch (index) {
 			    case CIRCUIT1_IDX:
@@ -583,7 +580,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
     } else {
 	/* Only one name given;  check if it matches subOption */
 
-	if (Tcl_GetIndexFromObj(interp, objv, (const char **)suboptions,
+	if (Tcl_GetIndexFromObj(interp, objv, (CONST84 char **)suboptions,
 			"special", 0, &index) == TCL_OK) {
 
 	    switch (index) {
@@ -668,7 +665,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 
 int
 _netgen_canonical(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
     int result;
     struct nlist *np;
@@ -707,7 +704,7 @@ _netgen_canonical(ClientData clientData,
 
 int
 _netgen_readnet(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *formats[] = {
       "automatic", "ext", "extflat", "sim", "prm", "ntk", "spice",
@@ -744,7 +741,7 @@ _netgen_readnet(ClientData clientData,
       return TCL_ERROR;
    }
    else if (objc > 1) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
 		"format", 0, &index) != TCL_OK) {
 	 if (objc == 3)
 
@@ -853,7 +850,7 @@ _netgen_readnet(ClientData clientData,
 
 int
 _netgen_readlib(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *formats[] = {
       "actel", "spice", "xilinx", NULL
@@ -886,7 +883,7 @@ _netgen_readlib(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "format [file]");
       return TCL_ERROR;
    }
-   if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
+   if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
 	"format", 0, &index) != TCL_OK) {
       return TCL_ERROR;
    }
@@ -933,7 +930,7 @@ _netgen_readlib(ClientData clientData,
 
 int
 _netgen_writenet(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *formats[] = {
       "ext", "sim", "ntk", "actel",
@@ -952,7 +949,7 @@ _netgen_writenet(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "format file");
       return TCL_ERROR;
    }
-   if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
+   if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
 		"format", 0, &index) != TCL_OK) {
       return TCL_ERROR;
    }
@@ -1020,10 +1017,10 @@ _netgen_writenet(ClientData clientData,
 
 int
 _netgen_flatten(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr, *file;
-   int result, filenum;
+   int result, llen, filenum;
    struct nlist *tp, *tp2, *tptop;
 
    if ((objc < 2) || (objc > 4)) {
@@ -1094,7 +1091,7 @@ _netgen_flatten(ClientData clientData,
 
 int
 _netgen_nodes(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *estr = NULL, *istr = NULL, *cstr, *fstr;
    char *optstart;
@@ -1212,7 +1209,7 @@ _netgen_nodes(ClientData clientData,
 
 int
 _netgen_elements(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *nstr = NULL, *cstr;
    struct objlist * (*ListSave)();
@@ -1307,7 +1304,7 @@ _netgen_elements(ClientData clientData,
 
 int
 _netgen_debug(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *yesno[] = {
       "on", "off", NULL
@@ -1321,7 +1318,7 @@ _netgen_debug(ClientData clientData,
    if (objc == 1)
       index = YES_IDX;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
 		"option", 0, &index) != TCL_OK) {
          index = CMD_IDX;
       }
@@ -1356,7 +1353,7 @@ _netgen_debug(ClientData clientData,
 
 int
 _netgen_protochip(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1376,7 +1373,7 @@ _netgen_protochip(ClientData clientData,
 
 int
 _netgen_instances(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr;
    int result;
@@ -1406,7 +1403,7 @@ _netgen_instances(ClientData clientData,
 
 int
 _netgen_contents(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr;
    int result;
@@ -1435,7 +1432,7 @@ _netgen_contents(ClientData clientData,
 
 int
 _netgen_describe(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr;
    int file = -1;
@@ -1465,7 +1462,7 @@ _netgen_describe(ClientData clientData,
 
 int
 _netgen_cells(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr, *filename = NULL;
    char *optstart;
@@ -1552,7 +1549,7 @@ _netgen_cells(ClientData clientData,
 
 int
 _netgen_model(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    struct nlist *tp, *tp2;
    char *model, *retclass;
@@ -1604,7 +1601,7 @@ _netgen_model(ClientData clientData,
    if (objc == 3) {
       nports = NumberOfPorts(tp->name, fnum);
 
-      if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)modelclasses,
+      if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)modelclasses,
 		"class", 0, &index) != TCL_OK) {
 	 return TCL_ERROR;
       }
@@ -1774,7 +1771,7 @@ wrongNumPorts:
 
 int
 _netgen_ports(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr;
    int result;
@@ -1804,7 +1801,7 @@ _netgen_ports(ClientData clientData,
 
 int
 _netgen_leaves(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *repstr;
    int result;
@@ -1840,7 +1837,7 @@ _netgen_leaves(ClientData clientData,
 
 int
 _netgen_quit(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1868,7 +1865,7 @@ _netgen_quit(ClientData clientData,
 
 int
 _netgen_reinit(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1888,7 +1885,7 @@ _netgen_reinit(ClientData clientData,
 
 int
 _netgen_log(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *yesno[] = {
       "start", "end", "reset", "suspend", "resume", "file", "echo", "put", NULL
@@ -1905,7 +1902,7 @@ _netgen_log(ClientData clientData,
       index = (LoggingFile) ? RESUME_IDX : START_IDX;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
 		"option", 0, &index) != TCL_OK) {
 	 return TCL_ERROR;
       }
@@ -2032,7 +2029,7 @@ _netgen_log(ClientData clientData,
 
 int
 _netgen_printmem(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2054,7 +2051,7 @@ _netgen_printmem(ClientData clientData,
 
 int
 _netcmp_format(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
     int col1_width = 41, col2_width = 41;
 
@@ -2115,13 +2112,13 @@ _netcmp_format(ClientData clientData,
 
 int
 _netcmp_compare(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *name1, *name2, *file1, *file2, *optstart;
    int fnum1, fnum2, dolist = 0;
    int dohierarchy = FALSE;
    int assignonly = FALSE;
-   int argstart = 1, qresult, result;
+   int argstart = 1, qresult, llen, result;
    int hascontents1, hascontents2;
    struct Correspond *nextcomp;
    struct nlist *tp1 = NULL, *tp2 = NULL;
@@ -2292,7 +2289,7 @@ _netcmp_compare(ClientData clientData,
 
 int
 _netcmp_iterate(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2316,7 +2313,7 @@ _netcmp_iterate(ClientData clientData,
 
 int
 _netcmp_summary(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "nodes", "elements", NULL
@@ -2331,7 +2328,7 @@ _netcmp_summary(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc == 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2357,7 +2354,7 @@ _netcmp_summary(ClientData clientData,
 
 int
 _netcmp_print(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "nodes", "elements", "queue", NULL
@@ -2395,16 +2392,16 @@ _netcmp_print(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc >= 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
 	 if ((objc == 2) && (Tcl_GetIndexFromObj(interp, objv[1],
-		(const char **)classes, "class", 0, &class) != TCL_OK)) {
+		(CONST84 char **)classes, "class", 0, &class) != TCL_OK)) {
             return TCL_ERROR;
 	 }
       }
    }
    if (objc == 3 && index != QUEUE_IDX) {
-      if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)classes,
+      if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)classes,
 		"class", 0, &class) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2448,7 +2445,7 @@ _netcmp_print(ClientData clientData,
 
 int
 _netcmp_run(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "converge", "resolve", NULL
@@ -2475,7 +2472,7 @@ _netcmp_run(ClientData clientData,
    if (objc == 1)
       index = RESOLVE_IDX;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2592,7 +2589,7 @@ _netcmp_run(ClientData clientData,
 
 int
 _netcmp_verify(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "nodes", "elements", "properties", "only", "all", "equivalent", "unique", NULL
@@ -2624,7 +2621,7 @@ _netcmp_verify(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc == 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2781,7 +2778,7 @@ _netcmp_verify(ClientData clientData,
 
 int
 _netcmp_automorphs(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2802,7 +2799,7 @@ _netcmp_automorphs(ClientData clientData,
 
 int
 _netcmp_convert(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
     char *cellname;
     int filenum = -1;
@@ -2832,10 +2829,10 @@ _netcmp_convert(ClientData clientData,
 
 int
 _netcmp_global(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *filename, *cellname, *pattern;
-   int numchanged = 0, p, fnum, result;
+   int numchanged = 0, p, fnum, llen, result;
    struct nlist *tp;
 
    if (objc < 2) {
@@ -2869,7 +2866,7 @@ _netcmp_global(ClientData clientData,
 
 int
 _netcmp_ignore(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "class", "shorted", NULL
@@ -2883,7 +2880,7 @@ _netcmp_ignore(ClientData clientData,
    char *name = NULL, *name2 = NULL;
 
    if (objc >= 3) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) == TCL_OK) {
 	 objc--;
 	 objv++;
@@ -2917,7 +2914,7 @@ _netcmp_ignore(ClientData clientData,
 
 int
 _netcmp_equate(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "nodes", "elements", "classes", "pins", NULL
@@ -2932,8 +2929,7 @@ _netcmp_equate(ClientData clientData,
    struct ElementClass *saveEclass = NULL;
    struct NodeClass *saveNclass = NULL;
    int file1, file2;
-   int i, dolist = 0, doforce = 0, dounique = 0;
-   Tcl_Size l1, l2, lent, ltest;
+   int i, l1, l2, ltest, lent, dolist = 0, doforce = 0, dounique = 0;
    Tcl_Obj *tobj1, *tobj2, *tobj3;
 
    while (objc > 1) {
@@ -2963,7 +2959,7 @@ _netcmp_equate(ClientData clientData,
       return TCL_ERROR;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -3432,13 +3428,12 @@ _netcmp_equate(ClientData clientData,
 
 int
 _netcmp_property(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-    int fnum, i;
+    int fnum, i, llen;
     struct nlist *tp;
     struct property *kl, *kllast, *klnext;
     Tcl_Obj *tobj1, *tobj2, *tobj3;
-    Tcl_Size llen;
     double dval;
     int ival, argstart;
 
@@ -3515,7 +3510,7 @@ _netcmp_property(ClientData clientData,
 
     /* Don't need to check return value */
     index = -1;
-    Tcl_GetIndexFromObj(interp, objv[1], (const char **)topoptions,
+    Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)topoptions,
 		"option", 0, &index);
 
     /* Check for special command "property default" */
@@ -3613,7 +3608,7 @@ _netcmp_property(ClientData clientData,
 	}
 	else if (objc == 3) {
 	    if (Tcl_GetIndexFromObj(interp, objv[2],
-			(const char **)topo,
+			(CONST84 char **)topo,
 			"topology", 0, &idx2) == TCL_OK) {
 		if (idx2 == 0)
 		    ExactTopology = TRUE;
@@ -3672,7 +3667,7 @@ _netcmp_property(ClientData clientData,
 	Tcl_SetObjResult(interp, tobj1);
     }
     else {
-	if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)options,
+	if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
 	    index = ADD_IDX;
 	    argstart = 2;
@@ -3705,7 +3700,7 @@ _netcmp_property(ClientData clientData,
 		    // Each value must be a list of two, or a yes/no answer.
 
 		    if (Tcl_GetIndexFromObj(interp, objv[i],
-				(const char **)yesno,
+				(CONST84 char **)yesno,
 				"combine", 0, &idx2) == TCL_OK) {
 			if (idx2 <= 4) {	/* true, enable, etc. */
 			    if (index == SERIAL_IDX || index == SERIES_IDX)
@@ -3737,7 +3732,7 @@ _netcmp_property(ClientData clientData,
 			if (result != TCL_OK) return result;
 
 			result = Tcl_GetIndexFromObj(interp, tobj2,
-				(const char **)combineoptions,
+				(CONST84 char **)combineoptions,
 				"combine_type", 0, &idx2);
 			if (result != TCL_OK) return result;
 
@@ -3822,7 +3817,7 @@ _netcmp_property(ClientData clientData,
 			    /* {key, type} or {key, tolerance} duplet */
 
 			    if (Tcl_GetIndexFromObj(interp, tobj2,
-					(const char **)suboptions,
+					(CONST84 char **)suboptions,
 					"type", 0, &idx2) != TCL_OK) {
 				Tcl_ResetResult(interp);
 				if (Tcl_GetDoubleFromObj(interp, tobj2, &dval)
@@ -3866,7 +3861,7 @@ _netcmp_property(ClientData clientData,
 			    /* {key, type, tolerance} triplet */
 
 			    if (Tcl_GetIndexFromObj(interp, tobj2,
-					(const char **)suboptions,
+					(CONST84 char **)suboptions,
 					"type", 0, &idx2) != TCL_OK)
 				return TCL_ERROR;
 
@@ -4009,7 +4004,7 @@ _netcmp_property(ClientData clientData,
 			if (result != TCL_OK) return result;
 
 			result = Tcl_GetIndexFromObj(interp, tobj2,
-				(const char **)mergeoptions,
+				(CONST84 char **)mergeoptions,
 				"merge_type", 0, &idx2);
 			if (result != TCL_OK) return result;
 
@@ -4061,7 +4056,7 @@ _netcmp_property(ClientData clientData,
 		    return TCL_ERROR;
 		}
 		result = Tcl_GetIndexFromObj(interp, objv[3],
-			(const char **)deriveoptions,
+			(CONST84 char **)deriveoptions,
 			"area|perimeter", 0, &idx2);
 		if (result != TCL_OK) return result;
 		switch (idx2) {
@@ -4093,7 +4088,7 @@ _netcmp_property(ClientData clientData,
 
 int
 _netcmp_permute(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *model, *pin1, *pin2;
    char *permuteclass[] = {
@@ -4114,7 +4109,7 @@ _netcmp_permute(ClientData clientData,
       index = DEFLT_IDX;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)permuteclass,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)permuteclass,
 		"permute class", 0, &index) != TCL_OK) {
 	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 1, objv, "?valid_cellname pin1 pin2?");
@@ -4234,7 +4229,7 @@ _netcmp_permute(ClientData clientData,
 
 int
 _netcmp_symmetry(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    Printf("Symmetry breaking method has been deprecated.\n");
    return TCL_OK;
@@ -4250,7 +4245,7 @@ _netcmp_symmetry(ClientData clientData,
 
 int
 _netcmp_exhaustive(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *yesno[] = {
       "on", "off", NULL
@@ -4263,7 +4258,7 @@ _netcmp_exhaustive(ClientData clientData,
    if (objc == 1)
       index = -1;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
 		"option", 0, &index) != TCL_OK)
          return TCL_ERROR;
    }
@@ -4292,7 +4287,7 @@ _netcmp_exhaustive(ClientData clientData,
 
 int
 _netcmp_restart(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -4312,7 +4307,7 @@ _netcmp_restart(ClientData clientData,
 
 int
 _netgen_help(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    int n;
 
@@ -4343,7 +4338,7 @@ _netgen_help(ClientData clientData,
 
 int
 _netcmp_matching(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
       "nodes", "elements", NULL
@@ -4365,7 +4360,7 @@ _netcmp_matching(ClientData clientData,
       name = Tcl_GetString(objv[1]);
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -4494,14 +4489,14 @@ void tcl_vprintf(FILE *f, const char *fmt, va_list args_in)
 
 void tcl_stdflush(FILE *f)
 {   
-   Tcl_InterpState state;
+   Tcl_SavedResult state;
    static char stdstr[] = "::flush stdxxx";
    char *stdptr = stdstr + 11;
     
-   state = Tcl_SaveInterpState(netgeninterp, TCL_OK);
+   Tcl_SaveResult(netgeninterp, &state);
    strcpy(stdptr, (f == stderr) ? "err" : "out");
    Tcl_Eval(netgeninterp, stdstr);
-   Tcl_RestoreInterpState(netgeninterp, state);
+   Tcl_RestoreResult(netgeninterp, &state);
 }
 
 /*------------------------------------------------------*/
@@ -4531,7 +4526,7 @@ char *Tcl_Strdup(const char *s)
 /*------------------------------------------------------*/
 
 int _tkcon_interrupt(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    InterruptPending = 1;
    return TCL_OK;
@@ -4570,7 +4565,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    /* Remember the interpreter */
    netgeninterp = interp;
 
-   if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) return TCL_ERROR;
+   if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
   
    for (n = 0; netgen_cmds[n].name != NULL; n++) {
       sprintf(keyword, "netgen::%s", netgen_cmds[n].name);
@@ -4579,8 +4574,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    }
    for (n = 0; netcmp_cmds[n].name != NULL; n++) {
       sprintf(keyword, "netgen::%s", netcmp_cmds[n].name);
-      Tcl_CreateObjCommand(interp, keyword,
-		(Tcl_ObjCmdProc *)netcmp_cmds[n].handler,
+      Tcl_CreateObjCommand(interp, keyword, netcmp_cmds[n].handler,
 		(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
    }