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>
73 lines
1.8 KiB
INI
73 lines
1.8 KiB
INI
set _ENDIAN big
|
|
|
|
if { [info exists CHIPNAME] } {
|
|
set _CHIPNAME $CHIPNAME
|
|
} else {
|
|
set _CHIPNAME or1k
|
|
}
|
|
|
|
if { [info exists TAP_TYPE] } {
|
|
set _TAP_TYPE $TAP_TYPE
|
|
} else {
|
|
puts "You need to select a tap type"
|
|
shutdown
|
|
}
|
|
|
|
# Configure the target
|
|
if { [string compare $_TAP_TYPE "VJTAG"] == 0 } {
|
|
if { [info exists FPGATAPID] } {
|
|
set _FPGATAPID $FPGATAPID
|
|
} else {
|
|
puts "You need to set your FPGA JTAG ID"
|
|
shutdown
|
|
}
|
|
|
|
jtag newtap $_CHIPNAME cpu -irlen 10 -expected-id $_FPGATAPID
|
|
|
|
set _TARGETNAME $_CHIPNAME.cpu
|
|
target create $_TARGETNAME or1k -endian $_ENDIAN -chain-position $_TARGETNAME
|
|
|
|
# Select the TAP core we are using
|
|
tap_select vjtag
|
|
|
|
} elseif { [string compare $_TAP_TYPE "XILINX_BSCAN"] == 0 } {
|
|
|
|
if { [info exists FPGATAPID] } {
|
|
set _FPGATAPID $FPGATAPID
|
|
} else {
|
|
puts "You need to set your FPGA JTAG ID"
|
|
shutdown
|
|
}
|
|
|
|
jtag newtap $_CHIPNAME cpu -irlen 6 -expected-id $_FPGATAPID
|
|
|
|
set _TARGETNAME $_CHIPNAME.cpu
|
|
target create $_TARGETNAME or1k -endian $_ENDIAN -chain-position $_TARGETNAME
|
|
|
|
# Select the TAP core we are using
|
|
tap_select xilinx_bscan
|
|
} else {
|
|
# OpenCores Mohor JTAG TAP ID
|
|
set _CPUTAPID 0x14951185
|
|
|
|
jtag newtap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID
|
|
|
|
set _TARGETNAME $_CHIPNAME.cpu
|
|
target create $_TARGETNAME or1k -endian $_ENDIAN -chain-position $_TARGETNAME
|
|
|
|
# Select the TAP core we are using
|
|
tap_select mohor
|
|
}
|
|
|
|
# Select the debug unit core we are using. This debug unit as an option.
|
|
|
|
set ADBG_USE_HISPEED 1
|
|
set ENABLE_JSP_SERVER 2
|
|
set ENABLE_JSP_MULTI 4
|
|
|
|
# If ADBG_USE_HISPEED is set (options bit 1), status bits will be skipped
|
|
# on burst reads and writes to improve download speeds.
|
|
# This option must match the RTL configured option.
|
|
|
|
du_select adv [expr {$ADBG_USE_HISPEED | $ENABLE_JSP_SERVER | $ENABLE_JSP_MULTI}]
|