gdb/python: have PendingFrame methods accept keyword arguments

Update the two gdb.PendingFrame methods gdb.PendingFrame.read_register
and gdb.PendingFrame.create_unwind_info to accept keyword arguments.

There's no huge benefit for making this change, both of these methods
only take a single argument, so it is (maybe) less likely that a user
will take advantage of the keyword arguments in these cases, but I
think it's nice to be consistent, and I don't see any particular draw
backs to making this change.

For PendingFrame.read_register I've changed the argument name from
'reg' to 'register' in the documentation and used 'register' as the
argument name in GDB.  My preference for APIs is to use full words
where possible, and given we didn't support named arguments before
this change should not break any existing code.

There should be no user visible changes (for existing code) after this
commit.

Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Reviewed-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Andrew Burgess 2023-03-14 11:43:14 +00:00
parent d2d62da62e
commit 56fcb715a9
3 changed files with 20 additions and 15 deletions

View file

@ -2756,11 +2756,11 @@ unwinding.
An object passed to an unwinder (a @code{gdb.PendingFrame} instance) An object passed to an unwinder (a @code{gdb.PendingFrame} instance)
provides a method to read frame's registers: provides a method to read frame's registers:
@defun PendingFrame.read_register (reg) @defun PendingFrame.read_register (register)
This method returns the contents of the register @var{reg} in the This method returns the contents of @var{register} in the
frame as a @code{gdb.Value} object. For a description of the frame as a @code{gdb.Value} object. For a description of the
acceptable values of @var{reg} see acceptable values of @var{register} see
@ref{gdbpy_frame_read_register,,Frame.read_register}. If @var{reg} @ref{gdbpy_frame_read_register,,Frame.read_register}. If @var{register}
does not name a register for the current architecture, this method does not name a register for the current architecture, this method
will throw an exception. will throw an exception.

View file

@ -443,16 +443,17 @@ pending_framepy_repr (PyObject *self)
Returns the value of register REG as gdb.Value instance. */ Returns the value of register REG as gdb.Value instance. */
static PyObject * static PyObject *
pending_framepy_read_register (PyObject *self, PyObject *args) pending_framepy_read_register (PyObject *self, PyObject *args, PyObject *kw)
{ {
pending_frame_object *pending_frame = (pending_frame_object *) self; pending_frame_object *pending_frame = (pending_frame_object *) self;
PENDING_FRAMEPY_REQUIRE_VALID (pending_frame); PENDING_FRAMEPY_REQUIRE_VALID (pending_frame);
int regnum;
PyObject *pyo_reg_id; PyObject *pyo_reg_id;
static const char *keywords[] = { "register", nullptr };
if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "O", keywords, &pyo_reg_id))
return nullptr;
if (!PyArg_UnpackTuple (args, "read_register", 1, 1, &pyo_reg_id)) int regnum;
return NULL;
if (!gdbpy_parse_register_id (pending_frame->gdbarch, pyo_reg_id, &regnum)) if (!gdbpy_parse_register_id (pending_frame->gdbarch, pyo_reg_id, &regnum))
return nullptr; return nullptr;
@ -681,7 +682,8 @@ pending_framepy_function (PyObject *self, PyObject *args)
PendingFrame.create_unwind_info (self, frameId) -> UnwindInfo. */ PendingFrame.create_unwind_info (self, frameId) -> UnwindInfo. */
static PyObject * static PyObject *
pending_framepy_create_unwind_info (PyObject *self, PyObject *args) pending_framepy_create_unwind_info (PyObject *self, PyObject *args,
PyObject *kw)
{ {
PyObject *pyo_frame_id; PyObject *pyo_frame_id;
CORE_ADDR sp; CORE_ADDR sp;
@ -690,7 +692,9 @@ pending_framepy_create_unwind_info (PyObject *self, PyObject *args)
PENDING_FRAMEPY_REQUIRE_VALID ((pending_frame_object *) self); PENDING_FRAMEPY_REQUIRE_VALID ((pending_frame_object *) self);
if (!PyArg_ParseTuple (args, "O:create_unwind_info", &pyo_frame_id)) static const char *keywords[] = { "frame_id", nullptr };
if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "O", keywords,
&pyo_frame_id))
return nullptr; return nullptr;
pyuw_get_attr_code code pyuw_get_attr_code code
@ -1002,11 +1006,12 @@ gdbpy_initialize_unwind (void)
static PyMethodDef pending_frame_object_methods[] = static PyMethodDef pending_frame_object_methods[] =
{ {
{ "read_register", pending_framepy_read_register, METH_VARARGS, { "read_register", (PyCFunction) pending_framepy_read_register,
METH_VARARGS | METH_KEYWORDS,
"read_register (REG) -> gdb.Value\n" "read_register (REG) -> gdb.Value\n"
"Return the value of the REG in the frame." }, "Return the value of the REG in the frame." },
{ "create_unwind_info", { "create_unwind_info", (PyCFunction) pending_framepy_create_unwind_info,
pending_framepy_create_unwind_info, METH_VARARGS, METH_VARARGS | METH_KEYWORDS,
"create_unwind_info (FRAME_ID) -> gdb.UnwindInfo\n" "create_unwind_info (FRAME_ID) -> gdb.UnwindInfo\n"
"Construct UnwindInfo for this PendingFrame, using FRAME_ID\n" "Construct UnwindInfo for this PendingFrame, using FRAME_ID\n"
"to identify it." }, "to identify it." },

View file

@ -99,7 +99,7 @@ class TestUnwinder(Unwinder):
read_register_error = str(ve) read_register_error = str(ve)
frame_id = FrameId( frame_id = FrameId(
pending_frame.read_register(TestUnwinder.AMD64_RSP), pending_frame.read_register(register=TestUnwinder.AMD64_RSP),
pending_frame.read_register(TestUnwinder.AMD64_RIP), pending_frame.read_register(TestUnwinder.AMD64_RIP),
) )
unwind_info = pending_frame.create_unwind_info(frame_id) unwind_info = pending_frame.create_unwind_info(frame_id)
@ -156,7 +156,7 @@ class simple_unwinder(Unwinder):
captured_pending_frame = pending_frame captured_pending_frame = pending_frame
captured_pending_frame_repr = repr(pending_frame) captured_pending_frame_repr = repr(pending_frame)
fid = FrameId(self._sp, self._pc) fid = FrameId(self._sp, self._pc)
uw = pending_frame.create_unwind_info(fid) uw = pending_frame.create_unwind_info(frame_id=fid)
uw.add_saved_register("rip", gdb.Value(0x123)) uw.add_saved_register("rip", gdb.Value(0x123))
uw.add_saved_register("rbp", gdb.Value(0x456)) uw.add_saved_register("rbp", gdb.Value(0x456))
uw.add_saved_register("rsp", gdb.Value(0x789)) uw.add_saved_register("rsp", gdb.Value(0x789))