From ef4848c75f82738c342f978b3a80b83ce1817772 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 6 May 2022 23:39:47 +0100 Subject: [PATCH] More breakpoint_ops parameter elimination Remove breakpoint_ops parameters from a few functions that don't need it. Change-Id: Ifcf5e1cc688184acbf5e19b8ea60138ebe63cf28 --- gdb/breakpoint.c | 16 +++++++--------- gdb/breakpoint.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d13e803dee5..7008672e784 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -100,7 +100,6 @@ static void create_breakpoints_sal (struct gdbarch *, enum bptype, enum bpdisp, int, int, int, - const struct breakpoint_ops *, int, int, int, unsigned); static std::vector decode_location_default @@ -8305,7 +8304,7 @@ init_breakpoint_sal (base_breakpoint *b, struct gdbarch *gdbarch, gdb::unique_xmalloc_ptr extra_string, enum bptype type, enum bpdisp disposition, int thread, int task, int ignore_count, - const struct breakpoint_ops *ops, int from_tty, + int from_tty, int enabled, int internal, unsigned flags, int display_canonical) { @@ -8449,7 +8448,7 @@ create_breakpoint_sal (struct gdbarch *gdbarch, gdb::unique_xmalloc_ptr extra_string, enum bptype type, enum bpdisp disposition, int thread, int task, int ignore_count, - const struct breakpoint_ops *ops, int from_tty, + int from_tty, int enabled, int internal, unsigned flags, int display_canonical) { @@ -8462,7 +8461,7 @@ create_breakpoint_sal (struct gdbarch *gdbarch, std::move (extra_string), type, disposition, thread, task, ignore_count, - ops, from_tty, + from_tty, enabled, internal, flags, display_canonical); @@ -8491,7 +8490,7 @@ create_breakpoints_sal (struct gdbarch *gdbarch, gdb::unique_xmalloc_ptr extra_string, enum bptype type, enum bpdisp disposition, int thread, int task, int ignore_count, - const struct breakpoint_ops *ops, int from_tty, + int from_tty, int enabled, int internal, unsigned flags) { if (canonical->pre_expanded) @@ -8513,7 +8512,7 @@ create_breakpoints_sal (struct gdbarch *gdbarch, std::move (cond_string), std::move (extra_string), type, disposition, - thread, task, ignore_count, ops, + thread, task, ignore_count, from_tty, enabled, internal, flags, canonical->special_display); } @@ -8997,7 +8996,7 @@ create_breakpoint (struct gdbarch *gdbarch, std::move (extra_string_copy), type_wanted, tempflag ? disp_del : disp_donttouch, - thread, task, ignore_count, ops, + thread, task, ignore_count, from_tty, enabled, internal, flags); } else @@ -12128,7 +12127,6 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch, enum bpdisp disposition, int thread, int task, int ignore_count, - const struct breakpoint_ops *ops, int from_tty, int enabled, int internal, unsigned flags) { @@ -12153,7 +12151,7 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch, std::move (cond_string), std::move (extra_string), type_wanted, disposition, - thread, task, ignore_count, ops, + thread, task, ignore_count, from_tty, enabled, internal, flags, canonical->special_display); /* Given that its possible to have multiple markers with diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 48ceceabb3d..fb2bbd729c0 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -582,8 +582,7 @@ struct breakpoint_ops gdb::unique_xmalloc_ptr, gdb::unique_xmalloc_ptr, enum bptype, enum bpdisp, int, int, - int, const struct breakpoint_ops *, - int, int, int, unsigned); + int, int, int, int, unsigned); }; enum watchpoint_triggered -- 2.30.2