From: Andrew Burgess <andrew.burgess@embecosm.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/5] gdb/python: Add architecture method to gdb.PendingFrame
Date: Wed, 17 Jun 2020 18:38:06 +0100 [thread overview]
Message-ID: <caa019bbebccd33d40e837cec89403c687a3c143.1592415321.git.andrew.burgess@embecosm.com> (raw)
In-Reply-To: <cover.1592415321.git.andrew.burgess@embecosm.com>
It could be useful to determine the architecture of a frame being
unwound during the frame unwind process, that is, before we have a
gdb.Frame, but when we only have a gdb.PendingFrame.
The PendingFrame already has a pointer to the gdbarch internally, this
commit just exposes an 'architecture' method to Python, and has this
return a gdb.Architecture object (list gdb.Frame.architecture does).
gdb/ChangeLog:
* python/py-unwind.c (pending_framepy_architecture): New function.
(pending_frame_object_methods): Add architecture method.
gdb/testsuite/ChangeLog:
* gdb.python/py-unwind.py (TestUnwinder::__call__): Add test for
gdb.PendingFrame.architecture method.
gdb/doc/ChangeLog:
* python.texi (Unwinding Frames in Python): Document
PendingFrame.architecture method.
---
gdb/ChangeLog | 5 +++++
gdb/doc/ChangeLog | 5 +++++
gdb/doc/python.texi | 6 ++++++
gdb/python/py-unwind.c | 20 ++++++++++++++++++++
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.python/py-unwind.py | 10 +++++++++-
6 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
index a38f1dab426..e919b3cfd7e 100644
--- a/gdb/doc/python.texi
+++ b/gdb/doc/python.texi
@@ -2518,6 +2518,12 @@
@end defun
+@defun PendingFrame.architecture ()
+Return the @code{gdb.Architecture} (@pxref{Architectures In Python})
+for this @code{gdb.PendingFrame}. This represents the architecture of
+the particual frame being unwound.
+@end defun
+
@subheading Unwinder Output: UnwindInfo
Use @code{PendingFrame.create_unwind_info} method described above to
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index d583ff462b0..1cef491cedf 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -441,6 +441,22 @@ pending_framepy_create_unwind_info (PyObject *self, PyObject *args)
frame_id_build_special (sp, pc, special));
}
+/* Implementation of PendingFrame.architecture (self) -> gdb.Architecture. */
+
+static PyObject *
+pending_framepy_architecture (PyObject *self, PyObject *args)
+{
+ pending_frame_object *pending_frame = (pending_frame_object *) self;
+
+ if (pending_frame->frame_info == NULL)
+ {
+ PyErr_SetString (PyExc_ValueError,
+ "Attempting to read register from stale PendingFrame");
+ return NULL;
+ }
+ return gdbarch_to_arch_object (pending_frame->gdbarch);
+}
+
/* frame_unwind.this_id method. */
static void
@@ -671,6 +687,10 @@ static PyMethodDef pending_frame_object_methods[] =
"create_unwind_info (FRAME_ID) -> gdb.UnwindInfo\n"
"Construct UnwindInfo for this PendingFrame, using FRAME_ID\n"
"to identify it." },
+ { "architecture",
+ pending_framepy_architecture, METH_NOARGS,
+ "architecture () -> gdb.Architecture\n"
+ "The architecture for this PendingFrame." },
{NULL} /* Sentinel */
};
diff --git a/gdb/testsuite/gdb.python/py-unwind.py b/gdb/testsuite/gdb.python/py-unwind.py
index 42dd6fe138c..d01da80f25b 100644
--- a/gdb/testsuite/gdb.python/py-unwind.py
+++ b/gdb/testsuite/gdb.python/py-unwind.py
@@ -30,7 +30,6 @@ class FrameId(object):
def pc(self):
return self._pc
-
class TestUnwinder(Unwinder):
AMD64_RBP = 6
AMD64_RSP = 7
@@ -69,6 +68,15 @@ class TestUnwinder(Unwinder):
This unwinder recognizes the corrupt frames by checking that
*RBP == RBP, and restores previous RBP from the word above it.
"""
+
+ # Check that we can access the architecture of the pending
+ # frame, and that this is the same architecture as for the
+ # currently selected inferior.
+ inf_arch = gdb.selected_inferior ().architecture ()
+ frame_arch = pending_frame.architecture ()
+ if (inf_arch != frame_arch):
+ raise gdb.GdbError ("architecture mismatch")
+
try:
# NOTE: the registers in Unwinder API can be referenced
# either by name or by number. The code below uses both
--
2.25.4
next prev parent reply other threads:[~2020-06-17 17:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 17:38 [PATCH 0/5] Python Unwinders and Inline Frames Andrew Burgess
2020-06-17 17:38 ` [PATCH 1/5] gdb: Remove deprecated_set_gdbarch_data Andrew Burgess
2020-06-18 21:11 ` Tom Tromey
2020-06-17 17:38 ` Andrew Burgess [this message]
2020-06-17 18:20 ` [PATCH 2/5] gdb/python: Add architecture method to gdb.PendingFrame Eli Zaretskii
2020-06-18 21:18 ` Tom Tromey
2020-06-17 17:38 ` [PATCH 3/5] gdb/python: Add gdb.Architecture.registers method Andrew Burgess
2020-06-17 18:25 ` Eli Zaretskii
2020-06-18 21:24 ` Tom Tromey
2020-06-17 17:38 ` [PATCH 4/5] gdb/python: New method to access list of register groups Andrew Burgess
2020-06-17 18:27 ` Eli Zaretskii
2020-06-17 18:40 ` Christian Biesinger
2020-06-18 8:44 ` Andrew Burgess
2020-06-18 21:27 ` Tom Tromey
2020-06-17 17:38 ` [PATCH 5/5] gdb: Fix Python unwinders and inline frames Andrew Burgess
2020-06-17 21:14 ` Luis Machado
2020-06-18 8:25 ` Andrew Burgess
2020-06-18 10:29 ` Luis Machado
2020-06-18 17:42 ` Andrew Burgess
2020-06-18 21:35 ` Tom Tromey
2020-06-22 15:47 ` Andrew Burgess
2020-06-23 14:16 ` Luis Machado
2020-07-02 21:07 ` Andrew Burgess
2020-07-06 17:43 ` Andrew Burgess
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=caa019bbebccd33d40e837cec89403c687a3c143.1592415321.git.andrew.burgess@embecosm.com \
--to=andrew.burgess@embecosm.com \
--cc=gdb-patches@sourceware.org \
/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).