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>
21 lines
965 B
INI
21 lines
965 B
INI
set AT91_SMC_READMODE [expr {1 << 0}] ;# Read Mode
|
|
set AT91_SMC_WRITEMODE [expr {1 << 1}] ;# Write Mode
|
|
set AT91_SMC_EXNWMODE [expr {3 << 4}] ;# NWAIT Mode
|
|
set AT91_SMC_EXNWMODE_DISABLE [expr {0 << 4}]
|
|
set AT91_SMC_EXNWMODE_FROZEN [expr {2 << 4}]
|
|
set AT91_SMC_EXNWMODE_READY [expr {3 << 4}]
|
|
set AT91_SMC_BAT [expr {1 << 8}] ;# Byte Access Type
|
|
set AT91_SMC_BAT_SELECT [expr {0 << 8}]
|
|
set AT91_SMC_BAT_WRITE [expr {1 << 8}]
|
|
set AT91_SMC_DBW [expr {3 << 12}] ;# Data Bus Width */
|
|
set AT91_SMC_DBW_8 [expr {0 << 12}]
|
|
set AT91_SMC_DBW_16 [expr {1 << 12}]
|
|
set AT91_SMC_DBW_32 [expr {2 << 12}]
|
|
set AT91_SMC_TDFMODE [expr {1 << 20}] ;# TDF Optimization - Enabled
|
|
set AT91_SMC_PMEN [expr {1 << 24}] ;# Page Mode Enabled
|
|
set AT91_SMC_PS [expr {3 << 28}] ;# Page Size
|
|
set AT91_SMC_PS_4 [expr {0 << 28}]
|
|
set AT91_SMC_PS_8 [expr {1 << 28}]
|
|
set AT91_SMC_PS_16 [expr {2 << 28}]
|
|
set AT91_SMC_PS_32 [expr {3 << 28}]
|