Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 01:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use gdbpy_enter in py-breakpoint.c

Browse Source 
Change py-breakpoint.c to use gdbpy_enter.

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

	* python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use
	gdbpy_enter.
	(gdbpy_breakpoint_has_cond): Likewise.
This commit is contained in:
Tom Tromey
2016-11-07 15:59:41 -07:00
parent 4ecee2c47d
commit de2dc875c2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use
gdbpy_enter.
(gdbpy_breakpoint_has_cond): Likewise.
2017-01-10 Tom Tromey <tom@tromey.com> 2017-01-10 Tom Tromey <tom@tromey.com>
* python/python.c (gdbpy_enter): New constructor. * python/python.c (gdbpy_enter): New constructor.

14
gdb/python/py-breakpoint.c
View File

@@ -791,14 +791,14 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang,
struct gdbpy_breakpoint_object *bp_obj = b->py_bp_object; struct gdbpy_breakpoint_object *bp_obj = b->py_bp_object;
PyObject *py_bp = (PyObject *) bp_obj; PyObject *py_bp = (PyObject *) bp_obj;
struct gdbarch *garch; struct gdbarch *garch;
struct cleanup *cleanup;
if (bp_obj == NULL) if (bp_obj == NULL)
return EXT_LANG_BP_STOP_UNSET; return EXT_LANG_BP_STOP_UNSET;
stop = -1; stop = -1;
garch = b->gdbarch ? b->gdbarch : get_current_arch (); garch = b->gdbarch ? b->gdbarch : get_current_arch ();
cleanup = ensure_python_env (garch, current_language);
gdbpy_enter enter_py (garch, current_language);
if (bp_obj->is_finish_bp) if (bp_obj->is_finish_bp)
bpfinishpy_pre_stop_hook (bp_obj); bpfinishpy_pre_stop_hook (bp_obj);
@@ -829,8 +829,6 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang,
if (bp_obj->is_finish_bp) if (bp_obj->is_finish_bp)
bpfinishpy_post_stop_hook (bp_obj); bpfinishpy_post_stop_hook (bp_obj);
do_cleanups (cleanup);
if (stop < 0) if (stop < 0)
return EXT_LANG_BP_STOP_UNSET; return EXT_LANG_BP_STOP_UNSET;
return stop ? EXT_LANG_BP_STOP_YES : EXT_LANG_BP_STOP_NO; return stop ? EXT_LANG_BP_STOP_YES : EXT_LANG_BP_STOP_NO;
@@ -844,21 +842,17 @@ int
gdbpy_breakpoint_has_cond (const struct extension_language_defn *extlang, gdbpy_breakpoint_has_cond (const struct extension_language_defn *extlang,
struct breakpoint *b) struct breakpoint *b)
{ {
int has_func;
PyObject *py_bp; PyObject *py_bp;
struct gdbarch *garch; struct gdbarch *garch;
struct cleanup *cleanup;
if (b->py_bp_object == NULL) if (b->py_bp_object == NULL)
return 0; return 0;
py_bp = (PyObject *) b->py_bp_object; py_bp = (PyObject *) b->py_bp_object;
garch = b->gdbarch ? b->gdbarch : get_current_arch (); garch = b->gdbarch ? b->gdbarch : get_current_arch ();
cleanup = ensure_python_env (garch, current_language);
has_func = PyObject_HasAttrString (py_bp, stop_func);
do_cleanups (cleanup);
return has_func; gdbpy_enter enter_py (garch, current_language);
return PyObject_HasAttrString (py_bp, stop_func);
} }