From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 387D63857C58 for ; Tue, 18 Jan 2022 19:40:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 387D63857C58 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id A0BF1100484CC for ; Tue, 18 Jan 2022 19:40:13 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 9uKznWP9vEaNC9uKznPhj6; Tue, 18 Jan 2022 19:40:13 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=dJtjJMVb c=1 sm=1 tr=0 ts=61e7179d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=DghFqjY3_ZEA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=1WrUKAQxJ4Pq9apRb7MA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ZlunocGo74XfUtqsBmOcmBv4UpCMGYpIfdx35seh/Fc=; b=IBFdbbC5h4sRTTuTB3Vzfdn0gK i65egRDIYVCQrP0hq3mAwvC1Rk8AS4iOl3pyRobWkJuagLw9tF7QtR0wMsVTvbPq0e+Pcv4O3rs1S GfBRlxPJ+K+jWKbWHRT1Bf8Te; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40582 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n9uKy-0015NP-Ob; Tue, 18 Jan 2022 12:40:12 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 09/36] Convert break-catch-exec to vtable ops Date: Tue, 18 Jan 2022 12:39:40 -0700 Message-Id: <20220118194007.2853108-10-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220118194007.2853108-1-tom@tromey.com> References: <20220118194007.2853108-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.134.30 X-Source-L: No X-Exim-ID: 1n9uKy-0015NP-Ob X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40582 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 19:40:16 -0000 This converts break-catch-exec.c to use vtable_breakpoint_ops. --- gdb/break-catch-exec.c | 99 ++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c index adfb506477c..3cabe72a35f 100644 --- a/gdb/break-catch-exec.c +++ b/gdb/break-catch-exec.c @@ -36,68 +36,77 @@ struct exec_catchpoint : public breakpoint { + int insert_location (struct bp_location *) override; + int remove_location (struct bp_location *, + enum remove_bp_reason reason) override; + int breakpoint_hit (const struct bp_location *bl, + const address_space *aspace, + CORE_ADDR bp_addr, + const target_waitstatus &ws) override; + enum print_stop_action print_it (struct bpstat *bs) override; + bool print_one (struct bp_location **) override; + void print_mention () override; + void print_recreate (struct ui_file *fp) override; + /* Filename of a program whose exec triggered this catchpoint. This field is only valid immediately after this catchpoint has triggered. */ gdb::unique_xmalloc_ptr exec_pathname; }; -static int -insert_catch_exec (struct bp_location *bl) +int +exec_catchpoint::insert_location (struct bp_location *bl) { return target_insert_exec_catchpoint (inferior_ptid.pid ()); } -static int -remove_catch_exec (struct bp_location *bl, enum remove_bp_reason reason) +int +exec_catchpoint::remove_location (struct bp_location *bl, + enum remove_bp_reason reason) { return target_remove_exec_catchpoint (inferior_ptid.pid ()); } -static int -breakpoint_hit_catch_exec (const struct bp_location *bl, - const address_space *aspace, CORE_ADDR bp_addr, - const target_waitstatus &ws) +int +exec_catchpoint::breakpoint_hit (const struct bp_location *bl, + const address_space *aspace, + CORE_ADDR bp_addr, + const target_waitstatus &ws) { - struct exec_catchpoint *c = (struct exec_catchpoint *) bl->owner; - if (ws.kind () != TARGET_WAITKIND_EXECD) return 0; - c->exec_pathname = make_unique_xstrdup (ws.execd_pathname ()); + exec_pathname = make_unique_xstrdup (ws.execd_pathname ()); return 1; } -static enum print_stop_action -print_it_catch_exec (bpstat *bs) +enum print_stop_action +exec_catchpoint::print_it (bpstat *bs) { struct ui_out *uiout = current_uiout; - struct breakpoint *b = bs->breakpoint_at; - struct exec_catchpoint *c = (struct exec_catchpoint *) b; - annotate_catchpoint (b->number); + annotate_catchpoint (number); maybe_print_thread_hit_breakpoint (uiout); - if (b->disposition == disp_del) + if (disposition == disp_del) uiout->text ("Temporary catchpoint "); else uiout->text ("Catchpoint "); if (uiout->is_mi_like_p ()) { uiout->field_string ("reason", async_reason_lookup (EXEC_ASYNC_EXEC)); - uiout->field_string ("disp", bpdisp_text (b->disposition)); + uiout->field_string ("disp", bpdisp_text (disposition)); } - uiout->field_signed ("bkptno", b->number); + uiout->field_signed ("bkptno", number); uiout->text (" (exec'd "); - uiout->field_string ("new-exec", c->exec_pathname.get ()); + uiout->field_string ("new-exec", exec_pathname.get ()); uiout->text ("), "); return PRINT_SRC_AND_LOC; } -static bool -print_one_catch_exec (struct breakpoint *b, struct bp_location **last_loc) +bool +exec_catchpoint::print_one (struct bp_location **last_loc) { - struct exec_catchpoint *c = (struct exec_catchpoint *) b; struct value_print_options opts; struct ui_out *uiout = current_uiout; @@ -110,10 +119,10 @@ print_one_catch_exec (struct breakpoint *b, struct bp_location **last_loc) uiout->field_skip ("addr"); annotate_field (5); uiout->text ("exec"); - if (c->exec_pathname != NULL) + if (exec_pathname != NULL) { uiout->text (", program \""); - uiout->field_string ("what", c->exec_pathname.get ()); + uiout->field_string ("what", exec_pathname.get ()); uiout->text ("\" "); } @@ -123,24 +132,21 @@ print_one_catch_exec (struct breakpoint *b, struct bp_location **last_loc) return true; } -static void -print_mention_catch_exec (struct breakpoint *b) +void +exec_catchpoint::print_mention () { - printf_filtered (_("Catchpoint %d (exec)"), b->number); + printf_filtered (_("Catchpoint %d (exec)"), number); } -/* Implement the "print_recreate" breakpoint_ops method for exec - catchpoints. */ +/* Implement the "print_recreate" method for exec catchpoints. */ -static void -print_recreate_catch_exec (struct breakpoint *b, struct ui_file *fp) +void +exec_catchpoint::print_recreate (struct ui_file *fp) { fprintf_unfiltered (fp, "catch exec"); - print_recreate_thread (b, fp); + print_recreate_thread (this, fp); } -static struct breakpoint_ops catch_exec_breakpoint_ops; - /* This function attempts to parse an optional "if " clause from the arg string. If one is not found, it returns NULL. @@ -199,37 +205,16 @@ catch_exec_command_1 (const char *arg, int from_tty, std::unique_ptr c (new exec_catchpoint ()); init_catchpoint (c.get (), gdbarch, temp, cond_string, - &catch_exec_breakpoint_ops); + &vtable_breakpoint_ops); c->exec_pathname.reset (); install_breakpoint (0, std::move (c), 1); } -static void -initialize_ops () -{ - struct breakpoint_ops *ops; - - initialize_breakpoint_ops (); - - /* Exec catchpoints. */ - ops = &catch_exec_breakpoint_ops; - *ops = base_breakpoint_ops; - ops->insert_location = insert_catch_exec; - ops->remove_location = remove_catch_exec; - ops->breakpoint_hit = breakpoint_hit_catch_exec; - ops->print_it = print_it_catch_exec; - ops->print_one = print_one_catch_exec; - ops->print_mention = print_mention_catch_exec; - ops->print_recreate = print_recreate_catch_exec; -} - void _initialize_break_catch_exec (); void _initialize_break_catch_exec () { - initialize_ops (); - add_catch_command ("exec", _("Catch calls to exec."), catch_exec_command_1, NULL, -- 2.31.1