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>
22 lines
1.1 KiB
INI
22 lines
1.1 KiB
INI
set AT91_RSTC_CR [expr {$AT91_RSTC + 0x00}] ;# Reset Controller Control Register
|
|
set AT91_RSTC_PROCRST [expr {1 << 0}] ;# Processor Reset
|
|
set AT91_RSTC_PERRST [expr {1 << 2}] ;# Peripheral Reset
|
|
set AT91_RSTC_EXTRST [expr {1 << 3}] ;# External Reset
|
|
set AT91_RSTC_KEY [expr {0xa5 << 24}] ;# KEY Password
|
|
|
|
set AT91_RSTC_SR [expr {$AT91_RSTC + 0x04}] ;# Reset Controller Status Register
|
|
set AT91_RSTC_URSTS [expr {1 << 0}] ;# User Reset Status
|
|
set AT91_RSTC_RSTTYP [expr {7 << 8}] ;# Reset Type
|
|
set AT91_RSTC_RSTTYP_GENERAL [expr {0 << 8}]
|
|
set AT91_RSTC_RSTTYP_WAKEUP [expr {1 << 8}]
|
|
set AT91_RSTC_RSTTYP_WATCHDOG [expr {2 << 8}]
|
|
set AT91_RSTC_RSTTYP_SOFTWARE [expr {3 << 8}]
|
|
set AT91_RSTC_RSTTYP_USER [expr {4 << 8}]
|
|
set AT91_RSTC_NRSTL [expr {1 << 16}] ;# NRST Pin Level
|
|
set AT91_RSTC_SRCMP [expr {1 << 17}] ;# Software Reset Command in Progress
|
|
|
|
set AT91_RSTC_MR [expr {$AT91_RSTC + 0x08}] ;# Reset Controller Mode Register
|
|
set AT91_RSTC_URSTEN [expr {1 << 0}] ;# User Reset Enable
|
|
set AT91_RSTC_URSTIEN [expr {1 << 4}] ;# User Reset Interrupt Enable
|
|
set AT91_RSTC_ERSTL [expr {0xf << 8}] ;# External Reset Length
|