yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove breakpoint_ops from init_catchpoint

Browse Source 
init_catchpoint is only ever passed a single breakpoint_ops pointer,
so remove the parameter.
This commit is contained in:
Tom Tromey 2022-01-16 19:05:28 -07:00
parent a48ddc0d6a
commit b3316ff153
8 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdb/break-catch-exec.c
View File

@ -204,8 +204,7 @@ catch_exec_command_1 (const char *arg, int from_tty,
error (_("Junk at end of arguments."));
std::unique_ptr<exec_catchpoint> c (new exec_catchpoint ());
init_catchpoint (c.get (), gdbarch, temp, cond_string,
&vtable_breakpoint_ops);
init_catchpoint (c.get (), gdbarch, temp, cond_string);
c->exec_pathname.reset ();
install_breakpoint (0, std::move (c), 1);

3
gdb/break-catch-fork.c
View File

@ -182,8 +182,7 @@ create_fork_vfork_event_catchpoint (struct gdbarch *gdbarch,
{
std::unique_ptr<fork_catchpoint> c (new fork_catchpoint ());
init_catchpoint (c.get (), gdbarch, temp, cond_string,
&vtable_breakpoint_ops);
init_catchpoint (c.get (), gdbarch, temp, cond_string);
c->is_vfork = is_vfork;
c->forked_inferior_pid = null_ptid;

2
gdb/break-catch-load.c
View File

@ -227,7 +227,7 @@ add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool enabled)
}
c->is_load = is_load;
init_catchpoint (c.get (), gdbarch, is_temp, NULL, &vtable_breakpoint_ops);
init_catchpoint (c.get (), gdbarch, is_temp, NULL);
c->enable_state = enabled ? bp_enabled : bp_disabled;

2
gdb/break-catch-sig.c
View File

@ -317,7 +317,7 @@ create_signal_catchpoint (int tempflag, std::vector<gdb_signal> &&filter,
struct gdbarch *gdbarch = get_current_arch ();
std::unique_ptr<signal_catchpoint> c (new signal_catchpoint ());
init_catchpoint (c.get (), gdbarch, tempflag, NULL, &vtable_breakpoint_ops);
init_catchpoint (c.get (), gdbarch, tempflag, nullptr);
c->signals_to_be_caught = std::move (filter);
c->catch_all = catch_all;

3
gdb/break-catch-syscall.c
View File

@ -348,8 +348,7 @@ create_syscall_event_catchpoint (int tempflag, std::vector<int> &&filter)
struct gdbarch *gdbarch = get_current_arch ();
std::unique_ptr<syscall_catchpoint> c (new syscall_catchpoint ());
init_catchpoint (c.get (), gdbarch, tempflag, nullptr,
&vtable_breakpoint_ops);
init_catchpoint (c.get (), gdbarch, tempflag, nullptr);
c->syscalls_to_be_caught = std::move (filter);
install_breakpoint (0, std::move (c), 1);

3
gdb/break-catch-throw.c
View File

@ -365,8 +365,7 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx,
std::unique_ptr<exception_catchpoint> cp (new exception_catchpoint ());
init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string,
&vtable_breakpoint_ops);
init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string);
cp->kind = ex_event;
cp->exception_rx = std::move (except_rx);
cp->pattern = std::move (pattern);

6
gdb/breakpoint.c
View File

@ -7833,13 +7833,13 @@ disable_breakpoints_in_freed_objfile (struct objfile *objfile)
void
init_catchpoint (struct breakpoint *b,
struct gdbarch *gdbarch, bool temp,
const char *cond_string,
const struct breakpoint_ops *ops)
const char *cond_string)
{
symtab_and_line sal;
sal.pspace = current_program_space;
init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops);
init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint,
&vtable_breakpoint_ops);
if (cond_string == nullptr)
b->cond_string.reset ();

6
gdb/breakpoint.h
View File

@ -1524,13 +1524,11 @@ extern void
/* Initialize a new breakpoint of the bp_catchpoint kind. If TEMP
is true, then make the breakpoint temporary. If COND_STRING is
not NULL, then store it in the breakpoint. OPS, if not NULL, is
the breakpoint_ops structure associated to the catchpoint. */
not NULL, then store it in the breakpoint. */
extern void init_catchpoint (struct breakpoint *b,
struct gdbarch *gdbarch, bool temp,
const char *cond_string,
const struct breakpoint_ops *ops);
const char *cond_string);
/* Add breakpoint B on the breakpoint list, and notify the user, the
target and breakpoint_created observers of its existence. If