From: Nikola Prica <nikola.prica@rt-rk.com>
To: Pedro Franco de Carvalho <pedromfc@linux.vnet.ibm.com>,
Kevin Buettner <kevinb@redhat.com>
Cc: gdb-patches@sourceware.org,
"Ananthakrishna Sowda (asowda)" <asowda@cisco.com>,
"Ivan Baev (ibaev)" <ibaev@cisco.com>,
'Nemanja Popov' <nemanja.popov@rt-rk.com>,
Djordje Todorovic <Djordje.Todorovic@rt-rk.com>,
Ulrich.Weigand@de.ibm.com
Subject: Re: [PING][PATCH] Fix for prologue processing on PowerPC
Date: Sat, 27 Jan 2018 14:32:00 -0000 [thread overview]
Message-ID: <19f6449e-3028-2dda-d637-3b3a379a21b7@rt-rk.com> (raw)
In-Reply-To: <87h8rh8y5j.fsf@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 121 bytes --]
Hi Pedro,
Thank you for your review and patience. I'm really grateful.
Can someone commit this patch?
Thanks,
Nikola
[-- Attachment #2: 0001-Fix-for-prologue-processing-on-PowerPc.patch --]
[-- Type: text/x-patch, Size: 6127 bytes --]
From 4b32b0441739d7daa931b13029f1c8215a4b1f4e Mon Sep 17 00:00:00 2001
From: Prica <nprica@rt-rk.com>
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 <nikola.prica@rt-rk.com>
*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 <nikola.prica@rt-rk.com>
*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 <http://www.gnu.org/licenses/>. */
+
+#include <ppc-asm.h>
+
+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 <http://www.gnu.org/licenses/>. */
+
+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 <http://www.gnu.org/licenses/>
+
+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
next prev parent reply other threads:[~2018-01-27 14:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 12:11 Nikola Prica
2017-10-05 2:01 ` Kevin Buettner
2017-10-26 10:02 ` [PING]Fix " Nikola Prica
2017-11-08 16:58 ` Kevin Buettner
2017-11-09 18:15 ` [PING][PATCH] Fix " Nikola Prica
2017-12-01 19:37 ` pedromfc
2017-12-19 15:57 ` Nikola Prica
2017-12-29 18:05 ` Pedro Franco de Carvalho
2018-01-09 11:22 ` Nikola Prica
2018-01-10 17:26 ` Pedro Franco de Carvalho
2018-01-11 15:12 ` Nikola Prica
2018-01-19 7:49 ` Nikola Prica
2018-01-19 19:01 ` Pedro Franco de Carvalho
2018-01-19 19:08 ` Pedro Franco de Carvalho
2018-01-27 14:32 ` Nikola Prica [this message]
2018-01-31 18:04 ` Pedro Franco de Carvalho
2018-01-31 18:28 ` Ulrich Weigand
2018-02-01 13:09 ` Nikola Prica
2018-01-02 10:29 ` Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19f6449e-3028-2dda-d637-3b3a379a21b7@rt-rk.com \
--to=nikola.prica@rt-rk.com \
--cc=Djordje.Todorovic@rt-rk.com \
--cc=Ulrich.Weigand@de.ibm.com \
--cc=asowda@cisco.com \
--cc=gdb-patches@sourceware.org \
--cc=ibaev@cisco.com \
--cc=kevinb@redhat.com \
--cc=nemanja.popov@rt-rk.com \
--cc=pedromfc@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).