f5657aa76e
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>
60 lines
1.6 KiB
Tcl
60 lines
1.6 KiB
Tcl
#----------------------------------------
|
|
# Purpose - Create some $BIT variables
|
|
# Create $K and $M variables
|
|
# and some bit field extraction variables.
|
|
# Creat helper variables ...
|
|
# BIT0.. BIT31
|
|
|
|
for { set x 0 } { $x < 32 } { set x [expr {$x + 1}]} {
|
|
set vn [format "BIT%d" $x]
|
|
global $vn
|
|
set $vn [expr {1 << $x}]
|
|
}
|
|
|
|
# Create K bytes values
|
|
# __1K ... to __2048K
|
|
for { set x 1 } { $x < 2048 } { set x [expr {$x * 2}]} {
|
|
set vn [format "__%dK" $x]
|
|
global $vn
|
|
set $vn [expr {1024 * $x}]
|
|
}
|
|
|
|
# Create M bytes values
|
|
# __1M ... to __2048K
|
|
for { set x 1 } { $x < 2048 } { set x [expr {$x * 2}]} {
|
|
set vn [format "__%dM" $x]
|
|
global $vn
|
|
set $vn [expr {1024 * 1024 * $x}]
|
|
}
|
|
|
|
proc create_mask { MSB LSB } {
|
|
return [expr {((1 << ($MSB - $LSB + 1))-1) << $LSB}]
|
|
}
|
|
|
|
# Cut Bits $MSB to $LSB out of this value.
|
|
# Example: % format "0x%08x" [extract_bitfield 0x12345678 27 16]
|
|
# Result: 0x02340000
|
|
|
|
proc extract_bitfield { VALUE MSB LSB } {
|
|
return [expr [create_mask $MSB $LSB] & $VALUE]
|
|
}
|
|
|
|
|
|
# Cut bits $MSB to $LSB out of this value
|
|
# and shift (normalize) them down to bit 0.
|
|
#
|
|
# Example: % format "0x%08x" [normalize_bitfield 0x12345678 27 16]
|
|
# Result: 0x00000234
|
|
#
|
|
proc normalize_bitfield { VALUE MSB LSB } {
|
|
return [expr [extract_bitfield $VALUE $MSB $LSB ] >> $LSB]
|
|
}
|
|
|
|
proc show_normalize_bitfield { VALUE MSB LSB } {
|
|
set m [create_mask $MSB $LSB]
|
|
set mr [expr {$VALUE & $m}]
|
|
set sr [expr {$mr >> $LSB}]
|
|
echo [format "((0x%08x & 0x%08x) -> 0x%08x) >> %2d => (0x%x) %5d " $VALUE $m $mr $LSB $sr $sr]
|
|
return $sr
|
|
}
|