From 9fcf688e800e089217ecc8a47b228be180866df8 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 7 Jul 2015 16:58:19 +0100 Subject: New proc is_aarch32_target GDB tests running on arm target should be also run on aarch32 (32-bit mode on aarch64). There should be no difference. It is not precise to check target triplet to decide which tests should be run, because if I compiler all the test binary in 32-bit (arm program), but target triplet is still aarch64, so that these arm specific tests are skipped. This patch is to add a new proc is_aarch32_target which return true if target triplet is arm or the test binary is compiled for arm. gdb/testsuite: 2015-07-07 Yao Qi * lib/gdb.exp (is_aarch32_target): New proc. * gdb.arch/arm-bl-branch-dest.exp: Check is_aarch32_target instead of "istarget "arm*-*-*"". * gdb.arch/arm-disp-step.exp: Likewise. * gdb.arch/thumb-bx-pc.exp: Likewise. * gdb.arch/thumb-prologue.exp: Likewise. * gdb.arch/thumb-singlestep.exp: Likewise. * gdb.base/disp-step-syscall.exp: Likewise. * gdb.base/float.exp: Likewise. --- gdb/testsuite/ChangeLog | 12 +++++++++ gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp | 2 +- gdb/testsuite/gdb.arch/arm-disp-step.exp | 2 +- gdb/testsuite/gdb.arch/thumb-bx-pc.exp | 2 +- gdb/testsuite/gdb.arch/thumb-prologue.exp | 2 +- gdb/testsuite/gdb.arch/thumb-singlestep.exp | 2 +- gdb/testsuite/gdb.base/disp-step-syscall.exp | 2 +- gdb/testsuite/gdb.base/float.exp | 2 +- gdb/testsuite/lib/gdb.exp | 37 +++++++++++++++++++++++++++ 9 files changed, 56 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6009cdb..11f6424 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,17 @@ 2015-07-07 Yao Qi + * lib/gdb.exp (is_aarch32_target): New proc. + * gdb.arch/arm-bl-branch-dest.exp: Check is_aarch32_target + instead of "istarget "arm*-*-*"". + * gdb.arch/arm-disp-step.exp: Likewise. + * gdb.arch/thumb-bx-pc.exp: Likewise. + * gdb.arch/thumb-prologue.exp: Likewise. + * gdb.arch/thumb-singlestep.exp: Likewise. + * gdb.base/disp-step-syscall.exp: Likewise. + * gdb.base/float.exp: Likewise. + +2015-07-07 Yao Qi + * gdb.base/catch-syscall.exp (test_catch_syscall_multi_arch): Set arch1, arch2, syscall1_name, syscall2_name and syscall_number. diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp index 9a64054..f35548a 100644 --- a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp +++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![istarget "arm*-*-*"] } { +if { ![is_aarch32_target] } { verbose "Skipping ${gdb_test_file_name}." return } diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp index e191f73..83858ca 100644 --- a/gdb/testsuite/gdb.arch/arm-disp-step.exp +++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp @@ -17,7 +17,7 @@ # Test arm displaced stepping. -if {![istarget "arm*-*-*"]} then { +if {![is_aarch32_target]} then { verbose "Skipping arm displaced stepping tests." return } diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp index f402339..05be0e1 100644 --- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp +++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp @@ -15,7 +15,7 @@ # Test PC adjustment from Thumb-mode "bx pc" instruction. -if {![istarget arm*-*]} then { +if {![is_aarch32_target]} then { verbose "Skipping ARM tests." return } diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp index 8e3d293..a34beb2 100644 --- a/gdb/testsuite/gdb.arch/thumb-prologue.exp +++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp @@ -15,7 +15,7 @@ # Test ARM/Thumb prologue analyzer. -if {![istarget arm*-*]} then { +if {![is_aarch32_target]} then { verbose "Skipping ARM prologue tests." return } diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp index e7a865f..b1d2eb3 100644 --- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp +++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp @@ -15,7 +15,7 @@ # Test single-stepping into incorrectly marked Thumb routine -if {![istarget arm*-*]} then { +if {![is_aarch32_target]} then { verbose "Skipping ARM tests." return } diff --git a/gdb/testsuite/gdb.base/disp-step-syscall.exp b/gdb/testsuite/gdb.base/disp-step-syscall.exp index b13dce4..ec3fccc 100644 --- a/gdb/testsuite/gdb.base/disp-step-syscall.exp +++ b/gdb/testsuite/gdb.base/disp-step-syscall.exp @@ -26,7 +26,7 @@ set syscall_insn "" if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { set syscall_insn "\[ \t\](int|syscall|sysenter)\[ \t\]" -} elseif [istarget "arm*-*-linux*"] { +} elseif [is_aarch32_target] { set syscall_insn "\[ \t\](swi|svc)\[ \t\]" } else { return -1 diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp index f351795..a7183cf 100644 --- a/gdb/testsuite/gdb.base/float.exp +++ b/gdb/testsuite/gdb.base/float.exp @@ -40,7 +40,7 @@ if { [istarget "aarch64*-*-*"] } then { gdb_test "info float" "d0.*d1.*d31.*s0.*s1.*s31.*" "info float" } elseif { [istarget "alpha*-*-*"] } then { gdb_test "info float" "f0.*" "info float" -} elseif { [istarget "arm*-*-*"] } then { +} elseif { [is_aarch32_target] } then { gdb_test_multiple "info float" "info float" { -re "Software FPU type.*mask:.*flags:.*$gdb_prompt $" { pass "info float (FPA)" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 381297a..e8ae08c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2271,6 +2271,43 @@ proc is_x86_like_target {} { return [expr [is_ilp32_target] && ![is_amd64_regs_target]] } +# Return 1 if this target is an arm or aarch32 on aarch64. + +gdb_caching_proc is_aarch32_target { + if { [istarget "arm*-*-*"] } { + return 1 + } + + if { ![istarget "aarch64*-*-*"] } { + return 0 + } + + set me "is_aarch32_target" + + set src [standard_temp_file aarch32[pid].s] + set obj [standard_temp_file aarch32[pid].o] + + set list {} + foreach reg \ + {r0 r1 r2 r3} { + lappend list "\tmov $reg, $reg" + } + gdb_produce_source $src [join $list \n] + + verbose "$me: compiling testfile $src" 2 + set lines [gdb_compile $src $obj object {quiet}] + file delete $src + file delete $obj + + if ![string match "" $lines] then { + verbose "$me: testfile compilation failed, returning 0" 2 + return 0 + } + + verbose "$me: returning 1" 2 + return 1 +} + # Return 1 if displaced stepping is supported on target, otherwise, return 0. proc support_displaced_stepping {} { -- cgit v1.1