interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Antonio Borneo 2021-03-19 14:13:07 +01:00
parent 223b79ebe2
commit 82b6a41117
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jtag/startup.tcl
View File

@ -83,7 +83,8 @@ proc measure_clk {} {
set start_time [ms]; set start_time [ms];
set iterations 10000000; set iterations 10000000;
runtest $iterations; 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." add_help_text measure_clk "Runs a test to measure the JTAG clk. Useful with RCLK / RTCK."

4
src/target/startup.tcl
View File

@ -1,7 +1,7 @@
# Defines basic Tcl procs for OpenOCD target module # Defines basic Tcl procs for OpenOCD target module
proc new_target_name { } { proc new_target_name { } {
return [target number [expr [target count] - 1 ]] return [target number [expr {[target count] - 1}]]
} }
global in_process_reset global in_process_reset
@ -16,7 +16,7 @@ proc ocd_process_reset { MODE } {
} }
set in_process_reset 1 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 set in_process_reset 0
if {$success} { if {$success} {