tcl: [1/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'.

In the TCL scripts distributed with OpenOCD there are 1700+ lines
that should be modified before switching to jimtcl 0.81.

Apply the script below on every script in tcl folder. It fixes
more than 92% of the lines

%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
 #!/usr/bin/perl -Wpi

 my $re_sym = qr{[a-z_][a-z0-9_]*}i;
 my $re_var = qr{(?:\$|\$::)$re_sym};
 my $re_const = qr{0x[0-9a-f]+|[0-9]+|[0-9]*\.[0-9]*}i;
 my $re_item = qr{(?:~\s*)?(?:$re_var|$re_const)};
 my $re_op = qr{<<|>>|[+\-*/&|]};
 my $re_expr = qr{(
     (?:\(\s*(?:$re_item|(?-1))\s*\)|$re_item)
     \s*$re_op\s*
     (?:$re_item|(?-1)|\(\s*(?:$re_item|(?-1))\s*\))
 )}x;

 # [expr [dict get $regsC100 SYM] + HEXNUM]
 s/\[expr (\[dict get $re_var $re_sym\s*\] \+ *$re_const)\]/\[expr \{$1\}\]/;

 # [ expr (EXPR) ]
 # [ expr EXPR ]
 # note: $re_expr captures '$3'
 s/\[(\s*expr\s*)\((\s*$re_expr\s*)\)(\s*)\]/\[$1\{$2\}$4\]/;
 s/\[(\s*expr\s*)($re_expr)(\s*)\]/\[$1\{$2\}$4\]/;
%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---

Change-Id: I0d6bddc6abf6dd29062f2b4e72b5a2b5080293b9
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6159
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

3 files changed, 4 insertions, 4 deletions

diff --git a/tcl/cpu/arc/em.tcl b/tcl/cpu/arc/em.tcl
index f0455bb..595a351 100644
--- a/tcl/cpu/arc/em.tcl
+++ b/tcl/cpu/arc/em.tcl
@@ -27,6 +27,6 @@ proc arc_em_reset { {target ""} } {
 	# This is specific to ARC EM.
 	set debug [arc jtag get-aux-reg 5]
 	if { !($debug & (1 << 20)) } {
-		arc jtag set-aux-reg 5 [expr $debug | (1 << 20)]
+		arc jtag set-aux-reg 5 [expr {$debug | (1 << 20)}]
 	}
 }
diff --git a/tcl/cpu/arc/hs.tcl b/tcl/cpu/arc/hs.tcl
index f39f2a7..181f993 100644
--- a/tcl/cpu/arc/hs.tcl
+++ b/tcl/cpu/arc/hs.tcl
@@ -48,7 +48,7 @@ proc arc_hs_reset { {target ""} } {
 			$target arc jtag set-aux-reg 0x904 1
 			set l2_ctrl [$target arc jtag get-aux-reg 0x903]
 			set l2_ctrl [$target arc jtag get-aux-reg 0x903]
-			while { [expr $l2_ctrl & 0x100] != 0 } {
+			while { [expr {$l2_ctrl & 0x100}] != 0 } {
 				set l2_ctrl [$target arc jtag get-aux-reg 0x903]
 			}
 		}
diff --git a/tcl/cpu/arc/v2.tcl b/tcl/cpu/arc/v2.tcl
index a3172c2..364e8af 100644
--- a/tcl/cpu/arc/v2.tcl
+++ b/tcl/cpu/arc/v2.tcl
@@ -41,7 +41,7 @@ proc arc_v2_examine_target { {target ""} } {
 			# 0b01 - 4 actionpoints
 			# 0b10 - 8 actionpoints
 			# 0b11 - reserved.
-			set ap_num [expr 0x2 << ($ap_build_type & 3)]
+			set ap_num [expr {0x2 << ($ap_build_type & 3)}]
 			# Expression on top may produce 16 action points - which is a
 			# reserved value for now.
 			if { $ap_num < 16 } {
@@ -341,6 +341,6 @@ proc arc_v2_reset { {target ""} } {
 	# to write directly via JTAG layer...
 	set num_ap [arc num-actionpoints]
 	for {set i 0} {$i < $num_ap} {incr i} {
-		arc jtag set-aux-reg [expr 0x222 + $i * 3] 0
+		arc jtag set-aux-reg [expr {0x222 + $i * 3}] 0
 	}
 }