mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: v850: fix cpu_option testsuite handling

Browse Source 
The v850 testsuite code has been testing the $opt variable, but this
was never actually set anywhere globally or v850-specific.  Instead,
this was a random variable leaking out of the sh testsuite code.  As
far as I can tell, it has always been this way.  That means the code
only ever tested the v850 cpu target (which is the default).

This failure can be easily seen in practice by running the v850 code
in isolation and seeing it crash:
$ runtest v850/allinsns.exp
...
Running target unix
Using /usr/share/dejagnu/baseboards/unix.exp as board description file for target.
Using /usr/share/dejagnu/config/unix.exp as generic interface file for target.
Using ../../../sim/testsuite/config/default.exp as tool-and-target-specific interface file.
WARNING: Assuming target board is the local machine (which is probably wrong).
You may need to set your DEJAGNU environment variable.
Running ../../../sim/testsuite/v850/allinsns.exp ...
ERROR: tcl error sourcing ../../../sim/testsuite/v850/allinsns.exp.
ERROR: tcl error code TCL LOOKUP VARNAME opt
ERROR: can't read "opt": no such variable
    while executing
"switch -regexp -- $opt {

Backing up a bit, the reason for this logic in the first place is
because the common sim testsuite code makes an assumption about the
assembler options with cpu_option -- the option and its value are
always separated by an =.  This is not the case with v850.  So tweak
the core sim logic a bit to support omitting the = so that we can
switch v850 to the standard all_machs setting and avoid opt entirely.
This commit is contained in:
Mike Frysinger 2021-11-20 22:46:52 -05:00
parent c2851b66eb
commit bbda248c50
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sim/testsuite/lib/sim-defs.exp
View File

@ -187,6 +187,7 @@ proc run_sim_test { name requested_machs } {
global SIMFLAGS
global opts
global cpu_option
global cpu_option_sep
global global_as_options
global global_ld_options
global global_cc_options
@ -323,7 +324,12 @@ proc run_sim_test { name requested_machs } {
set as_options "$opts(as,$mach) -I$srcdir/$subdir"
if [info exists cpu_option] {
set as_options "$as_options $cpu_option=$mach"
if ![info exists cpu_option_sep] {
set sep "="
} {
set sep $cpu_option_sep
}
set as_options "$as_options $cpu_option$sep$mach"
}
regsub {(^ *| +)([^ ]+)} "$as_options $global_as_options" { -Wa,\2} c_as_options

27
sim/testsuite/v850/allinsns.exp
View File

@ -1,19 +1,14 @@
# v850 simulator testsuite.
if [istarget v850*-*] {
global opt
# All machines.
# Should add more cpus if the testsuite adds coverage for their insns, but
# at the core level, there's no deviation beyond these two.
set all_machs "v850e v850"
# all machines
switch -regexp -- $opt {
.*v850e.* {
set all_machs "v850e"
}
default {
set all_machs "v850"
}
}
# gas doesn't support any '=' option for v850.
#set cpu_option -m
set cpu_option_sep ""
set cpu_option -m
# The .cgs suffix is for "cgen .s".
foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
@ -24,12 +19,6 @@ if [istarget v850*-*] {
}
run_sim_test $src $all_machs
}
}
#foreach var [lsort [info globals]] {
# if [array exists ::$var] {
# puts [format "%-27s %s" $var Array:]
# continue
# }
# puts [format "%-30s %s" $var "[set ::$var]"]
#}
unset cpu_option cpu_option_sep
}