FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gdbpy_enter in py-unwind.c

Browse source 
Change py-unwind.c to use gdbpy_enter.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* python/py-unwind.c (pending_frame_invalidate): Remove.
	(pyuw_sniffer): Use gdbpy_enter and gdbpy_ref.
This commit is contained in:
Tom Tromey 2016-11-07 20:41:50 -07:00
parent f18e226ff8
commit c0171de646
2 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-unwind.c (pending_frame_invalidate): Remove.
(pyuw_sniffer): Use gdbpy_enter and gdbpy_ref.
2017-01-10 Tom Tromey <tom@tromey.com> 2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-xmethods.c (gdbpy_free_xmethod_worker_data) * python/py-xmethods.c (gdbpy_free_xmethod_worker_data)

72
gdb/python/py-unwind.c
View file

@ -28,6 +28,7 @@
#include "regcache.h" #include "regcache.h"
#include "valprint.h" #include "valprint.h"
#include "user-regs.h" #include "user-regs.h"
#include "py-ref.h"
#define TRACE_PY_UNWIND(level, args...) if (pyuw_debug >= level) \ #define TRACE_PY_UNWIND(level, args...) if (pyuw_debug >= level) \
{ fprintf_unfiltered (gdb_stdlog, args); } { fprintf_unfiltered (gdb_stdlog, args); }
@ -465,15 +466,6 @@ pending_framepy_create_unwind_info (PyObject *self, PyObject *args)
frame_id_build_special (sp, pc, special)); frame_id_build_special (sp, pc, special));
} }
/* Invalidate PendingFrame instance. */
static void
pending_frame_invalidate (void *pyo_pending_frame)
{
if (pyo_pending_frame != NULL)
((pending_frame_object *) pyo_pending_frame)->frame_info = NULL;
}
/* frame_unwind.this_id method. */ /* frame_unwind.this_id method. */
static void static void
@ -517,25 +509,26 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame,
void **cache_ptr) void **cache_ptr)
{ {
struct gdbarch *gdbarch = (struct gdbarch *) (self->unwind_data); struct gdbarch *gdbarch = (struct gdbarch *) (self->unwind_data);
struct cleanup *cleanups = ensure_python_env (gdbarch, current_language);
PyObject *pyo_execute;
PyObject *pyo_pending_frame;
PyObject *pyo_unwind_info;
cached_frame_info *cached_frame; cached_frame_info *cached_frame;
gdbpy_enter enter_py (gdbarch, current_language);
TRACE_PY_UNWIND (3, "%s (SP=%s, PC=%s)\n", __FUNCTION__, TRACE_PY_UNWIND (3, "%s (SP=%s, PC=%s)\n", __FUNCTION__,
paddress (gdbarch, get_frame_sp (this_frame)), paddress (gdbarch, get_frame_sp (this_frame)),
paddress (gdbarch, get_frame_pc (this_frame))); paddress (gdbarch, get_frame_pc (this_frame)));
/* Create PendingFrame instance to pass to sniffers. */ /* Create PendingFrame instance to pass to sniffers. */
pyo_pending_frame = (PyObject *) PyObject_New (pending_frame_object, pending_frame_object *pfo = PyObject_New (pending_frame_object,
&pending_frame_object_type); &pending_frame_object_type);
gdbpy_ref pyo_pending_frame ((PyObject *) pfo);
if (pyo_pending_frame == NULL) if (pyo_pending_frame == NULL)
goto error; {
((pending_frame_object *) pyo_pending_frame)->gdbarch = gdbarch; gdbpy_print_stack ();
((pending_frame_object *) pyo_pending_frame)->frame_info = this_frame; return 0;
make_cleanup_py_decref (pyo_pending_frame); }
make_cleanup (pending_frame_invalidate, (void *) pyo_pending_frame); pfo->gdbarch = gdbarch;
scoped_restore invalidate_frame = make_scoped_restore (&pfo->frame_info,
this_frame);
/* Run unwinders. */ /* Run unwinders. */
if (gdb_python_module == NULL if (gdb_python_module == NULL
@ -544,27 +537,36 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame,
PyErr_SetString (PyExc_NameError, PyErr_SetString (PyExc_NameError,
"Installation error: gdb.execute_unwinders function " "Installation error: gdb.execute_unwinders function "
"is missing"); "is missing");
goto error; gdbpy_print_stack ();
return 0;
} }
pyo_execute = PyObject_GetAttrString (gdb_python_module, "execute_unwinders"); gdbpy_ref pyo_execute (PyObject_GetAttrString (gdb_python_module,
"execute_unwinders"));
if (pyo_execute == NULL) if (pyo_execute == NULL)
goto error; {
make_cleanup_py_decref (pyo_execute); gdbpy_print_stack ();
pyo_unwind_info return 0;
= PyObject_CallFunctionObjArgs (pyo_execute, pyo_pending_frame, NULL); }
gdbpy_ref pyo_unwind_info
(PyObject_CallFunctionObjArgs (pyo_execute.get (),
pyo_pending_frame.get (), NULL));
if (pyo_unwind_info == NULL) if (pyo_unwind_info == NULL)
goto error; {
make_cleanup_py_decref (pyo_unwind_info); gdbpy_print_stack ();
return 0;
}
if (pyo_unwind_info == Py_None) if (pyo_unwind_info == Py_None)
goto cannot_unwind; return 0;
/* Received UnwindInfo, cache data. */ /* Received UnwindInfo, cache data. */
if (PyObject_IsInstance (pyo_unwind_info, if (PyObject_IsInstance (pyo_unwind_info.get (),
(PyObject *) &unwind_info_object_type) <= 0) (PyObject *) &unwind_info_object_type) <= 0)
error (_("A Unwinder should return gdb.UnwindInfo instance.")); error (_("A Unwinder should return gdb.UnwindInfo instance."));
{ {
unwind_info_object *unwind_info = (unwind_info_object *) pyo_unwind_info; unwind_info_object *unwind_info =
(unwind_info_object *) pyo_unwind_info.get ();
int reg_count = VEC_length (saved_reg, unwind_info->saved_regs); int reg_count = VEC_length (saved_reg, unwind_info->saved_regs);
saved_reg *reg; saved_reg *reg;
int i; int i;
@ -595,15 +597,7 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame,
} }
*cache_ptr = cached_frame; *cache_ptr = cached_frame;
do_cleanups (cleanups);
return 1; return 1;
error:
gdbpy_print_stack ();
/* Fallthrough. */
cannot_unwind:
do_cleanups (cleanups);
return 0;
} }
/* Frame cache release shim. */ /* Frame cache release shim. */