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>
43 lines
1.0 KiB
Tcl
43 lines
1.0 KiB
Tcl
# Helper for common memory read/modify/write procedures
|
|
|
|
# mrw: "memory read word", returns value of $reg
|
|
proc mrw {reg} {
|
|
set value ""
|
|
mem2array value 32 $reg 1
|
|
return $value(0)
|
|
}
|
|
|
|
add_usage_text mrw "address"
|
|
add_help_text mrw "Returns value of word in memory."
|
|
|
|
# mrh: "memory read halfword", returns value of $reg
|
|
proc mrh {reg} {
|
|
set value ""
|
|
mem2array value 16 $reg 1
|
|
return $value(0)
|
|
}
|
|
|
|
add_usage_text mrh "address"
|
|
add_help_text mrh "Returns value of halfword in memory."
|
|
|
|
# mrb: "memory read byte", returns value of $reg
|
|
proc mrb {reg} {
|
|
set value ""
|
|
mem2array value 8 $reg 1
|
|
return $value(0)
|
|
}
|
|
|
|
add_usage_text mrb "address"
|
|
add_help_text mrb "Returns value of byte in memory."
|
|
|
|
# mmw: "memory modify word", updates value of $reg
|
|
# $reg <== ((value & ~$clearbits) | $setbits)
|
|
proc mmw {reg setbits clearbits} {
|
|
set old [mrw $reg]
|
|
set new [expr {($old & ~$clearbits) | $setbits}]
|
|
mww $reg $new
|
|
}
|
|
|
|
add_usage_text mmw "address setbits clearbits"
|
|
add_help_text mmw "Modify word in memory. new_val = (old_val & ~clearbits) | setbits;"
|