Merge branch 'master' into work

Update at Wed Mar 28 12:40:15 EDT 2018 by tim
Corrected a crash condition during pin matching if any subcell has
2026-08-28 00:47:32 +02:00 · 2018-03-28 12:40:17 -04:00 · 2018-03-28 12:40:15 -04:00 · 2018-03-28 12:39:40 -04:00 · 2018-01-29 13:26:41 -05:00 · 2018-01-29 13:26:39 -05:00
3 changed files with 18 additions and 7 deletions
@@ -1 +1 @@
-1.5.91
+1.5.93
@@ -6675,6 +6675,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
      if (ob1 && ob1->next && ob1->next->type != PORT)
 	 break;
   }
+   if (ob1 == NULL) ob1 = tc1->cell;	/* No ports */

   /* Assign non-matching pins in tc2 with real node	*/
   /* connections in the cell to the end.  Create pins	*/
@@ -6760,6 +6761,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
      if (ob2 && ob2->next && ob2->next->type != PORT)
 	 break;
   }
+   if (ob2 == NULL) ob2 = tc2->cell;	/* No ports */

   /* If cell 2 has fewer nodes than cell 1, then add dummy (unconnected)  */
   /* pins to cell 2.  If these correspond to numbers missing in the match */
@@ -475,15 +475,22 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
      if {$perrors > 0} {
 	 puts stdout "Warning:  There were errors reading the setup file"
      }
-   } else {
+   } elseif {[string first nosetup $setupfile] < 0} {
      netgen::permute default	;# transistors and resistors
      netgen::property default
   }

-   puts stdout "Comparison output logged to file $logfile"
-   netgen::log file $logfile
-   netgen::log start
-   netgen::log echo off
+   if {[string first nolog $logfile] < 0} {
+      puts stdout "Comparison output logged to file $logfile"
+      netgen::log file $logfile
+
+      netgen::log start
+      netgen::log echo off
+      set dolog true
+   } else {
+      set dolog false
+   }
+
   if {$dolist == 1} {
      set endval [netgen::compare -list hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
   } else {
@@ -566,7 +573,9 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
   if {$properr != {}} {
      netgen::log put "The following cells had property errors: $properr\n"
   }
-   netgen::log end
+   if {$dolog} {
+      netgen::log end
+   }
   puts stdout "LVS Done."
   if {$dojson == 1} {
      netgen::convert_to_json $logfile $lvs_final
Author	SHA1	Message	Date
Tim Edwards	2b15b731bb	Merge branch 'master' into work	2018-03-28 12:40:17 -04:00
Tim Edwards	9ad6ad3338	Update at Wed Mar 28 12:40:15 EDT 2018 by tim	2018-03-28 12:40:15 -04:00
Tim Edwards	0fb5efd914	Corrected a crash condition during pin matching if any subcell has no pins at all.	2018-03-28 12:39:40 -04:00
Tim Edwards	763117aabe	Merge branch 'master' into work	2018-01-29 13:26:41 -05:00
Tim Edwards	96a95d337f	Update at Mon Jan 29 13:26:39 EST 2018 by tim	2018-01-29 13:26:39 -05:00
Tim Edwards	393788a039	Changed behavior of the "lvs" script so that the setup file can be specified as "nosetup" if the "lvs" command is being called interactively from a terminal or as part of a larger script where setup commands have been issued prior to running the "lvs" script. Similarly, the log file can be specified as "nolog" to prevent any log file from being generated.	2018-01-29 13:24:54 -05:00
@@ -1 +1 @@
 .5.91
 .5.93