From patchwork Thu Oct 9 09:16:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Udma X-Patchwork-Id: 3154 Received: (qmail 6299 invoked by alias); 9 Oct 2014 09:21:45 -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 6287 invoked by uid 89); 9 Oct 2014 09:21:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 X-HELO: na01-by2-obe.outbound.protection.outlook.com Received: from mail-by2on0116.outbound.protection.outlook.com (HELO na01-by2-obe.outbound.protection.outlook.com) (207.46.100.116) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 09 Oct 2014 09:21:43 +0000 Received: from CH1PR03CA001.namprd03.prod.outlook.com (10.255.156.146) by BY2PR03MB174.namprd03.prod.outlook.com (10.242.36.142) with Microsoft SMTP Server (TLS) id 15.0.1044.10; Thu, 9 Oct 2014 09:21:38 +0000 Received: from BL2FFO11FD051.protection.gbl (10.255.156.132) by CH1PR03CA001.outlook.office365.com (10.255.156.146) with Microsoft SMTP Server (TLS) id 15.0.1049.19 via Frontend Transport; Thu, 9 Oct 2014 09:21:37 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD051.mail.protection.outlook.com (10.173.161.213) with Microsoft SMTP Server (TLS) id 15.0.1039.16 via Frontend Transport; Thu, 9 Oct 2014 09:21:37 +0000 Received: from udp122517uds.ea.freescale.net (udp122517uds.ea.freescale.net [10.171.74.8]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s999LZcs031887; Thu, 9 Oct 2014 02:21:35 -0700 From: Catalin Udma To: CC: Catalin Udma Subject: [PATCH v3] aarch64/gdbserver: fix floating point registers display Date: Thu, 9 Oct 2014 12:16:54 +0300 Message-ID: <1412846214-21419-1-git-send-email-catalin.udma@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(377424004)(199003)(189002)(44976005)(19580405001)(50986999)(19580395003)(15975445006)(15202345003)(89996001)(85852003)(88136002)(110136001)(33646002)(76482002)(21056001)(6806004)(48376002)(120916001)(99396003)(104166001)(31966008)(36756003)(50226001)(85306004)(77156001)(106466001)(50466002)(229853001)(92566001)(95666004)(93916002)(86362001)(87286001)(102836001)(105606002)(107046002)(68736004)(104016003)(69596002)(4396001)(97736003)(2351001)(80022003)(64706001)(81156004)(92726001)(26826002)(62966002)(84676001)(20776003)(46102003)(87936001)(47776003)(2004002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB174; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB174; X-Forefront-PRVS: 0359162B6D Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=catalin.udma@freescale.com; X-OriginatorOrg: freescale.com When using aarch64 gdb with gdbserver, floating point registers are not correctly displayed, as below: (gdb) info registers fpsr fpcr fpsr fpcr To fix these problems, the missing fpsr and fpcr registers are added when floating point registers are read/write Add test for aarch64 floating point PR server/17457 gdb/gdbserver/ 2014-10-09 Catalin Udma PR server/17457 * linux-aarch64-low.c (AARCH64_FPSR_REGNO): New define. (AARCH64_FPCR_REGNO): Likewise. (AARCH64_NUM_REGS): Update to include fpsr/fpcr registers. (aarch64_fill_fpregset): Add missing fpsr/fpcr registers. (aarch64_store_fpregset): Likewise. gdb/testsuite/ 2014-10-09 Catalin Udma PR server/17457 * gdb.arch/aarch64-fp.c: New file. * gdb.arch/aarch64-fp.exp: New file. Signed-off-by: Catalin Udma --- gdb/gdbserver/linux-aarch64-low.c | 8 +++- gdb/testsuite/gdb.arch/aarch64-fp.c | 38 +++++++++++++++ gdb/testsuite/gdb.arch/aarch64-fp.exp | 85 +++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletions(-) create mode 100644 gdb/testsuite/gdb.arch/aarch64-fp.c create mode 100644 gdb/testsuite/gdb.arch/aarch64-fp.exp diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 654b319..4fe023f 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -46,8 +46,10 @@ extern const struct target_desc *tdesc_aarch64; #define AARCH64_PC_REGNO 32 #define AARCH64_CPSR_REGNO 33 #define AARCH64_V0_REGNO 34 +#define AARCH64_FPSR_REGNO (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM) +#define AARCH64_FPCR_REGNO (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM + 1) -#define AARCH64_NUM_REGS (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM) +#define AARCH64_NUM_REGS (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM + 2) static int aarch64_regmap [] = @@ -255,6 +257,8 @@ aarch64_fill_fpregset (struct regcache *regcache, void *buf) for (i = 0; i < AARCH64_V_REGS_NUM; i++) collect_register (regcache, AARCH64_V0_REGNO + i, ®set->vregs[i]); + collect_register (regcache, AARCH64_FPSR_REGNO, ®set->fpsr); + collect_register (regcache, AARCH64_FPCR_REGNO, ®set->fpcr); } static void @@ -265,6 +269,8 @@ aarch64_store_fpregset (struct regcache *regcache, const void *buf) for (i = 0; i < AARCH64_V_REGS_NUM; i++) supply_register (regcache, AARCH64_V0_REGNO + i, ®set->vregs[i]); + supply_register (regcache, AARCH64_FPSR_REGNO, ®set->fpsr); + supply_register (regcache, AARCH64_FPCR_REGNO, ®set->fpcr); } /* Enable miscellaneous debugging output. The name is historical - it diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.c b/gdb/testsuite/gdb.arch/aarch64-fp.c new file mode 100644 index 0000000..c52647d --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-fp.c @@ -0,0 +1,38 @@ +/* This file is part of GDB, the GNU debugger. + + Copyright 2008-2014 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) +{ + char buf0[] = {0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f}; + char buf1[] = {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f}; + long val; + void *addr; + + addr = &buf0[0]; + __asm __volatile ("ldr %x0, [%1]" : "=r" (val) : "r" (&addr)); + __asm __volatile ("ldr q0, [x0]"); + + addr = &buf1[0]; + __asm __volatile ("ldr %x0, [%1]" : "=r" (val) : "r" (&addr)); + __asm __volatile ("ldr q1, [x0]"); + + return 1; +} + diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp new file mode 100644 index 0000000..c9785a9 --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp @@ -0,0 +1,85 @@ +# Copyright 2008-2014 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# This file is part of the gdb testsuite. + +# PR server/17457 +# Test aarch64 floating point registers q0, q1, v0, v1, fpsr, fpcr + +if {![istarget "aarch64*"]} { + verbose "Skipping ${gdb_test_file_name}." + return +} + +standard_testfile +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { + return -1 +} + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +set endianness "little" +set test "show endian" +gdb_test_multiple $test $test { + -re "(.* )(big|little)( endian.*)$gdb_prompt $" { + set endianness $expect_out(2,string) + pass "endianness" + } +} + +gdb_test "break ${srcfile}:[gdb_get_line_number "return"]" \ + "Breakpoint $decimal at 0x\[0-9a-fA-F\]+: file .*${srcfile}.*\\\." \ + "set the breakpoint after setting the fp registers" + +gdb_test "continue" \ + "Continuing.*Breakpoint $decimal.*" \ + "continue until breakpoint" + +if {$endianness == "little"} { + set reg_value0 "0x1f1e1d1c1b1a19181716151413121110" + set reg_value1 "0x2f2e2d2c2b2a29282726252423222120" +} else { + set reg_value0 "0x101112131415161718191a1b1c1d1e1f" + set reg_value1 "0x202122232425262728292a2b2c2d2e2f" +} + +gdb_test "info registers q0" \ + "q0.*{u = $reg_value0, s = $reg_value0.*" \ + "check register q0 value" + +gdb_test "info registers q1" \ + "q1.*{u = $reg_value1, s = $reg_value1.*" \ + "check register q1 value" + +gdb_test "info registers v0" \ + "v0.*$reg_value0}}}" \ + "check register v0 value" + +gdb_test "info registers v1" \ + "v1.*$reg_value1}}}" \ + "check register v1 value" + +gdb_test "info registers fpsr" \ + "fpsr.*0x\[0-9a-fA-F\].*" \ + "check register fpsr value" + +gdb_test "info registers fpcr" \ + "fpcr.*0x\[0-9a-fA-F\].*" \ + "check register fpcr value" +