From patchwork Wed Jan 15 11:51:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Machado X-Patchwork-Id: 182840 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp6783824ile; Wed, 15 Jan 2020 03:52:18 -0800 (PST) X-Google-Smtp-Source: APXvYqwh+/BwVT04y+2LjrjiL9aYXCh1q/bR5wvWO3zoJS7S330GqYRz3nvQfvhZwXeHmmkzleW+ X-Received: by 2002:a9d:53cb:: with SMTP id i11mr2486102oth.158.1579089138649; Wed, 15 Jan 2020 03:52:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579089138; cv=none; d=google.com; s=arc-20160816; b=YU4xOtXrigFsLhprXCB2KhLyBfgw/1a2xNeeMKezpEXMRcfcB00wMNvFoq/w0Ago2r JUP4Td/TSkII7gjseIMehoqTipf2J+v+KEHfcY7+P9tnxd26/OgH5F2xLLJKuHBcBZ/R hAPnny2zELhUV2brXBDvXbq1lAmZRCgkXxG4PK/6599uOFh2noYPH91ASzvIVHSN7g8f 7mcw98Rnl+qY+c1agMGLa3MJyORTAyAU5kgEjc8C9DPoiRoNGbQMH3pe16J8AxYGrSqn urEj8e+/qXNqHsws4ktfOIg+ekBWjQ+epOywxPI6AKsum4VKk84kUs9d26PEI36p1Mek 2pwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=Gm4HtV7jIg83Wo6jvW8yZlBHEjXuxdFc/Zjv8vihiqo=; b=S3uXLJORe9sFp+74qryDSX2OIewjHpP0aI0JZvGTNCwQwX1BzPUO06v3YQz5LMJpoG BqbbvWKzbTB8rw7OnM8Tc+kmtvAGn6qq7KmmHF+S6fni6OGgymTSRhgDN4fZUju4Dfmm k52M62hw46Ad5+M+jYj4h02PxsWV3Nm/VonTCoflZ0jzzzhm0HTg4e2D3VgUM+Covy1P QImVt6y9mWYHJ2u+Xiih/OtOaZXM35YTaVs/VkV1EXZ1nWF/jFS0LxVGWjBC4h1aDhOG +QkxzImnL++eiSiR85BoTEsZ6R1mTWooiTIgOw5gCV3T3MdpeB+unohfuHT6cBh/oxHw iPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="pBSn/e36"; dkim=pass header.i=@linaro.org header.s=google header.b="UzF3M/5B"; spf=pass (google.com: domain of gdb-patches-return-163101-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gdb-patches-return-163101-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id v9si7106189ote.229.2020.01.15.03.52.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jan 2020 03:52:18 -0800 (PST) Received-SPF: pass (google.com: domain of gdb-patches-return-163101-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="pBSn/e36"; dkim=pass header.i=@linaro.org header.s=google header.b="UzF3M/5B"; spf=pass (google.com: domain of gdb-patches-return-163101-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gdb-patches-return-163101-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=a2TGukzFkzm8cLbXZBcqE3GSRp7TONH M/v97GK9wwC4g4iYXwWQkzNG5+tIqAJYKI1L2ahI7Ejc1HTcuKfIeMees9xJAVj3 0nKayQPCkOH1qswELe859naa2M/ZhKP5/815bNwo5Gwok3DCJaFJLRgwmJhAmhpq 5WG36qxXg86k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=YkuEKTqw1hWTGHHcuXXyKvWU97c=; b=pBSn/ e36ejgkeCjXvvJtFjdotrhJrqTY4/l6asc5ieHeYw/drHj0JxLafsDLlfPuEpjk9 NAN7z3ZOk4ASLFgai7wrwhWpKRwEVoo+sSzKlziG1jdmfOb+yYEEeqCb/GViewZo trkFcLmyLAb5K8WTbqoqmz7Kw6A7jL056JIZLo= Received: (qmail 66105 invoked by alias); 15 Jan 2020 11:52:06 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 66045 invoked by uid 89); 15 Jan 2020 11:52:06 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qv1-f54.google.com Received: from mail-qv1-f54.google.com (HELO mail-qv1-f54.google.com) (209.85.219.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 15 Jan 2020 11:51:55 +0000 Received: by mail-qv1-f54.google.com with SMTP id m14so7195652qvl.3 for ; Wed, 15 Jan 2020 03:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gm4HtV7jIg83Wo6jvW8yZlBHEjXuxdFc/Zjv8vihiqo=; b=UzF3M/5BA3cf2RuO9bz0lFQxrbADHHjyDifQXUUX/eH7/huJ7DV7VJ82mWMXv3ULHJ mUrYtazmpDJtoenRRXoZx3Gg7Z1TZEfUPTUJ9OlfvKh/Cr5ih5PbzkOujQ2JwaMqzsBH wY5COrQWLhpt2+xu847cff+6UNnP1jPqs6dxaEu25kz5Xa2iiJTn51Ff81AD5lYQN3uN SGZMIZVRcBl0IGxzZtJPplzC1gfzxvSqZ4547MbIS9qAEw71Srq7M0p0lzV6GXkfyEQO FUmDXtsGhGd61J0mbvBgIv5s6rNe7eCP41hsLDCBnxaZwekZWXd1OtxW/CNR1JFjJ9Ww Z4zg== Return-Path: Received: from localhost.localdomain ([179.177.239.131]) by smtp.gmail.com with ESMTPSA id k14sm8231592qki.66.2020.01.15.03.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 03:51:52 -0800 (PST) From: Luis Machado To: gdb-patches@sourceware.org Cc: simark@simark.ca, tankut.baris.aktemur@intel.com, alan.hayward@arm.com Subject: [PATCH 2/2, v3] [AArch64] Test handling of additional brk instruction patterns Date: Wed, 15 Jan 2020 08:51:37 -0300 Message-Id: <20200115115137.17771-3-luis.machado@linaro.org> In-Reply-To: <20200115115137.17771-1-luis.machado@linaro.org> References: <20200115115137.17771-1-luis.machado@linaro.org> X-IsSubscribed: yes New in v3: - Minor formatting and code cleanups. - Added count check to validate number of brk SIGTRAP's. - Moved count to SIGTRAP check conditional block. This test exercises the previous patch's code and makes sure GDB can properly get a SIGTRAP from various brk instruction patterns. GDB needs to be able to see the program exiting normally. If GDB doesn't support the additional brk instructions, we will see timeouts. We bail out with the first timeout since we won't be able to step through the program breakpoint anyway, so it is no use carrying on. gdb/testsuite/ChangeLog: 2020-01-15 Luis Machado * gdb.arch/aarch64-brk-patterns.c: New source file. * gdb.arch/aarch64-brk-patterns.exp: New test. --- gdb/testsuite/gdb.arch/aarch64-brk-patterns.c | 30 ++++++++ .../gdb.arch/aarch64-brk-patterns.exp | 74 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 gdb/testsuite/gdb.arch/aarch64-brk-patterns.c create mode 100644 gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp -- 2.17.1 diff --git a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.c b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.c new file mode 100644 index 0000000000..ccf9a35a94 --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.c @@ -0,0 +1,30 @@ +/* This file is part of GDB, the GNU debugger. + + Copyright 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int main(void) +{ + /* Dummy instruction just so GDB doesn't stop at the first breakpoint + instruction. */ + __asm __volatile ("nop\n\t"); + + /* Multiple BRK instruction patterns. */ + __asm __volatile ("brk %0\n\t" ::"n"(0x0)); + __asm __volatile ("brk %0\n\t" ::"n"(0x900 + 0xf)); + __asm __volatile ("brk %0\n\t" ::"n"(0xf000)); + + return 0; +} diff --git a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp new file mode 100644 index 0000000000..9a0ec81efa --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp @@ -0,0 +1,74 @@ +# Copyright 2020 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# This file is part of the gdb testsuite. + +# Test if GDB stops at various BRK instruction patterns inserted into +# the code. + +if {![is_aarch64_target]} { + verbose "Skipping ${gdb_test_file_name}." + return +} + +standard_testfile +if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { + return -1 +} + +if {![runto_main]} { + untested "could not run to main" + return -1 +} + +# Number of expected SIGTRAP's to get. This needs to be kept in sync +# with the source file. +set expected_traps 3 +set keep_going 1 +set count 0 +set old_timeout $timeout +set timeout 10 + +while {$keep_going} { + + set test "brk instruction $count causes SIGTRAP" + + # Continue to next program breakpoint instruction. + gdb_test_multiple "continue" $test { + -re "Program received signal SIGTRAP, Trace/breakpoint trap.*$gdb_prompt $" { + pass $test + + # Insert a breakpoint at the program breakpoint instruction so GDB + # can step over it. + gdb_test "break" \ + "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \ + "insert breakpoint at brk instruction $count" + incr count + } + -re "exited normally.*$gdb_prompt $" { + set keep_going 0 + } + timeout { + fail $test + set keep_going 0 + } + } +} + +set timeout $old_timeout + +if {$count < $expected_traps} { + fail "all brk instructions triggered." +}