New upstream version 9.7.104

6 files changed, 19 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index c42e2ef..433e3f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@ install.log
 *.so
 *~
 UPDATE_ME
-VERSION
diff --git a/VERSION b/VERSION
index c6eddbe..dad66cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.7.101
+9.7.104
diff --git a/base/binsim.c b/base/binsim.c
index 2a5ae5e..ec1d9f7 100644
--- a/base/binsim.c
+++ b/base/binsim.c
@@ -242,7 +242,7 @@ private void WriteAscii( f )
     (void) fprintf( f, "CTDE %.6f\n", CTDE );
 
 	/* add extensions here */
-    (void) fprintf( f, endAscii );
+    (void) fprintf( f, "%s", endAscii );
   }
 
 
diff --git a/base/rsim.c b/base/rsim.c
index 56b3ef0..29ed994 100644
--- a/base/rsim.c
+++ b/base/rsim.c
@@ -1213,7 +1213,7 @@ private char *readVector( vstring, nbits )
 	   switch (c) {
 	       case 'b':
 		   for (b = 0 ; b < nbits; b++) newvecs[b] = '0';
-		   sprintf(newvecs + (nbits - strlen(locstring + 2)), locstring + 2);
+		   strcpy(newvecs + (nbits - strlen(locstring + 2)), locstring + 2);
 		   r = 1;
 		   break;
 	       case 'd':
diff --git a/configure b/configure
index 5361403..8df0ef3 100755
--- a/configure
+++ b/configure
@@ -4,4 +4,4 @@
 # all of its config scripts in a different directory than the configure
 # script itself.
 
-( CFLAGS="-g" ; export CFLAGS ; cd scripts ; ./configure $* )
+( CFLAGS="-g" ; export CFLAGS ; cd scripts ; ./configure "$@" )
diff --git a/tcltk/irsim.tcl.in b/tcltk/irsim.tcl.in
index fb1698a..e53d1c9 100644
--- a/tcltk/irsim.tcl.in
+++ b/tcltk/irsim.tcl.in
@@ -574,7 +574,8 @@ proc irsim::trace_callback {option {name {}}} {
    if {$option == "select"} {
       set tl [trace list all]
       foreach tr $tl {
-         .analyzer.scope.names.b_$tr configure -background yellow
+	  set tr2 [string map {. #} $tr]
+         .analyzer.scope.names.b_$tr2 configure -background yellow
       }
       .analyzer.scope.names.b_$name configure -background orange
       set RsimOpts(base) [base get $name]
@@ -663,28 +664,29 @@ proc irsim::update_traces {} {
    foreach tr [place slaves .analyzer.scope.names] {place forget $tr}
    foreach tr [place slaves .analyzer.scope.values] {place forget $tr}
    foreach tr $tl {
+      set tr2 [string map {. #} $tr]
       set yl [trace bottom $tr]
       set yt [trace top $tr]
       incr yt
       set yh [expr {$yl - $yt - 1}]
-      if {[catch {place .analyzer.scope.names.b_$tr -y $yt -height $yh}]} {
-         button .analyzer.scope.names.b_$tr -text $tr -borderwidth 1 \
+      if {[catch {place .analyzer.scope.names.b_$tr2 -y $yt -height $yh}]} {
+         button .analyzer.scope.names.b_$tr2 -text $tr -borderwidth 1 \
 		-relief ridge -background yellow \
 		-command "trace select $tr"
-	 place .analyzer.scope.names.b_$tr -y $yt -height $yh \
+	 place .analyzer.scope.names.b_$tr2 -y $yt -height $yh \
 		-relwidth 1 -relx 0
       }
-      set newminn [font measure [.analyzer.scope.names.b_$tr cget -font] $tr]
+      set newminn [font measure [.analyzer.scope.names.b_$tr2 cget -font] $tr]
       set newminn [expr {$newminn + 10}]	;# allow 10-pixel surround
       if {$newminn > $minn} {
 	 set minn $newminn
 	 grid columnconfigure .analyzer.scope 0 -minsize $minn
       }
 
-      if {[catch {place .analyzer.scope.values.b_$tr -y $yt -height $yh}]} {
-         label .analyzer.scope.values.b_$tr -text "" -borderwidth 1 \
+      if {[catch {place .analyzer.scope.values.b_$tr2 -y $yt -height $yh}]} {
+         label .analyzer.scope.values.b_$tr2 -text "" -borderwidth 1 \
 		-relief ridge -background yellowgreen
-	 place .analyzer.scope.values.b_$tr -y $yt -height $yh \
+	 place .analyzer.scope.values.b_$tr2 -y $yt -height $yh \
 		-relwidth 1 -relx 0
       }
       set trbase [trace base $tr]
@@ -696,7 +698,7 @@ proc irsim::update_traces {} {
       } else {
          set trdigits [expr ([trace bits $tr] + $trbase - 1) / $trbase]
       }
-      set newminv [font measure [.analyzer.scope.values.b_$tr cget -font] \
+      set newminv [font measure [.analyzer.scope.values.b_$tr2 cget -font] \
 		[string repeat X $trdigits]]
       set newminv [expr {$newminv + 10}]	;# allow 10-pixel surround
       if {$newminv > $minv} {
@@ -712,9 +714,10 @@ proc irsim::update_traces {} {
 proc irsim::update_values {} {
    set tl [trace list all]
    foreach tr $tl {
+      set tr2 [string map {. #} $tr]
       set ltext [trace value $tr]
       if {$ltext != {}} {
-         .analyzer.scope.values.b_$tr configure -text [trace value $tr]
+         .analyzer.scope.values.b_$tr2 configure -text [trace value $tr]
       }
    }
 }
@@ -722,7 +725,8 @@ proc irsim::update_values {} {
 proc irsim::no_values {} {
    set tl [trace list all]
    foreach tr $tl {
-      .analyzer.scope.values.b_$tr configure -text ""
+      set tr2 [string map {. #} $tr]
+      .analyzer.scope.values.b_$tr2 configure -text ""
    }
 }