From patchwork Wed Oct 4 02:20:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 77078 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B59C385702F for ; Wed, 4 Oct 2023 02:30:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B59C385702F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696386637; bh=vi+1UCxP2N+XuORr1nI4UarIEq5ojDUt0AbFHAqHb5I=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RdJWrUukk1cbsAvegE1OlqymOkB4CwRPhQRfkpnVgghLlzQ+XcsjSzZAFCpU7UNUM TD80S5BDjQbICX+ZUM8WrpSbR4ooRzgEMX/1ftLlUlg9Fw/tXqHdNggmTTOYY+liTX QoH9EshiAfWqMCCqQn8AzY0+NeS9Cgzyo6Sw3i8Q= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8E3F1385841B for ; Wed, 4 Oct 2023 02:30:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E3F1385841B Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 3942U3no029758 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 3 Oct 2023 22:30:08 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 3942U3no029758 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id A25361E110; Tue, 3 Oct 2023 22:23:07 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/8] gdb: add program_space parameters to some auto-load functions Date: Tue, 3 Oct 2023 22:20:20 -0400 Message-ID: <20231004022305.298534-6-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004022305.298534-1-simon.marchi@polymtl.ca> References: <20231004022305.298534-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 4 Oct 2023 02:30:03 +0000 X-Spam-Status: No, score=-3188.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" From: Simon Marchi Make the current_program_space references bubble up a bit. Change-Id: Id047a48cc8d8a45504cdbb5960bafe3e7735d652 --- gdb/auto-load.c | 19 ++++++++----------- gdb/auto-load.h | 5 +++-- gdb/guile/scm-auto-load.c | 3 ++- gdb/python/py-auto-load.c | 3 ++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/auto-load.c b/gdb/auto-load.c index c6744ca25554..37a44cc2eaa6 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -706,12 +706,9 @@ maybe_add_script_text (struct auto_load_pspace_info *pspace_info, /* Clear the table of loaded section scripts. */ static void -clear_section_scripts (void) +clear_section_scripts (program_space *pspace) { - struct program_space *pspace = current_program_space; - struct auto_load_pspace_info *info; - - info = auto_load_pspace_data.get (pspace); + auto_load_pspace_info *info = auto_load_pspace_data.get (pspace); if (info != NULL && info->loaded_script_files != NULL) auto_load_pspace_data.clear (pspace); } @@ -1175,7 +1172,7 @@ auto_load_new_objfile (struct objfile *objfile) if (!objfile) { /* OBJFILE is NULL when loading a new "main" symbol-file. */ - clear_section_scripts (); + clear_section_scripts (current_program_space); return; } @@ -1262,15 +1259,14 @@ print_scripts (const std::vector &scripts) PATTERN. FROM_TTY is the usual GDB boolean for user interactivity. */ void -auto_load_info_scripts (const char *pattern, int from_tty, - const struct extension_language_defn *language) +auto_load_info_scripts (program_space *pspace, const char *pattern, + int from_tty, const extension_language_defn *language) { struct ui_out *uiout = current_uiout; - struct auto_load_pspace_info *pspace_info; dont_repeat (); - pspace_info = get_auto_load_pspace_data (current_program_space); + auto_load_pspace_info *pspace_info = get_auto_load_pspace_data (pspace); if (pattern && *pattern) { @@ -1347,7 +1343,8 @@ auto_load_info_scripts (const char *pattern, int from_tty, static void info_auto_load_gdb_scripts (const char *pattern, int from_tty) { - auto_load_info_scripts (pattern, from_tty, &extension_language_gdb); + auto_load_info_scripts (current_program_space, pattern, from_tty, + &extension_language_gdb); } /* Implement 'info auto-load local-gdbinit'. */ diff --git a/gdb/auto-load.h b/gdb/auto-load.h index 8db904e9098f..1a7753e2d99b 100644 --- a/gdb/auto-load.h +++ b/gdb/auto-load.h @@ -56,8 +56,9 @@ extern void auto_load_objfile_script (struct objfile *objfile, const struct extension_language_defn *); extern void load_auto_scripts_for_objfile (struct objfile *objfile); extern char auto_load_info_scripts_pattern_nl[]; -extern void auto_load_info_scripts (const char *pattern, int from_tty, - const struct extension_language_defn *); +extern void auto_load_info_scripts (program_space *pspace, const char *pattern, + int from_tty, + const extension_language_defn *); extern struct cmd_list_element **auto_load_set_cmdlist_get (void); extern struct cmd_list_element **auto_load_show_cmdlist_get (void); diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c index fc98d99bc0a4..d94300893854 100644 --- a/gdb/guile/scm-auto-load.c +++ b/gdb/guile/scm-auto-load.c @@ -54,7 +54,8 @@ gdbscm_auto_load_enabled (const struct extension_language_defn *extlang) static void info_auto_load_guile_scripts (const char *pattern, int from_tty) { - auto_load_info_scripts (pattern, from_tty, &extension_language_guile); + auto_load_info_scripts (current_program_space, pattern, from_tty, + &extension_language_guile); } void diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c index 76ae3af39a02..34d5386d6c9b 100644 --- a/gdb/python/py-auto-load.c +++ b/gdb/python/py-auto-load.c @@ -53,7 +53,8 @@ gdbpy_auto_load_enabled (const struct extension_language_defn *extlang) static void info_auto_load_python_scripts (const char *pattern, int from_tty) { - auto_load_info_scripts (pattern, from_tty, &extension_language_python); + auto_load_info_scripts (current_program_space, pattern, from_tty, + &extension_language_python); } static int CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION