From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70181 invoked by alias); 31 Jan 2018 18:04:13 -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 70169 invoked by uid 89); 31 Jan 2018 18:04:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,KAM_SHORT,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=grateful X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Jan 2018 18:04:10 +0000 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0VI0XWL041237 for ; Wed, 31 Jan 2018 13:04:09 -0500 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fujbgs4wq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 31 Jan 2018 13:04:08 -0500 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 31 Jan 2018 13:04:07 -0500 Received: from b01cxnp23033.gho.pok.ibm.com (9.57.198.28) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 31 Jan 2018 13:04:04 -0500 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0VI44F93408252; Wed, 31 Jan 2018 18:04:04 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 30ECB112034; Wed, 31 Jan 2018 13:02:09 -0500 (EST) Received: from pedro.localdomain (unknown [9.85.139.40]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP id E5A45112040; Wed, 31 Jan 2018 13:02:07 -0500 (EST) Received: by pedro.localdomain (Postfix, from userid 1000) id B4E283C55C5; Wed, 31 Jan 2018 16:03:49 -0200 (-02) From: Pedro Franco de Carvalho To: Nikola Prica , Kevin Buettner Cc: gdb-patches@sourceware.org, "Ananthakrishna Sowda \(asowda\)" , "Ivan Baev \(ibaev\)" , "'Nemanja Popov'" , Djordje Todorovic , Ulrich.Weigand@de.ibm.com Subject: Re: [PING][PATCH] Fix for prologue processing on PowerPC In-Reply-To: <19f6449e-3028-2dda-d637-3b3a379a21b7@rt-rk.com> References: <20171108095850.394a48ca@pinnacle.lan> <8bf0014c-e83c-5988-4d06-173572f21186@rt-rk.com> <7ba16b14-9384-34d9-937e-531a2192842a@linux.vnet.ibm.com> <87608p4dgr.fsf@linux.vnet.ibm.com> <87r2qx4oit.fsf@linux.vnet.ibm.com> <20038806-69e5-b7ce-479b-54185089145b@rt-rk.com> <90e3f502-7d22-d22e-4bf0-3b0db43347d6@rt-rk.com> <87h8rh8y5j.fsf@linux.vnet.ibm.com> <19f6449e-3028-2dda-d637-3b3a379a21b7@rt-rk.com> Date: Wed, 31 Jan 2018 18:04:00 -0000 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-GCONF: 00 x-cbid: 18013118-0044-0000-0000-000003D8E1A4 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008456; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000248; SDB=6.00983102; UDB=6.00498560; IPR=6.00762386; BA=6.00005805; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019307; XFM=3.00000015; UTC=2018-01-31 18:04:06 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18013118-0045-0000-0000-000008084C92 Message-Id: <87y3kdrjlm.fsf@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-01-31_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=7 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801310230 X-IsSubscribed: yes X-SW-Source: 2018-01/txt/msg00668.txt.bz2 Looks good to me. Just two details for the testsuite changelog, the filenames in the entry don't match the actual filenames, and there's a space between the "*" and the entries. I tested the patch with ppc64le and ppc32, and it works. No regressions. Thanks! Pedro Nikola Prica writes: > Hi Pedro, > > Thank you for your review and patience. I'm really grateful. > > Can someone commit this patch? > > Thanks, > > Nikola > From 4b32b0441739d7daa931b13029f1c8215a4b1f4e Mon Sep 17 00:00:00 2001 > From: Prica > Date: Thu, 11 Jan 2018 14:49:15 +0100 > Subject: [PATCH] Fix for prologue processing on PowerPc > > One of conditions in skip_prologue() was never visited if there was mflr > instruction that moves the link register to a register different thant r0. > This condition expects non shifted value of `lr_reg`. Previously offset > of link register was never saved for registers different than r0. > > gdb/ChangeLog: > > 2018-01-27 Nikola Prica > > *rs6000-tdep.c (skip_prologue): Remove shifting for lr_reg and > assign shifted lr_reg to fdata->lr_register when lr_reg is set. > > gdb/testsuite/ChangeLog: > > 2018-01-27 Nikola Prica > > *gdb.arch/ppc-prologue-frame.s: New file. > *gdb.arch/ppc-prologue-frame.c: Likewise. > *gdb.arch/ppr-prologue-frame.exp: Likewise. > --- > gdb/rs6000-tdep.c | 4 +-- > gdb/testsuite/gdb.arch/powerpc-prologue-frame.S | 35 +++++++++++++++++++ > gdb/testsuite/gdb.arch/powerpc-prologue-frame.c | 28 ++++++++++++++++ > gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp | 41 +++++++++++++++++++++++ > 4 files changed, 106 insertions(+), 2 deletions(-) > create mode 100644 gdb/testsuite/gdb.arch/powerpc-prologue-frame.S > create mode 100644 gdb/testsuite/gdb.arch/powerpc-prologue-frame.c > create mode 100644 gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp > > diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c > index e5a265d..da5182e 100644 > --- a/gdb/rs6000-tdep.c > +++ b/gdb/rs6000-tdep.c > @@ -1654,7 +1654,7 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, > remember just the first one, but skip over additional > ones. */ > if (lr_reg == -1) > - lr_reg = (op & 0x03e00000) >> 21; > + lr_reg = (op & 0x03e00000); > if (lr_reg == 0) > r0_contains_arg = 0; > continue; > @@ -2180,7 +2180,7 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, > #endif /* 0 */ > > if (pc == lim_pc && lr_reg >= 0) > - fdata->lr_register = lr_reg; > + fdata->lr_register = lr_reg >> 21; > > fdata->offset = -fdata->offset; > return last_prologue_pc; > diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue-frame.S b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.S > new file mode 100644 > index 0000000..e30ca23 > --- /dev/null > +++ b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.S > @@ -0,0 +1,35 @@ > +/* This test is part of GDB, the GNU debugger. > + > + Copyright 2018 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 . */ > + > +#include > + > +FUNC_START(foo) > + stwu 1,-32(1) > + mflr 3 > + stw 3,36(1) > + stw 31,28(1) > + mr 31,1 > + bl bar > + mr 9,3 > + mr 3,9 > + addi 11,31,32 > + lwz 0,4(11) > + mtlr 0 > + lwz 31,-4(11) > + mr 1,11 > + blr > +FUNC_END(foo) > diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue-frame.c b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.c > new file mode 100644 > index 0000000..8cab6f2 > --- /dev/null > +++ b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.c > @@ -0,0 +1,28 @@ > +/* This test is part of GDB, the GNU debugger. > + > + Copyright 2018 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 bar() > +{ > + return 0; > +} > + > +int foo(); > + > +int main(void) > +{ > + return foo(); > +} > diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp > new file mode 100644 > index 0000000..d26314b > --- /dev/null > +++ b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp > @@ -0,0 +1,41 @@ > +# Copyright 2018 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 > + > +if {![istarget "powerpc-*-*"] } { > + verbose "Skipping powerpc back trace test." > + return > +} > + > +standard_testfile .c .S > +set binfile [standard_output_file ${testfile}] > + > +if {[gdb_compile \ > + [list ${srcdir}/${subdir}/$srcfile ${srcdir}/${subdir}/$srcfile2] \ > + "${binfile}" executable {}] != ""} { > + untested "failed to build $binfile" > + return -1 > +} > + > + > +clean_restart ${binfile} > + > +if ![runto bar] { > + untested "could not run to bar" > + return -1 > +} > + > +gdb_test "bt" \ > + "#0\[ \t\]*$hex in bar.*\r\n#1\[ \t\]*$hex in foo.*\r\n#2\[ \t\]*$hex in main.*" \ > + "Backtrace to the main frame" > -- > 2.7.4