public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Convert say_where to method on code_breakpoint Date: Tue, 10 Jan 2023 21:15:32 +0000 (GMT) [thread overview] Message-ID: <20230110211532.61B0B3858CDA@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7987c4636abedbf4cd5658ac594e3b936eb43d91 commit 7987c4636abedbf4cd5658ac594e3b936eb43d91 Author: Tom Tromey <tromey@adacore.com> Date: Tue Jan 10 08:17:28 2023 -0700 Convert say_where to method on code_breakpoint 'say_where' is only useful (and only called for) code breakpoints, so convert it to be a protected method on code_breakpoint. Diff: --- gdb/breakpoint.c | 49 ++++++++++++++++++++++++------------------------- gdb/breakpoint.h | 4 ++++ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8cfc46e0bed..6762fad5d2c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11496,11 +11496,10 @@ bpstat_remove_breakpoint_callback (struct thread_info *th, void *data) return 0; } -/* Helper for breakpoint and tracepoint breakpoint->mention - callbacks. */ +/* See breakpoint.h. */ -static void -say_where (const breakpoint *b) +void +code_breakpoint::say_where () const { struct value_print_options opts; @@ -11508,58 +11507,58 @@ say_where (const breakpoint *b) /* i18n: cagney/2005-02-11: Below needs to be merged into a single string. */ - if (b->loc == NULL) + if (loc == NULL) { /* For pending locations, the output differs slightly based - on b->extra_string. If this is non-NULL, it contains either + on extra_string. If this is non-NULL, it contains either a condition or dprintf arguments. */ - if (b->extra_string == NULL) + if (extra_string == NULL) { - gdb_printf (_(" (%s) pending."), b->locspec->to_string ()); + gdb_printf (_(" (%s) pending."), locspec->to_string ()); } - else if (b->type == bp_dprintf) + else if (type == bp_dprintf) { gdb_printf (_(" (%s,%s) pending."), - b->locspec->to_string (), - b->extra_string.get ()); + locspec->to_string (), + extra_string.get ()); } else { gdb_printf (_(" (%s %s) pending."), - b->locspec->to_string (), - b->extra_string.get ()); + locspec->to_string (), + extra_string.get ()); } } else { - if (opts.addressprint || b->loc->symtab == NULL) + if (opts.addressprint || loc->symtab == NULL) gdb_printf (" at %ps", styled_string (address_style.style (), - paddress (b->loc->gdbarch, - b->loc->address))); - if (b->loc->symtab != NULL) + paddress (loc->gdbarch, + loc->address))); + if (loc->symtab != NULL) { /* If there is a single location, we can print the location more nicely. */ - if (b->loc->next == NULL) + if (loc->next == NULL) { const char *filename - = symtab_to_filename_for_display (b->loc->symtab); + = symtab_to_filename_for_display (loc->symtab); gdb_printf (": file %ps, line %d.", styled_string (file_name_style.style (), filename), - b->loc->line_number); + loc->line_number); } else /* This is not ideal, but each location may have a different file name, and this at least reflects the real situation somewhat. */ - gdb_printf (": %s.", b->locspec->to_string ()); + gdb_printf (": %s.", locspec->to_string ()); } - if (b->loc->next) + if (loc->next) { - struct bp_location *loc = b->loc; + struct bp_location *loc = loc; int n = 0; for (; loc; loc = loc->next) ++n; @@ -11794,7 +11793,7 @@ ordinary_breakpoint::print_mention () const break; } - say_where (this); + say_where (); } void @@ -12054,7 +12053,7 @@ tracepoint::print_mention () const internal_error (_("unhandled tracepoint type %d"), (int) type); } - say_where (this); + say_where (); } void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 7289a09e95c..399bd037977 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -898,6 +898,10 @@ protected: (location_spec *locspec, struct program_space *search_pspace, int *found); + + /* Helper for breakpoint and tracepoint breakpoint->mention + callbacks. */ + void say_where () const; }; /* An instance of this type is used to represent a watchpoint,
reply other threads:[~2023-01-10 21:15 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230110211532.61B0B3858CDA@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).