Merge branch 'master' into netgen-1.5

VERSION

@@ -1 +1 @@
-1.5.319
+1.5.311

base/actel.c

@@ -91,7 +91,7 @@ char	*ActelName(char *Name)
   /* strip physical-pin information, if it exists */
   if ((nm = strrchr(name,PHYSICALPIN[0])) != NULL) *nm = '\0';
   if (strlen(name) > 13) {
-    ActelIndex = (ActelIndex + 1) % ACTELNAMESIZE;
+    ActelIndex = (++ActelIndex) % ACTELNAMESIZE;
     /* format the value of the hashed value of the string */
     sprintf(ActelNames[ActelIndex], "$%lX", ActelNameHash(name));
 if (Debug) 
@@ -102,7 +102,7 @@ Printf("ActelNameHash returns %s on name %s\n",ActelNames[ActelIndex], name);
   NeedsQuoting = 0;
   if (NULL != strpbrk(name, ".,:; \t\"'\n\r")) NeedsQuoting = 1;
 
-  ActelIndex = (ActelIndex + 1) % ACTELNAMESIZE;
+  ActelIndex = (++ActelIndex) % ACTELNAMESIZE;
   if (!NeedsQuoting) {
     strcpy(ActelNames[ActelIndex], name);
     return(ActelNames[ActelIndex]);

base/flatten.c

@@ -2018,11 +2018,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 						    break;
 					    }
 					}
-					if (found) break;
-				    }
 
-				    if (found) {
-					/* Beware remove shorting devices that	*/
+					/* Do NOT remove shorting devices that	*/
 					/* connect two ports.  Otherwise the	*/
 					/* port lists get screwed up.  It is	*/
 					/* better in that case to force the	*/
@@ -2030,10 +2027,6 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 					/* This is ignored for a top-level cell	*/
 					/* because it will just show up as a	*/
 					/* port mismatch error as it should.	*/
-					/* (12/12/2025---disabling this worked;	*/
-					/* may need to go back to a failing	*/
-					/* example and determine how pin	*/
-					/* matching gets scrambled.)		*/
 
 					if ((not_top == TRUE) &&
 						(ecomp->cell1->class != CLASS_ISOURCE)) {
@@ -2046,18 +2039,14 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 						else if (ob2->node == node2)
 						    found2 = TRUE;
 						if (found1 && found2) {
-						    Fprintf(stdout, "Warning: "
-							"zero-valued device connects "
-							"port %s to another port;  pin "
-							"matching may be affected.\n",
-							ob2->name);
-						    // found = FALSE;
+						    found = FALSE;
 						    break;
 						}
 					    }
 					}
-				    }
 
+					if (found) break;
+				    }
 				    if (found) {
 					Fprintf(stdout, "Removing zero-valued device "
 						"%s from cell %s (%d) makes a better "

base/hash.c

@@ -137,39 +137,32 @@ static unsigned char uppercase[] = {
 // horrible things can happen, as, for example, names AOI12 and OAI12
 // have exactly the same hash result.  Lousy for binning and even
 // lousier for generating class magic numbers.
-//
-// Updated again 4/2/2026 to the FNV-1a hash, which is better than
-// SDBM for this application, according to ChatGPT.
 
 unsigned long hashnocase(char *s, int hashsize)
 {
-	unsigned long hashval = 2166136261ul;
-	for (; *s != '\0'; s++) {
-	    hashval ^= uppercase[*s];
-	    hashval *= 16777619ul;
-	}
+	unsigned long hashval;
+	
+	for (hashval = 0; *s != '\0'; )
+	    hashval = uppercase[*s++]
+			+ (hashval << 6) + (hashval << 16) - hashval;
 	return (hashsize == 0) ? hashval : (hashval % hashsize);
 }
 
 unsigned long hashcase(char *s, int hashsize)
 {
-	unsigned long hashval = 2166136261ul;
-	for (; *s != '\0'; s++) {
-	    hashval ^= (unsigned char)(*s);
-	    hashval *= 16777619ul;
-	}
+	unsigned long hashval;
+	
+	for (hashval = 0; *s != '\0'; )
+	    hashval = (*s++) + (hashval << 6) + (hashval << 16) - hashval;
 	return (hashsize == 0) ? hashval : (hashval % hashsize);
 }
 
 unsigned long genhash(char *s, int c, int hashsize)
 {
-	unsigned long hashval = 2166136261ul;
-	hashval ^= (unsigned long)c;
-	hashval *= 16777619ul;
-	for (; *s != '\0'; s++) {
-	    hashval ^= (unsigned char)(*s);
-	    hashval *= 16777619ul;
-	}
+	unsigned long hashval;
+	
+	for (hashval = (unsigned long)c; *s != '\0'; )
+	    hashval = (*s++) + (hashval << 6) + (hashval << 16) - hashval;
 	return (hashsize == 0) ? hashval : (hashval % hashsize);
 }
 

base/netcmp.c

@@ -52,7 +52,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifdef TCL_NETGEN
 int InterruptPending = 0;
-void (*oldinthandler)(int) = SIG_DFL;
+void (*oldinthandler)() = SIG_DFL;
 extern Tcl_Interp *netgeninterp;
 extern int check_interrupt();
 #endif
@@ -1622,8 +1622,8 @@ void FormatIllegalElementClasses()
   char *permcount;
   int bytesleft;
 
-  permname = CALLOC(right_col_end + 100, sizeof(char));
-  permcount = CALLOC(right_col_end + 100, sizeof(char));
+  permname = CALLOC(right_col_end + 2, sizeof(char));
+  permcount = CALLOC(right_col_end + 2, sizeof(char));
   ostr = output_string_init();
 
   found = 0;
@@ -7544,11 +7544,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/netfile.c

@@ -685,7 +685,6 @@ void SpiceSkipNewLine(void)
   ungetc(contline, infile);
 }
 
-#if 0 /* Commented with "#if 0" due to comment characters in the comment */
 /*----------------------------------------------------------------------*/
 /* Function similar to strtok() for token parsing.  The difference is	*/
 /* that it takes two sets of delimiters.  The first is whitespace	*/
@@ -706,7 +705,6 @@ void SpiceSkipNewLine(void)
 /* the first character of the delimiter string in addition to marking	*/
 /* the boundary between two-character and one-character delimiters.	*/
 /*----------------------------------------------------------------------*/
-#endif
 
 char *strdtok0(char *pstring, char *delim1, char *delim2, char isverilog)
 {

base/objlist.c

@@ -449,7 +449,6 @@ int removeshorted(struct hashlist *p, int file)
          ob = nob;
       }
    }
-   return 1;
 }
 
 /* Remove shorted instances of class "class" from the database */
@@ -540,7 +539,6 @@ int deleteclass(struct hashlist *p, int file)
       }
    }
    FREE(checknodes);
-   return 1;
 }
 
 /* Remove all instances of class "class" from the database */
@@ -578,7 +576,6 @@ int renameinstances(struct hashlist *p, int file)
 	 }
       }
    }
-   return 1;
 }
 
 void InstanceRename(char *from, char *to, int file)
@@ -601,10 +598,9 @@ int freeprop(struct hashlist *p)
    struct property *prop;
 
    prop = (struct property *)(p->ptr);
-   if (prop->type == PROP_STRING) {
+   if (prop->type == PROP_STRING)
       if (prop->pdefault.string != NULL)
 	 FREE(prop->pdefault.string);
-   }
    else if (prop->type == PROP_EXPRESSION) {
       struct tokstack *stackptr, *nptr;
       stackptr = prop->pdefault.stack;

base/query.c

@@ -319,7 +319,7 @@ void Fanout(char *cell, char *node, int filter)
     while (ob != NULL) {
       char *obname = ob->name;
       if (*obname == '/') obname++;
-      if (ob->node == nodenum) {
+      if (ob->node == nodenum)
 	 if (filter == ALLOBJECTS) {
 	   Printf("  %s (", obname);
 	   PrintObjectType(ob->type);
@@ -331,7 +331,6 @@ void Fanout(char *cell, char *node, int filter)
 	 else if (ob->type == filter) {
 	   Printf("  %s\n", obname);
 	 }
-      }
       ob = ob->next;
     }
   }
@@ -934,7 +933,7 @@ static int PrintLeavesInCellHash(struct hashlist *p)
   struct nlist *ptr;
 
   ptr = (struct nlist *)(p->ptr);
-  if (ptr->class == CLASS_SUBCKT) PrintLeavesInCell(ptr->name, ptr->file);
+  if ((ptr->class == CLASS_SUBCKT)) PrintLeavesInCell(ptr->name, ptr->file);
   return(0);
 }
 

base/spice.c

@@ -196,7 +196,7 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
 		 if (ob->type == PROPERTY) {
 		    struct valuelist *vl;
 		    int i;
-		    for (i = 0;; i++) {
+		    for (i == 0;; i++) {
 		       vl = &(ob->instance.props[i]);
 		       if (vl->type == PROP_ENDLIST) break;
 		       else if (vl->type == PROP_VALUE) {
@@ -216,7 +216,7 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
 		 if (ob->type == PROPERTY) {
 		    struct valuelist *vl;
 		    int i;
-		    for (i = 0;; i++) {
+		    for (i == 0;; i++) {
 		       vl = &(ob->instance.props[i]);
 		       if (vl->type == PROP_ENDLIST) break;
 		       else if (vl->type == PROP_VALUE) {
@@ -236,7 +236,7 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
 	      if (ob->type == PROPERTY) {
 		 struct valuelist *vl;
 		 int i;
-		 for (i = 0;; i++) {
+		 for (i == 0;; i++) {
 		    vl = &(ob->instance.props[i]);
 		    if (vl->type == PROP_ENDLIST) break;
 		    else if (vl->type == PROP_VALUE) {
@@ -399,7 +399,7 @@ int renamepins(struct hashlist *p, int file)
    ptr = (struct nlist *)(p->ptr);
 
    if (ptr->file != file)
-      return 0;
+      return 1;
 
    for (ob = ptr->cell; ob != NULL; ob = ob->next) {
       if (ob->type == FIRSTPIN) {
@@ -426,7 +426,6 @@ int renamepins(struct hashlist *p, int file)
 	 }
       }
    }
-   return 1;
 }
 
 /* If any pins are marked unconnected, see if there are	*/

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;
@@ -3000,25 +2999,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;
 

tcltk/netgen.tcl.in

@@ -516,14 +516,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
 	    }
 	 }
 	 close $fsetup
-      	 if {$command != {}} {
-	    # Incomplete command.  Evaluate it to get a meaningful error message
-	    if {[catch {uplevel 1 [list namespace eval netgen $command]} msg]} {
-		set msg [string trimright $msg "\n"]
-		puts stderr "Error $setupfile:$sline (ignoring), $msg"
-		incr perrors
-	    }
-	 }
       } else {
 	 puts stdout "Error:  Cannot read the setup file $setupfile"
       }