From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 64691 invoked by alias); 27 Jan 2018 14:32: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 64682 invoked by uid 89); 27 Jan 2018 14:32:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,KAM_SHORT,RCVD_IN_DNSWL_NONE,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=patience, stw X-HELO: mail.rt-rk.com Received: from mx2.rt-rk.com (HELO mail.rt-rk.com) (89.216.37.149) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 27 Jan 2018 14:32:53 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 0B1CC1A200E; Sat, 27 Jan 2018 15:32:50 +0100 (CET) Received: from [10.10.13.119] (rtrkw512-lin.domain.local [10.10.13.119]) by mail.rt-rk.com (Postfix) with ESMTPSA id E29E11A1D99; Sat, 27 Jan 2018 15:32:49 +0100 (CET) Subject: Re: [PING][PATCH] Fix for prologue processing on PowerPC To: Pedro Franco de Carvalho , Kevin Buettner Cc: gdb-patches@sourceware.org, "Ananthakrishna Sowda (asowda)" , "Ivan Baev (ibaev)" , 'Nemanja Popov' , Djordje Todorovic , Ulrich.Weigand@de.ibm.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> From: Nikola Prica Message-ID: <19f6449e-3028-2dda-d637-3b3a379a21b7@rt-rk.com> Date: Sat, 27 Jan 2018 14:32:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <87h8rh8y5j.fsf@linux.vnet.ibm.com> Content-Type: multipart/mixed; boundary="------------7ACC2B582B9AB00468312C6A" X-SW-Source: 2018-01/txt/msg00569.txt.bz2 This is a multi-part message in MIME format. --------------7ACC2B582B9AB00468312C6A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 121 Hi Pedro, Thank you for your review and patience. I'm really grateful. Can someone commit this patch? Thanks, Nikola --------------7ACC2B582B9AB00468312C6A Content-Type: text/x-patch; name="0001-Fix-for-prologue-processing-on-PowerPc.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-for-prologue-processing-on-PowerPc.patch" Content-length: 6128 >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 --------------7ACC2B582B9AB00468312C6A--