startup.tcl: prepare for jimtcl 0.81 'expr' syntax change

Jimtcl commit 1843b79a03dd ("expr: TIP 526, only support a single
arg") drops the support for multi-argument syntax for the TCL
command 'expr'.

Modify the script startup.tcl compiled-in OpenOCD binary to comply
with the new jimtcl.

Change-Id: I520dcafacadaa289a815035f93f250447ca66ea0
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6158
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index c1eb2b2ee00aaf84aa4a3543485ae51fa936877a..3060c5c0643a8e5888dbf8be6c4b1d363e738dff 100644 (file)
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -81,9 +81,10 @@ proc srst_asserted {} {
 # measure actual JTAG clock
 proc measure_clk {} {
        set start_time [ms];
-        set iterations 10000000;
+       set iterations 10000000;
        runtest $iterations;
-       echo "Running at more than [expr $iterations.0 / ([ms]-$start_time)] kHz";
+       set speed [expr "$iterations.0 / ([ms] - $start_time)"]
+       echo "Running at more than $speed kHz";
 }
 
 add_help_text measure_clk "Runs a test to measure the JTAG clk. Useful with RCLK / RTCK."

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index cee036697459b387ab6058befa04a13b532587e6..54a3942c529b57713d00a3cafd618ce5ea171ab3 100644 (file)
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -1,7 +1,7 @@
 # Defines basic Tcl procs for OpenOCD target module
 
 proc new_target_name { } {
-       return [target number [expr [target count] - 1 ]]
+       return [target number [expr {[target count] - 1}]]
 }
 
 global in_process_reset
@@ -16,7 +16,7 @@ proc ocd_process_reset { MODE } {
        }
 
        set in_process_reset 1
-       set success [expr [catch {ocd_process_reset_inner $MODE} result]==0]
+       set success [expr {[catch {ocd_process_reset_inner $MODE} result] == 0}]
        set in_process_reset 0
 
        if {$success} {