X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Fmmr_helpers.tcl;h=6b2c1476ea3852195023d03066d82c08894c8d8e;hb=f855fdcf0d95ff9ba18a83f9a97d5368844d4f2c;hp=902991100d6f05e6187c935d6c8ddd5160c0f8d9;hpb=71af49ca7fb11b0bd0c1ba9578826f49288b68ef;p=fw%2Fopenocd

diff --git a/tcl/mmr_helpers.tcl b/tcl/mmr_helpers.tcl
index 902991100..6b2c1476e 100644
--- a/tcl/mmr_helpers.tcl
+++ b/tcl/mmr_helpers.tcl
@@ -13,7 +13,7 @@ proc show_mmr32_reg { NAME } {
     set a [set [set NAME]]
 
     if ![catch { set v [memread32 $a] } msg ] {
-	puts [format "%15s: (0x%08x): 0x%08x" $NAME $a $v]
+	echo [format "%15s: (0x%08x): 0x%08x" $NAME $a $v]
 
 	# Was a helper defined?
 	set fn show_${NAME}_helper
@@ -28,7 +28,7 @@ proc show_mmr32_reg { NAME } {
 }
 
 
-# Give: NAMES - an array of names accessable
+# Give: NAMES - an array of names accessible
 #               in the callers symbol-scope.
 #       VAL - the bits to display.
 
@@ -43,24 +43,24 @@ proc show_mmr32_bits { NAMES VAL } {
     }
 
     for { set x 24 } { $x >= 0 } { incr x -8 } {
-	puts -nonewline "  "
+	echo -n "  "
 	for { set y 7 } { $y >= 0 } { incr y -1 } {
-	    set s $MYNAMES([expr $x + $y])
-	    puts -nonewline [format "%2d: %-*s | " [expr $x + $y] $w $s ]
+	    set s $MYNAMES([expr {$x + $y}])
+	    echo -n [format "%2d: %-*s | " [expr {$x + $y}] $w $s ]
 	}
-	puts ""
+	echo ""
 
-	puts -nonewline "  "
+	echo -n "  "
 	for { set y 7 } { $y >= 0 } { incr y -1 } {
-	    puts -nonewline [format "    %d%*s | " [expr !!($VAL & (1 << ($x + $y)))] [expr $w -1] ""]
+	    echo -n [format "    %d%*s | " [expr !!($VAL & (1 << ($x + $y)))] [expr {$w -1}] ""]
 	}
-	puts ""
+	echo ""
     }
 }
 
 
 proc show_mmr_bitfield { MSB LSB VAL FIELDNAME FIELDVALUES } {
-    set width [expr (($MSB - $LSB + 1) + 7) / 4]
+    set width [expr {(($MSB - $LSB + 1) + 7) / 4}]
     set nval [show_normalize_bitfield $VAL $MSB $LSB ]
     set name0 [lindex $FIELDVALUES 0 ]
     if [ string compare $name0 _NUMBER_ ] {
@@ -68,5 +68,5 @@ proc show_mmr_bitfield { MSB LSB VAL FIELDNAME FIELDVALUES } {
     } else {
 	set sval ""
     }
-    puts [format "%-15s: %d (0x%0*x) %s" $FIELDNAME $nval $width $nval $sval ]
+    echo [format "%-15s: %d (0x%0*x) %s" $FIELDNAME $nval $width $nval $sval ]
 }