From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id E9FE83858287; Sun, 14 Aug 2022 13:48:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E9FE83858287 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Move decode_location_spec to code_breakpoint X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 2c9a6d728e3ab63d8338b5e1f831d2c1eead8d67 X-Git-Newrev: aef4b7a5cc7ba4fb681a0675529000d91dc0aa72 Message-Id: <20220814134804.E9FE83858287@sourceware.org> Date: Sun, 14 Aug 2022 13:48:04 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2022 13:48:05 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Daef4b7a5cc7b= a4fb681a0675529000d91dc0aa72 commit aef4b7a5cc7ba4fb681a0675529000d91dc0aa72 Author: Tom Tromey Date: Sat May 21 10:17:38 2022 -0600 Move decode_location_spec to code_breakpoint =20 breakpoint::decode_location_spec just asserts if called. It turned out to be relatively easy to remove this method from breakpoint and instead move the base implementation to code_breakpoint. Diff: --- gdb/breakpoint.c | 7 ------- gdb/breakpoint.h | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index b24fbd1fe36..2fe74ea0d3a 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11493,13 +11493,6 @@ breakpoint::print_recreate (struct ui_file *fp) co= nst internal_error_pure_virtual_called (); } =20 -std::vector -breakpoint::decode_location_spec (location_spec *locspec, - program_space *search_pspace) -{ - internal_error_pure_virtual_called (); -} - /* Default breakpoint_ops methods. */ =20 void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index e919fe6f0d2..aaf7549b660 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -710,16 +710,6 @@ struct breakpoint /* Print to FP the CLI command that recreates this breakpoint. */ virtual void print_recreate (struct ui_file *fp) const; =20 - /* Given the location spec (second parameter), this method decodes - it and returns the SAL locations related to it. For ordinary - breakpoints, it calls `decode_line_full'. If SEARCH_PSPACE is - not NULL, symbol search is restricted to just that program space. - - This function is called inside `location_spec_to_sals'. */ - virtual std::vector decode_location_spec - (location_spec *locspec, - struct program_space *search_pspace); - /* Return true if this breakpoint explains a signal. See bpstat_explains_signal. */ virtual bool explains_signal (enum gdb_signal) @@ -883,12 +873,19 @@ struct code_breakpoint : public breakpoint const address_space *aspace, CORE_ADDR bp_addr, const target_waitstatus &ws) override; - std::vector decode_location_spec - (struct location_spec *locspec, - struct program_space *search_pspace) override; =20 protected: =20 + /* Given the location spec, this method decodes it and returns the + SAL locations related to it. For ordinary breakpoints, it calls + `decode_line_full'. If SEARCH_PSPACE is not NULL, symbol search + is restricted to just that program space. + + This function is called inside `location_spec_to_sals'. */ + virtual std::vector decode_location_spec + (location_spec *locspec, + struct program_space *search_pspace); + /* Helper method that does the basic work of re_set. */ void re_set_default ();