From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 526D43857C4F for ; Thu, 13 Jan 2022 16:29:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 526D43857C4F 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 cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 576E810048711 for ; Thu, 13 Jan 2022 16:29:10 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 82yLnyYVP2s5d82yLncMAv; Thu, 13 Jan 2022 16:29:10 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=BOh2EHcG c=1 sm=1 tr=0 ts=61e05356 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=mDV3o1hIAAAA:8 a=YuuLupFcCHbWXQch43AA:9 a=_FVE-zBwftR9WsbkzFJk:22 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=AbLsS+5MzpYVbfTSX55BvJRjhCNq3iUtgo3tH44rLok=; b=LF4RzuEA7SL4/Vutom65jxVYzi sZHhaGl/V0lFJtYOTpVbWN6HuURPcmKCk1QvHsY2r3ST4mdRICmQ4dzqo5FMoDykkD/7ManBsyfHL Lon/A3WxX7QGo7hUmdr4IfYQf; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40280 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 1n82yL-001AR2-Az; Thu, 13 Jan 2022 09:29:09 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/4] Move "catch exec" to a new file Date: Thu, 13 Jan 2022 09:29:05 -0700 Message-Id: <20220113162906.1000129-4-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220113162906.1000129-1-tom@tromey.com> References: <20220113162906.1000129-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: 1n82yL-001AR2-Az X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40280 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, 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: Thu, 13 Jan 2022 16:29:14 -0000 The "catch exec" code is reasonably self-contained, and so this patch moves it out of breakpoint.c (the second largest source file in gdb) and into a new file, break-catch-exec.c. --- gdb/Makefile.in | 1 + gdb/break-catch-exec.c | 236 +++++++++++++++++++++++++++++++++++++++++ gdb/breakpoint.c | 191 --------------------------------- 3 files changed, 237 insertions(+), 191 deletions(-) create mode 100644 gdb/break-catch-exec.c diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9ea595bed4c..28fa8f0fdb5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -999,6 +999,7 @@ COMMON_SFILES = \ bfd-target.c \ block.c \ blockframe.c \ + break-catch-exec.c \ break-catch-fork.c \ break-catch-sig.c \ break-catch-syscall.c \ diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c new file mode 100644 index 00000000000..c0cf2aeb3b5 --- /dev/null +++ b/gdb/break-catch-exec.c @@ -0,0 +1,236 @@ +/* Everything about exec catchpoints, for GDB. + + Copyright (C) 1986-2022 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" + +#include "annotate.h" +#include "arch-utils.h" +#include "breakpoint.h" +#include "cli/cli-decode.h" +#include "inferior.h" +#include "mi/mi-common.h" +#include "target.h" +#include "valprint.h" + +/* Exec catchpoints. */ + +/* An instance of this type is used to represent an exec catchpoint. + A breakpoint is really of this type iff its ops pointer points to + CATCH_EXEC_BREAKPOINT_OPS. */ + +struct exec_catchpoint : public breakpoint +{ + /* 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) +{ + return target_insert_exec_catchpoint (inferior_ptid.pid ()); +} + +static int +remove_catch_exec (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) +{ + 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 ()); + return 1; +} + +static enum print_stop_action +print_it_catch_exec (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); + maybe_print_thread_hit_breakpoint (uiout); + if (b->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_signed ("bkptno", b->number); + uiout->text (" (exec'd "); + uiout->field_string ("new-exec", c->exec_pathname.get ()); + uiout->text ("), "); + + return PRINT_SRC_AND_LOC; +} + +static void +print_one_catch_exec (struct breakpoint *b, struct bp_location **last_loc) +{ + struct exec_catchpoint *c = (struct exec_catchpoint *) b; + struct value_print_options opts; + struct ui_out *uiout = current_uiout; + + get_user_print_options (&opts); + + /* Field 4, the address, is omitted (which makes the columns + not line up too nicely with the headers, but the effect + is relatively readable). */ + if (opts.addressprint) + uiout->field_skip ("addr"); + annotate_field (5); + uiout->text ("exec"); + if (c->exec_pathname != NULL) + { + uiout->text (", program \""); + uiout->field_string ("what", c->exec_pathname.get ()); + uiout->text ("\" "); + } + + if (uiout->is_mi_like_p ()) + uiout->field_string ("catch-type", "exec"); +} + +static void +print_mention_catch_exec (struct breakpoint *b) +{ + printf_filtered (_("Catchpoint %d (exec)"), b->number); +} + +/* Implement the "print_recreate" breakpoint_ops method for exec + catchpoints. */ + +static void +print_recreate_catch_exec (struct breakpoint *b, struct ui_file *fp) +{ + fprintf_unfiltered (fp, "catch exec"); + print_recreate_thread (b, 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. + + Else, it returns a pointer to the condition string. (It does not + attempt to evaluate the string against a particular block.) And, + it updates arg to point to the first character following the parsed + if clause in the arg string. */ + +const char * +ep_parse_optional_if_clause (const char **arg) +{ + const char *cond_string; + + if (((*arg)[0] != 'i') || ((*arg)[1] != 'f') || !isspace ((*arg)[2])) + return NULL; + + /* Skip the "if" keyword. */ + (*arg) += 2; + + /* Skip any extra leading whitespace, and record the start of the + condition string. */ + *arg = skip_spaces (*arg); + cond_string = *arg; + + /* Assume that the condition occupies the remainder of the arg + string. */ + (*arg) += strlen (cond_string); + + return cond_string; +} + +/* Commands to deal with catching events, such as signals, exceptions, + process start/exit, etc. */ + +static void +catch_exec_command_1 (const char *arg, int from_tty, + struct cmd_list_element *command) +{ + struct gdbarch *gdbarch = get_current_arch (); + const char *cond_string = NULL; + bool temp = command->context () == CATCH_TEMPORARY; + + if (!arg) + arg = ""; + arg = skip_spaces (arg); + + /* The allowed syntax is: + catch exec + catch exec if + + First, check if there's an if clause. */ + cond_string = ep_parse_optional_if_clause (&arg); + + if ((*arg != '\0') && !isspace (*arg)) + error (_("Junk at end of arguments.")); + + std::unique_ptr c (new exec_catchpoint ()); + init_catchpoint (c.get (), gdbarch, temp, cond_string, + &catch_exec_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, + CATCH_PERMANENT, + CATCH_TEMPORARY); +} diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index cdc342aeb11..9c223a4f6d3 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -7986,117 +7986,6 @@ install_breakpoint (int internal, std::unique_ptr &&arg, int update_ update_global_location_list (UGLL_MAY_INSERT); } -/* Exec catchpoints. */ - -/* An instance of this type is used to represent an exec catchpoint. - A breakpoint is really of this type iff its ops pointer points to - CATCH_EXEC_BREAKPOINT_OPS. */ - -struct exec_catchpoint : public breakpoint -{ - /* 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) -{ - return target_insert_exec_catchpoint (inferior_ptid.pid ()); -} - -static int -remove_catch_exec (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) -{ - 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 ()); - return 1; -} - -static enum print_stop_action -print_it_catch_exec (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); - maybe_print_thread_hit_breakpoint (uiout); - if (b->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_signed ("bkptno", b->number); - uiout->text (" (exec'd "); - uiout->field_string ("new-exec", c->exec_pathname.get ()); - uiout->text ("), "); - - return PRINT_SRC_AND_LOC; -} - -static void -print_one_catch_exec (struct breakpoint *b, struct bp_location **last_loc) -{ - struct exec_catchpoint *c = (struct exec_catchpoint *) b; - struct value_print_options opts; - struct ui_out *uiout = current_uiout; - - get_user_print_options (&opts); - - /* Field 4, the address, is omitted (which makes the columns - not line up too nicely with the headers, but the effect - is relatively readable). */ - if (opts.addressprint) - uiout->field_skip ("addr"); - annotate_field (5); - uiout->text ("exec"); - if (c->exec_pathname != NULL) - { - uiout->text (", program \""); - uiout->field_string ("what", c->exec_pathname.get ()); - uiout->text ("\" "); - } - - if (uiout->is_mi_like_p ()) - uiout->field_string ("catch-type", "exec"); -} - -static void -print_mention_catch_exec (struct breakpoint *b) -{ - printf_filtered (_("Catchpoint %d (exec)"), b->number); -} - -/* Implement the "print_recreate" breakpoint_ops method for exec - catchpoints. */ - -static void -print_recreate_catch_exec (struct breakpoint *b, struct ui_file *fp) -{ - fprintf_unfiltered (fp, "catch exec"); - print_recreate_thread (b, fp); -} - -static struct breakpoint_ops catch_exec_breakpoint_ops; - static int hw_breakpoint_used_count (void) { @@ -10958,70 +10847,6 @@ until_break_command (const char *arg, int from_tty, int anywhere) proceed (-1, GDB_SIGNAL_DEFAULT); } -/* This function attempts to parse an optional "if " clause - from the arg string. If one is not found, it returns NULL. - - Else, it returns a pointer to the condition string. (It does not - attempt to evaluate the string against a particular block.) And, - it updates arg to point to the first character following the parsed - if clause in the arg string. */ - -const char * -ep_parse_optional_if_clause (const char **arg) -{ - const char *cond_string; - - if (((*arg)[0] != 'i') || ((*arg)[1] != 'f') || !isspace ((*arg)[2])) - return NULL; - - /* Skip the "if" keyword. */ - (*arg) += 2; - - /* Skip any extra leading whitespace, and record the start of the - condition string. */ - *arg = skip_spaces (*arg); - cond_string = *arg; - - /* Assume that the condition occupies the remainder of the arg - string. */ - (*arg) += strlen (cond_string); - - return cond_string; -} - -/* Commands to deal with catching events, such as signals, exceptions, - process start/exit, etc. */ - -static void -catch_exec_command_1 (const char *arg, int from_tty, - struct cmd_list_element *command) -{ - struct gdbarch *gdbarch = get_current_arch (); - const char *cond_string = NULL; - bool temp = command->context () == CATCH_TEMPORARY; - - if (!arg) - arg = ""; - arg = skip_spaces (arg); - - /* The allowed syntax is: - catch exec - catch exec if - - First, check if there's an if clause. */ - cond_string = ep_parse_optional_if_clause (&arg); - - if ((*arg != '\0') && !isspace (*arg)) - error (_("Junk at end of arguments.")); - - std::unique_ptr c (new exec_catchpoint ()); - init_catchpoint (c.get (), gdbarch, temp, cond_string, - &catch_exec_breakpoint_ops); - c->exec_pathname.reset (); - - install_breakpoint (0, std::move (c), 1); -} - void init_ada_exception_breakpoint (struct breakpoint *b, struct gdbarch *gdbarch, @@ -15042,17 +14867,6 @@ initialize_breakpoint_ops (void) ops->create_breakpoints_sal = strace_marker_create_breakpoints_sal; ops->decode_location = strace_marker_decode_location; - /* 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; - /* Solib-related catchpoints. */ ops = &catch_solib_breakpoint_ops; *ops = base_breakpoint_ops; @@ -15357,11 +15171,6 @@ Set temporary catchpoints to catch events."), &tcatch_cmdlist, 0/*allow-unknown*/, &cmdlist); - add_catch_command ("exec", _("Catch calls to exec."), - catch_exec_command_1, - NULL, - CATCH_PERMANENT, - CATCH_TEMPORARY); add_catch_command ("load", _("Catch loads of shared libraries.\n\ Usage: catch load [REGEX]\n\ If REGEX is given, only stop for libraries matching the regular expression."), -- 2.31.1