Change iterate_over_breakpoints to take a function_view
This allows callers to pass in capturing lambdas. Also changes the return type to bool. gdb/ChangeLog: 2019-10-15 Christian Biesinger <cbiesinger@google.com> * breakpoint.c (iterate_over_breakpoints): Change function pointer to a gdb::function_view and return value to bool. * breakpoint.h (iterate_over_breakpoints): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Update. (pop_dummy_frame): Update. * guile/scm-breakpoint.c (bpscm_build_bp_list): Update. (gdbscm_breakpoints): Update. * python/py-breakpoint.c (build_bp_list): Update. (gdbpy_breakpoints): Update. * python/py-finishbreakpoint.c (bpfinishpy_detect_out_scope_cb): Update. (bpfinishpy_handle_stop): Update. (bpfinishpy_handle_exit): Update. * solib-svr4.c (svr4_update_solib_event_breakpoint): Update. (svr4_update_solib_event_breakpoints): Update. Change-Id: Ia9de4deecae562a70a40f5cd49f5a74d64570251
This commit is contained in:
parent
9b142ddb4a
commit
95da600f40
@ -1,3 +1,21 @@
|
||||
2019-10-15 Christian Biesinger <cbiesinger@google.com>
|
||||
|
||||
* breakpoint.c (iterate_over_breakpoints): Change function pointer
|
||||
to a gdb::function_view and return value to bool.
|
||||
* breakpoint.h (iterate_over_breakpoints): Likewise.
|
||||
* dummy-frame.c (pop_dummy_frame_bpt): Update.
|
||||
(pop_dummy_frame): Update.
|
||||
* guile/scm-breakpoint.c (bpscm_build_bp_list): Update.
|
||||
(gdbscm_breakpoints): Update.
|
||||
* python/py-breakpoint.c (build_bp_list): Update.
|
||||
(gdbpy_breakpoints): Update.
|
||||
* python/py-finishbreakpoint.c (bpfinishpy_detect_out_scope_cb):
|
||||
Update.
|
||||
(bpfinishpy_handle_stop): Update.
|
||||
(bpfinishpy_handle_exit): Update.
|
||||
* solib-svr4.c (svr4_update_solib_event_breakpoint): Update.
|
||||
(svr4_update_solib_event_breakpoints): Update.
|
||||
|
||||
2019-10-15 Andreas Arnez <arnez@linux.ibm.com>
|
||||
|
||||
* s390-tdep.c (s390_effective_inner_type): Ignore static fields
|
||||
|
@ -15128,14 +15128,13 @@ save_command (const char *arg, int from_tty)
|
||||
}
|
||||
|
||||
struct breakpoint *
|
||||
iterate_over_breakpoints (int (*callback) (struct breakpoint *, void *),
|
||||
void *data)
|
||||
iterate_over_breakpoints (gdb::function_view<bool (breakpoint *)> callback)
|
||||
{
|
||||
struct breakpoint *b, *b_tmp;
|
||||
|
||||
ALL_BREAKPOINTS_SAFE (b, b_tmp)
|
||||
{
|
||||
if ((*callback) (b, data))
|
||||
if (callback (b))
|
||||
return b;
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include "location.h"
|
||||
#include <vector>
|
||||
#include "gdbsupport/array-view.h"
|
||||
#include "gdbsupport/function-view.h"
|
||||
#include "cli/cli-script.h"
|
||||
|
||||
struct block;
|
||||
@ -1664,8 +1665,8 @@ public:
|
||||
returned. This can be useful for implementing a search for a
|
||||
breakpoint with arbitrary attributes, or for applying an operation
|
||||
to every breakpoint. */
|
||||
extern struct breakpoint *iterate_over_breakpoints (int (*) (struct breakpoint *,
|
||||
void *), void *);
|
||||
extern struct breakpoint *iterate_over_breakpoints
|
||||
(gdb::function_view<bool (breakpoint *)>);
|
||||
|
||||
/* Nonzero if the specified PC cannot be a location where functions
|
||||
have been inlined. */
|
||||
|
@ -126,11 +126,9 @@ remove_dummy_frame (struct dummy_frame **dummy_ptr)
|
||||
/* Delete any breakpoint B which is a momentary breakpoint for return from
|
||||
inferior call matching DUMMY_VOIDP. */
|
||||
|
||||
static int
|
||||
pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp)
|
||||
static bool
|
||||
pop_dummy_frame_bpt (struct breakpoint *b, struct dummy_frame *dummy)
|
||||
{
|
||||
struct dummy_frame *dummy = (struct dummy_frame *) dummy_voidp;
|
||||
|
||||
if (b->thread == dummy->id.thread->global_num
|
||||
&& b->disposition == disp_del && frame_id_eq (b->frame_id, dummy->id.id))
|
||||
{
|
||||
@ -140,11 +138,11 @@ pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp)
|
||||
delete_breakpoint (b);
|
||||
|
||||
/* Stop the traversal. */
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Continue the traversal. */
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Pop *DUMMY_PTR, restoring program state to that before the
|
||||
@ -168,7 +166,10 @@ pop_dummy_frame (struct dummy_frame **dummy_ptr)
|
||||
|
||||
restore_infcall_suspend_state (dummy->caller_state);
|
||||
|
||||
iterate_over_breakpoints (pop_dummy_frame_bpt, dummy);
|
||||
iterate_over_breakpoints ([dummy] (breakpoint* bp)
|
||||
{
|
||||
return pop_dummy_frame_bpt (bp, dummy);
|
||||
});
|
||||
|
||||
/* restore_infcall_control_state frees inf_state,
|
||||
all that remains is to pop *dummy_ptr. */
|
||||
|
@ -505,10 +505,9 @@ gdbscm_delete_breakpoint_x (SCM self)
|
||||
|
||||
/* iterate_over_breakpoints function for gdbscm_breakpoints. */
|
||||
|
||||
static int
|
||||
bpscm_build_bp_list (struct breakpoint *bp, void *arg)
|
||||
static bool
|
||||
bpscm_build_bp_list (struct breakpoint *bp, SCM *list)
|
||||
{
|
||||
SCM *list = (SCM *) arg;
|
||||
breakpoint_smob *bp_smob = bp->scm_bp_object;
|
||||
|
||||
/* Lazily create wrappers for breakpoints created outside Scheme. */
|
||||
@ -534,7 +533,7 @@ bpscm_build_bp_list (struct breakpoint *bp, void *arg)
|
||||
if (bp_smob != NULL)
|
||||
*list = scm_cons (bp_smob->containing_scm, *list);
|
||||
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* (breakpoints) -> list
|
||||
@ -545,11 +544,10 @@ gdbscm_breakpoints (void)
|
||||
{
|
||||
SCM list = SCM_EOL;
|
||||
|
||||
/* If iterate_over_breakpoints returns non-NULL it means the iteration
|
||||
terminated early.
|
||||
In that case abandon building the list and return #f. */
|
||||
if (iterate_over_breakpoints (bpscm_build_bp_list, &list) != NULL)
|
||||
return SCM_BOOL_F;
|
||||
iterate_over_breakpoints ([&] (breakpoint *bp)
|
||||
{
|
||||
return bpscm_build_bp_list(bp, &list);
|
||||
});
|
||||
|
||||
return scm_reverse_x (list, SCM_EOL);
|
||||
}
|
||||
|
@ -871,10 +871,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||
|
||||
|
||||
|
||||
static int
|
||||
build_bp_list (struct breakpoint *b, void *arg)
|
||||
static bool
|
||||
build_bp_list (struct breakpoint *b, PyObject *list)
|
||||
{
|
||||
PyObject *list = (PyObject *) arg;
|
||||
PyObject *bp = (PyObject *) b->py_bp_object;
|
||||
int iserr = 0;
|
||||
|
||||
@ -886,9 +885,9 @@ build_bp_list (struct breakpoint *b, void *arg)
|
||||
iserr = PyList_Append (list, bp);
|
||||
|
||||
if (iserr == -1)
|
||||
return 1;
|
||||
return true;
|
||||
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Static function to return a tuple holding all breakpoints. */
|
||||
@ -906,7 +905,11 @@ gdbpy_breakpoints (PyObject *self, PyObject *args)
|
||||
/* If iterate_over_breakpoints returns non NULL it signals an error
|
||||
condition. In that case abandon building the list and return
|
||||
NULL. */
|
||||
if (iterate_over_breakpoints (build_bp_list, list.get ()) != NULL)
|
||||
auto callback = [&] (breakpoint *bp)
|
||||
{
|
||||
return build_bp_list(bp, list.get ());
|
||||
};
|
||||
if (iterate_over_breakpoints (callback) != NULL)
|
||||
return NULL;
|
||||
|
||||
return PyList_AsTuple (list.get ());
|
||||
|
@ -341,10 +341,10 @@ bpfinishpy_out_of_scope (struct finish_breakpoint_object *bpfinish_obj)
|
||||
/* Callback for `bpfinishpy_detect_out_scope'. Triggers Python's
|
||||
`B->out_of_scope' function if B is a FinishBreakpoint out of its scope. */
|
||||
|
||||
static int
|
||||
bpfinishpy_detect_out_scope_cb (struct breakpoint *b, void *args)
|
||||
static bool
|
||||
bpfinishpy_detect_out_scope_cb (struct breakpoint *b,
|
||||
struct breakpoint *bp_stopped)
|
||||
{
|
||||
struct breakpoint *bp_stopped = (struct breakpoint *) args;
|
||||
PyObject *py_bp = (PyObject *) b->py_bp_object;
|
||||
|
||||
/* Trigger out_of_scope if this is a FinishBreakpoint and its frame is
|
||||
@ -383,8 +383,11 @@ bpfinishpy_handle_stop (struct bpstats *bs, int print_frame)
|
||||
{
|
||||
gdbpy_enter enter_py (get_current_arch (), current_language);
|
||||
|
||||
iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb,
|
||||
bs == NULL ? NULL : bs->breakpoint_at);
|
||||
iterate_over_breakpoints ([&] (breakpoint *bp)
|
||||
{
|
||||
return bpfinishpy_detect_out_scope_cb
|
||||
(bp, bs == NULL ? NULL : bs->breakpoint_at);
|
||||
});
|
||||
}
|
||||
|
||||
/* Attached to `exit' notifications, triggers all the necessary out of
|
||||
@ -395,7 +398,10 @@ bpfinishpy_handle_exit (struct inferior *inf)
|
||||
{
|
||||
gdbpy_enter enter_py (target_gdbarch (), current_language);
|
||||
|
||||
iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb, NULL);
|
||||
iterate_over_breakpoints ([&] (breakpoint *bp)
|
||||
{
|
||||
return bpfinishpy_detect_out_scope_cb (bp, nullptr);
|
||||
});
|
||||
}
|
||||
|
||||
/* Initialize the Python finish breakpoint code. */
|
||||
|
@ -1991,15 +1991,15 @@ svr4_handle_solib_event (void)
|
||||
|
||||
/* Helper function for svr4_update_solib_event_breakpoints. */
|
||||
|
||||
static int
|
||||
svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg)
|
||||
static bool
|
||||
svr4_update_solib_event_breakpoint (struct breakpoint *b)
|
||||
{
|
||||
struct bp_location *loc;
|
||||
|
||||
if (b->type != bp_shlib_event)
|
||||
{
|
||||
/* Continue iterating. */
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (loc = b->loc; loc != NULL; loc = loc->next)
|
||||
@ -2027,7 +2027,7 @@ svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg)
|
||||
}
|
||||
|
||||
/* Continue iterating. */
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Enable or disable optional solib event breakpoints as appropriate.
|
||||
@ -2036,7 +2036,7 @@ svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg)
|
||||
static void
|
||||
svr4_update_solib_event_breakpoints (void)
|
||||
{
|
||||
iterate_over_breakpoints (svr4_update_solib_event_breakpoint, NULL);
|
||||
iterate_over_breakpoints (svr4_update_solib_event_breakpoint);
|
||||
}
|
||||
|
||||
/* Create and register solib event breakpoints. PROBES is an array
|
||||
|
Loading…
Reference in New Issue
Block a user