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>
47 lines
2.6 KiB
INI
47 lines
2.6 KiB
INI
|
|
set AT91_MATRIX_MCFG [expr {$AT91_MATRIX + 0x00}] ;# Master Configuration Register #
|
|
set AT91_MATRIX_RCB0 [expr {1 << 0}] ;# Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master)
|
|
set AT91_MATRIX_RCB1 [expr {1 << 1}] ;# Remap Command for AHB Master 1 (ARM926EJ-S Data Master)
|
|
|
|
set AT91_MATRIX_SCFG0 [expr {$AT91_MATRIX + 0x04}] ;# Slave Configuration Register 0
|
|
set AT91_MATRIX_SCFG1 [expr {$AT91_MATRIX + 0x08}] ;# Slave Configuration Register 1
|
|
set AT91_MATRIX_SCFG2 [expr {$AT91_MATRIX + 0x0C}] ;# Slave Configuration Register 2
|
|
set AT91_MATRIX_SCFG3 [expr {$AT91_MATRIX + 0x10}] ;# Slave Configuration Register 3
|
|
set AT91_MATRIX_SCFG4 [expr {$AT91_MATRIX + 0x14}] ;# Slave Configuration Register 4
|
|
set AT91_MATRIX_SLOT_CYCLE [expr {0xff << 0}] ;# Maximum Number of Allowed Cycles for a Burst
|
|
set AT91_MATRIX_DEFMSTR_TYPE [expr {3 << 16}] ;# Default Master Type
|
|
set AT91_MATRIX_DEFMSTR_TYPE_NONE [expr {0 << 16}]
|
|
set AT91_MATRIX_DEFMSTR_TYPE_LAST [expr {1 << 16}]
|
|
set AT91_MATRIX_DEFMSTR_TYPE_FIXED [expr {2 << 16}]
|
|
set AT91_MATRIX_FIXED_DEFMSTR [expr {7 << 18}] ;# Fixed Index of Default Master
|
|
|
|
set AT91_MATRIX_TCR [expr {$AT91_MATRIX + 0x24}] ;# TCM Configuration Register
|
|
set AT91_MATRIX_ITCM_SIZE [expr {0xf << 0}] ;# Size of ITCM enabled memory block
|
|
set AT91_MATRIX_ITCM_0 [expr {0 << 0}]
|
|
set AT91_MATRIX_ITCM_16 [expr {5 << 0}]
|
|
set AT91_MATRIX_ITCM_32 [expr {6 << 0}]
|
|
set AT91_MATRIX_ITCM_64 [expr {7 << 0}]
|
|
set AT91_MATRIX_DTCM_SIZE [expr {0xf << 4}] ;# Size of DTCM enabled memory block
|
|
set AT91_MATRIX_DTCM_0 [expr {0 << 4}]
|
|
set AT91_MATRIX_DTCM_16 [expr {5 << 4}]
|
|
set AT91_MATRIX_DTCM_32 [expr {6 << 4}]
|
|
set AT91_MATRIX_DTCM_64 [expr {7 << 4}]
|
|
|
|
set AT91_MATRIX_EBICSA [expr {$AT91_MATRIX + 0x30}] ;# EBI Chip Select Assignment Register
|
|
set AT91_MATRIX_CS1A [expr {1 << 1}] ;# Chip Select 1 Assignment
|
|
set AT91_MATRIX_CS1A_SMC [expr {0 << 1}]
|
|
set AT91_MATRIX_CS1A_SDRAMC [expr {1 << 1}]
|
|
set AT91_MATRIX_CS3A [expr {1 << 3}] ;# Chip Select 3 Assignment
|
|
set AT91_MATRIX_CS3A_SMC [expr {0 << 3}]
|
|
set AT91_MATRIX_CS3A_SMC_SMARTMEDIA [expr {1 << 3}]
|
|
set AT91_MATRIX_CS4A [expr {1 << 4}] ;# Chip Select 4 Assignment
|
|
set AT91_MATRIX_CS4A_SMC [expr {0 << 4}]
|
|
set AT91_MATRIX_CS4A_SMC_CF1 [expr {1 << 4}]
|
|
set AT91_MATRIX_CS5A [expr {1 << 5}] ;# Chip Select 5 Assignment
|
|
set AT91_MATRIX_CS5A_SMC [expr {0 << 5}]
|
|
set AT91_MATRIX_CS5A_SMC_CF2 [expr {1 << 5}]
|
|
set AT91_MATRIX_DBPUC [expr {1 << 8}] ;# Data Bus Pull-up Configuration
|
|
|
|
set AT91_MATRIX_USBPUCR [expr {$AT91_MATRIX + 0x34}] ;# USB Pad Pull-Up Control Register
|
|
set AT91_MATRIX_USBPUCR_PUON [expr {1 << 30}] ;# USB Device PAD Pull-up Enable
|