X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Fbitsbytes.tcl;h=756c725df6d95bfd1a20eb4d879ee3840b5d29fe;hb=9cdbe61aab418bdf75bc443b16ce4cdf96732e3e;hp=2c4fd2907074f0008d2a585d320cffc7bfb61bf8;hpb=e7b2958229c7e0d7e98e130764aa50d1ca9017d3;p=fw%2Fopenocd

diff --git a/tcl/bitsbytes.tcl b/tcl/bitsbytes.tcl
index 2c4fd2907..756c725df 100644
--- a/tcl/bitsbytes.tcl
+++ b/tcl/bitsbytes.tcl
@@ -2,33 +2,33 @@
 # Purpose - Create some $BIT variables
 #           Create $K and $M variables
 #          and some bit field extraction variables.
-# Creat helper variables ...
+# Create helper variables ...
 #    BIT0.. BIT31
 
-for { set x 0  } { $x < 32 } { set x [expr $x + 1]} {
+for { set x 0  } { $x < 32 } { set x [expr {$x + 1}]} {
     set vn [format "BIT%d" $x]
     global $vn
-    set $vn   [expr (1 << $x)]
+    set $vn   [expr {1 << $x}]
 }
 
 # Create K bytes values
 #    __1K ... to __2048K
-for { set x 1  } { $x < 2048 } { set x [expr $x * 2]} {
+for { set x 1  } { $x < 2048 } { set x [expr {$x * 2}]} {
     set vn [format "__%dK" $x]
     global $vn
-    set $vn   [expr (1024 * $x)]
+    set $vn   [expr {1024 * $x}]
 }
 
 # Create M bytes values
 #    __1M ... to __2048K
-for { set x 1  } { $x < 2048 } { set x [expr $x * 2]} {
+for { set x 1  } { $x < 2048 } { set x [expr {$x * 2}]} {
     set vn [format "__%dM" $x]
     global $vn
-    set $vn [expr (1024 * 1024 * $x)]
+    set $vn [expr {1024 * 1024 * $x}]
 }
 
 proc create_mask { MSB LSB } {
-    return [expr (((1 << ($MSB - $LSB + 1))-1) << $LSB)]
+    return [expr {((1 << ($MSB - $LSB + 1))-1) << $LSB}]
 }
 
 # Cut Bits $MSB to $LSB out of this value.
@@ -36,7 +36,7 @@ proc create_mask { MSB LSB } {
 # Result:  0x02340000
 
 proc extract_bitfield { VALUE MSB LSB } {
-    return [expr [create_mask $MSB $LSB] & $VALUE]
+    return [expr {[create_mask $MSB $LSB] & $VALUE}]
 }
 
 
@@ -47,15 +47,13 @@ proc extract_bitfield { VALUE MSB LSB } {
 # Result:  0x00000234
 #
 proc normalize_bitfield { VALUE MSB LSB } {
-    return [expr [extract_bitfield $VALUE $MSB $LSB ] >> $LSB]
+    return [expr {[extract_bitfield $VALUE $MSB $LSB ] >> $LSB}]
 }
 
 proc show_normalize_bitfield { VALUE MSB LSB } {
     set m [create_mask $MSB $LSB]
-    set mr [expr $VALUE & $m]
-    set sr [expr $mr >> $LSB]
+    set mr [expr {$VALUE & $m}]
+    set sr [expr {$mr >> $LSB}]
     echo [format "((0x%08x & 0x%08x) -> 0x%08x) >> %2d => (0x%x) %5d " $VALUE $m $mr $LSB $sr $sr]
    return $sr
 }
-
-