tcl/board: Add AM625 EVM basic support

[fw/openocd] / tcl / mmr_helpers.tcl

diff --git a/tcl/mmr_helpers.tcl b/tcl/mmr_helpers.tcl
index ea2210ac4a6f99728e07d4b3a5c3ab48855eba55..d9b6e63834678a6c7f791f3cbc67331a2806fcd1 100644 (file)
--- a/tcl/mmr_helpers.tcl
+++ b/tcl/mmr_helpers.tcl
@@ -2,18 +2,18 @@
 proc proc_exists { NAME } {
     set n [info commands $NAME]
     set l [string length $n]
-    return [expr $l != 0]
+    return [expr {$l != 0}]
 }
 
 # Give: REGISTER name - must be a global variable.
 proc show_mmr32_reg { NAME } {
-    
+
     global $NAME
     # we want $($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.
 
@@ -41,26 +41,26 @@ proc show_mmr32_bits { NAMES VAL } {
        set l [string length $N]
        if { $l > $w } { set w $l }
     }
-    
+
     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 ]
 }