From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 90044 invoked by alias); 1 Jul 2015 13:58:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 89907 invoked by uid 89); 1 Jul 2015 13:58:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f51.google.com Received: from mail-pa0-f51.google.com (HELO mail-pa0-f51.google.com) (209.85.220.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 01 Jul 2015 13:58:49 +0000 Received: by pactm7 with SMTP id tm7so23601895pac.2 for ; Wed, 01 Jul 2015 06:58:47 -0700 (PDT) X-Received: by 10.70.103.70 with SMTP id fu6mr56345894pdb.22.1435759127356; Wed, 01 Jul 2015 06:58:47 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by mx.google.com with ESMTPSA id sc7sm2417503pbb.85.2015.07.01.06.58.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jul 2015 06:58:47 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 07/11] New proc is_aarch32_target Date: Wed, 01 Jul 2015 13:58:00 -0000 Message-Id: <1435759111-22856-8-git-send-email-yao.qi@linaro.org> In-Reply-To: <1435759111-22856-1-git-send-email-yao.qi@linaro.org> References: <1435759111-22856-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00033.txt.bz2 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-06-19 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/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 +++++++++++++++++++++++++++ 8 files changed, 44 insertions(+), 7 deletions(-) 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 07adaaf..ba75570 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 c0e0cb1..b29b8c4 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 {} { -- 1.9.1