X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tcl%2Fmmr_helpers.tcl;h=61c58e7ca3cfcfe381d1b19bf504691cfc9b3052;hb=69ea481e0b3607085cc05cbc5ca41740c9f938f6;hp=ce116e4598fb5cc1c33b5552849faa6ca75c0cf9;hpb=e7b2958229c7e0d7e98e130764aa50d1ca9017d3;p=fw%2Fopenocd

diff --git a/tcl/mmr_helpers.tcl b/tcl/mmr_helpers.tcl
index ce116e459..61c58e7ca 100644
--- a/tcl/mmr_helpers.tcl
+++ b/tcl/mmr_helpers.tcl
@@ -2,7 +2,7 @@
 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.
@@ -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.
 
@@ -45,14 +45,14 @@ proc show_mmr32_bits { NAMES VAL } {
     for { set x 24 } { $x >= 0 } { incr x -8 } {
 	echo -n "  "
 	for { set y 7 } { $y >= 0 } { incr y -1 } {
-	    set s $MYNAMES([expr $x + $y])
-	    echo -n [format "%2d: %-*s | " [expr $x + $y] $w $s ]
+	    set s $MYNAMES([expr {$x + $y}])
+	    echo -n [format "%2d: %-*s | " [expr {$x + $y}] $w $s ]
 	}
 	echo ""
 
 	echo -n "  "
 	for { set y 7 } { $y >= 0 } { incr y -1 } {
-	    echo -n [format "    %d%*s | " [expr !!($VAL & (1 << ($x + $y)))] [expr $w -1] ""]
+	    echo -n [format "    %d%*s | " [expr {!!($VAL & (1 << ($x + $y)))}] [expr {$w -1}] ""]
 	}
 	echo ""
     }
@@ -60,7 +60,7 @@ proc show_mmr32_bits { NAMES VAL } {
 
 
 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_ ] {
@@ -70,3 +70,22 @@ proc show_mmr_bitfield { MSB LSB VAL FIELDNAME FIELDVALUES } {
     }
     echo [format "%-15s: %d (0x%0*x) %s" $FIELDNAME $nval $width $nval $sval ]
 }
+
+# Give: ADDR - address of the register.
+#       BIT - bit's number.
+
+proc get_mmr_bit { ADDR BIT } {
+	set val [memread32 $ADDR]
+	set bit_val [expr {$val & [expr {1 << $BIT}]}]
+	return $bit_val
+}
+
+
+# Give: ADDR - address of the register.
+#       MSB - MSB bit's number.
+#       LSB - LSB bit's number.
+
+proc get_mmr_bitfield { ADDR MSB LSB } {
+	set rval [memread32 $ADDR]
+	return normalize_bitfield $rval $MSB $LSB
+}