diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2021-04-10 18:28:52 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-05-08 09:49:08 +0100 |
| commit | 64d89d5ee1a554fbae8eb0a7231ccb2dc4428c1a (patch) | |
| tree | 27b37e970a5b140d3e15968773629edeefdee33d /tcl/tools | |
| parent | f855fdcf0d95ff9ba18a83f9a97d5368844d4f2c (diff) | |
| download | riscv-openocd-64d89d5ee1a554fbae8eb0a7231ccb2dc4428c1a.zip riscv-openocd-64d89d5ee1a554fbae8eb0a7231ccb2dc4428c1a.tar.gz riscv-openocd-64d89d5ee1a554fbae8eb0a7231ccb2dc4428c1a.tar.bz2 | |
tcl: [3/3] 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'.
Fix manually the remaining lines that don't match simple patterns
and would require dedicated boring scripting.
Remove the 'expr' command where appropriate.
Change-Id: Ia75210c8447f88d38515addab4a836af9103096d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6161
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'tcl/tools')
| -rw-r--r-- | tcl/tools/memtest.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcl/tools/memtest.tcl b/tcl/tools/memtest.tcl index f3567ef..c7fa591 100644 --- a/tcl/tools/memtest.tcl +++ b/tcl/tools/memtest.tcl @@ -166,7 +166,7 @@ proc memTestDevice { baseAddress nBytes } { return $pattern } - set antiPattern [expr ~$pattern] + set antiPattern [expr {~$pattern}] memwrite32 [expr {$baseAddress + $offset}] $antiPattern } @@ -177,7 +177,7 @@ proc memTestDevice { baseAddress nBytes } { set data [memread32 $addr] set dataHex [convertToHex $data] set antiPatternHex [convertToHex $antiPattern] - if {[expr $dataHex != $antiPatternHex]} { + if {$dataHex != $antiPatternHex} { echo "FAILED memTestDevice_antipattern: Address: [convertToHex $addr], antiPattern: $antiPatternHex, Returned: $dataHex, offset: $offset" return $pattern } |