Introduce gdb.FinishBreakpoint in Python
* Makefile.in (SUBDIR_PYTHON_OBS): Add py-finishbreakpoint.o. (SUBDIR_PYTHON_SRCS): Add python/py-finishbreakpoint.c. Add build rule for this file. * infcmd.c (print_return_value): Split to create get_return_value. (get_return_value): New function based on print_return_value. Handle case where stop_registers are not set. * inferior.h (get_return_value): New prototype. * python/py-breakpoint.c (bppy_pending_object): Make non-static. (gdbpy_breakpoint_created): Set is_py_finish_bp is necessary. (struct breakpoint_object): Move to python-internal.h (BPPY_REQUIRE_VALID): Likewise. (BPPY_SET_REQUIRE_VALID): Likewise. (gdbpy_breakpoint_created): Initialize is_finish_bp. (gdbpy_should_stop): Add pre/post hooks before/after calling stop method. * python/python-internal.h (breakpoint_object_type): Add as extern. (bppy_pending_object): Likewise. (typedef struct breakpoint_object) Removed. (struct breakpoint_object): Moved from py-breakpoint.c. Add field is_finish_bp. (BPPY_REQUIRE_VALID): Moved from py-breakpoint.c. (BPPY_SET_REQUIRE_VALID): Likewise. (frame_object_to_frame_info): New prototype. (gdbpy_initialize_finishbreakpoints): New prototype. (bpfinishpy_is_finish_bp): Likewise. (bpfinishpy_pre_stop_hook): Likewise. (bpfinishpy_post_stop_hook): Likewise. * python/py-finishbreakpoint.c: New file. * python/py-frame.c(frame_object_to_frame_info): Make non-static and accept PyObject instead of frame_object. (frapy_is_valid): Don't cast to frame_object. (frapy_name): Likewise. (frapy_type): Likewise. (frapy_unwind_stop_reason): Likewise. (frapy_pc): Likewise. (frapy_block): Likewise. (frapy_function): Likewise. (frapy_older): Likewise. (frapy_newer): Likewise. (frapy_find_sal): Likewise. (frapy_read_var): Likewise. (frapy_select): Likewise. * python/python.c (gdbpy_is_stopped_at_finish_bp): New noop function. (_initialize_python): Add gdbpy_initialize_finishbreakpoints. * python/python.h: Include breakpoint.h (gdbpy_is_stopped_at_finish_bp): New prototype. doc/ * gdb.texinfo (Finish Breakpoints in Python): New subsection. (Python API): Add menu entry for Finish Breakpoints. testsuite/ * Makefile.in (EXECUTABLES): Add py-finish-breakpoint and py-finish-breakpoint2 (MISCALLANEOUS): Add py-events-shlib.so and py-events-shlib-nodebug.so * gdb.python/py-breakpoint.exp (mult_line): Define and use variable instead of line number. * gdb.python/py-finish-breakpoint.c: New file. * gdb.python/py-finish-breakpoint.exp: New file. * gdb.python/py-finish-breakpoint.py: New file. * gdb.python/py-finish-breakpoint2.cc: New file. * gdb.python/py-finish-breakpoint2.exp: New file. * gdb.python/py-finish-breakpoint2.py: New file.
This commit is contained in:
parent
6538471c25
commit
cc72b2a2da
23 changed files with 1329 additions and 69 deletions
|
@ -31,52 +31,16 @@
|
|||
#include "arch-utils.h"
|
||||
#include "language.h"
|
||||
|
||||
static PyTypeObject breakpoint_object_type;
|
||||
|
||||
/* Number of live breakpoints. */
|
||||
static int bppy_live;
|
||||
|
||||
/* Variables used to pass information between the Breakpoint
|
||||
constructor and the breakpoint-created hook function. */
|
||||
static breakpoint_object *bppy_pending_object;
|
||||
breakpoint_object *bppy_pending_object;
|
||||
|
||||
/* Function that is called when a Python condition is evaluated. */
|
||||
static char * const stop_func = "stop";
|
||||
|
||||
struct breakpoint_object
|
||||
{
|
||||
PyObject_HEAD
|
||||
|
||||
/* The breakpoint number according to gdb. */
|
||||
int number;
|
||||
|
||||
/* The gdb breakpoint object, or NULL if the breakpoint has been
|
||||
deleted. */
|
||||
struct breakpoint *bp;
|
||||
};
|
||||
|
||||
/* Require that BREAKPOINT be a valid breakpoint ID; throw a Python
|
||||
exception if it is invalid. */
|
||||
#define BPPY_REQUIRE_VALID(Breakpoint) \
|
||||
do { \
|
||||
if ((Breakpoint)->bp == NULL) \
|
||||
return PyErr_Format (PyExc_RuntimeError, \
|
||||
_("Breakpoint %d is invalid."), \
|
||||
(Breakpoint)->number); \
|
||||
} while (0)
|
||||
|
||||
/* Require that BREAKPOINT be a valid breakpoint ID; throw a Python
|
||||
exception if it is invalid. This macro is for use in setter functions. */
|
||||
#define BPPY_SET_REQUIRE_VALID(Breakpoint) \
|
||||
do { \
|
||||
if ((Breakpoint)->bp == NULL) \
|
||||
{ \
|
||||
PyErr_Format (PyExc_RuntimeError, _("Breakpoint %d is invalid."), \
|
||||
(Breakpoint)->number); \
|
||||
return -1; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/* This is used to initialize various gdb.bp_* constants. */
|
||||
struct pybp_code
|
||||
{
|
||||
|
@ -762,6 +726,9 @@ gdbpy_should_stop (struct breakpoint_object *bp_obj)
|
|||
struct gdbarch *garch = b->gdbarch ? b->gdbarch : get_current_arch ();
|
||||
struct cleanup *cleanup = ensure_python_env (garch, current_language);
|
||||
|
||||
if (bp_obj->is_finish_bp)
|
||||
bpfinishpy_pre_stop_hook (bp_obj);
|
||||
|
||||
if (PyObject_HasAttrString (py_bp, stop_func))
|
||||
{
|
||||
PyObject *result = PyObject_CallMethod (py_bp, stop_func, NULL);
|
||||
|
@ -783,6 +750,10 @@ gdbpy_should_stop (struct breakpoint_object *bp_obj)
|
|||
else
|
||||
gdbpy_print_stack ();
|
||||
}
|
||||
|
||||
if (bp_obj->is_finish_bp)
|
||||
bpfinishpy_post_stop_hook (bp_obj);
|
||||
|
||||
do_cleanups (cleanup);
|
||||
|
||||
return stop;
|
||||
|
@ -845,6 +816,7 @@ gdbpy_breakpoint_created (struct breakpoint *bp)
|
|||
newbp->number = bp->number;
|
||||
newbp->bp = bp;
|
||||
newbp->bp->py_bp_object = newbp;
|
||||
newbp->is_finish_bp = 0;
|
||||
Py_INCREF (newbp);
|
||||
++bppy_live;
|
||||
}
|
||||
|
@ -1006,7 +978,7 @@ static PyMethodDef breakpoint_object_methods[] =
|
|||
{ NULL } /* Sentinel. */
|
||||
};
|
||||
|
||||
static PyTypeObject breakpoint_object_type =
|
||||
PyTypeObject breakpoint_object_type =
|
||||
{
|
||||
PyObject_HEAD_INIT (NULL)
|
||||
0, /*ob_size*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue