From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id yMoiBJw5KWe+0iUAWB0awg (envelope-from ) for ; Mon, 04 Nov 2024 16:16:12 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=GYKJ3YbU; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 0B5471E5E0; Mon, 4 Nov 2024 16:16:12 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.5 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, URIBL_BLOCKED,URIBL_DBL_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=4.0.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 ESMTPS id D42EF1E0C0 for ; Mon, 4 Nov 2024 16:16:10 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62FC13857719 for ; Mon, 4 Nov 2024 21:16:10 +0000 (GMT) Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 35FB5385780F for ; Mon, 4 Nov 2024 21:14:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 35FB5385780F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 35FB5385780F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730754866; cv=none; b=hCW620iukgLvYtP+chgSFbW2+zMsKoOPlYRK1hXTu5ENoMVpbw4CRY+dtvqXYVgC3jHrwUTdsS5fhJSaKyRqgKOj4gHNoqJCVARdpFuwzC2DtSCXw20Kjgd2ZzftcRKm01r4njhzx6yNKd9M1s1ir7gKv0kPStFjQMb4RLNXSSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730754866; c=relaxed/simple; bh=mRJrCd0mWKDIAB1eDNZVMbgg5VISJn897dFhQ+EkxOE=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=YLiSZj/BW+Z16wwtXzqcIt8zp8OTIFHSXMWSE4F4oAafnzi70cjDS85FKFS7FKUUeHQEFLPP9piM1jk+NI3L11LnrIz9tr3unC3wh0nI2KSMQjJyyIEw0FbQJONVw1nPpSImM+3BLmRzbHLFeP4gtE7j8rinrT3vez6aCgK8Glc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6007a.ext.cloudfilter.net ([10.0.30.247]) by cmsmtp with ESMTPS id 7zjjt3kPQvH7l84OutGmu3; Mon, 04 Nov 2024 21:14:16 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 84OttwcNEvrfm84OttMvdx; Mon, 04 Nov 2024 21:14:15 +0000 X-Authority-Analysis: v=2.4 cv=GZgRnxXL c=1 sm=1 tr=0 ts=67293927 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=VlfZXiiP6vEA:10 a=ItBw4LHWJt0A:10 a=bAdkChYsnYqv23DiwyMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=C9FcoE90kb50G67l3A3PZuXliC2JN+bZq5woiP463RA=; b=GYKJ3YbULBRS6xG+BrJHso5CrV zfjoCIAp0E7EqknozaF2xIP/90fe5wHlmebxSsY95BCV/SOPHpEWtS+YNuXCHmVS7nQkxr0qGPWHq eHlqVxb9d5eYHP+UxVVyvENkb; Received: from 97-122-113-155.hlrn.qwest.net ([97.122.113.155]:36924 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1t84Ot-003uOz-0Z; Mon, 04 Nov 2024 14:14:15 -0700 From: Tom Tromey Date: Mon, 04 Nov 2024 14:14:16 -0700 Subject: [PATCH 6/6] Remove the auto_charset gdbarch hook MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241104-check-unused-gdbarch-v1-6-7082f2121077@tromey.com> References: <20241104-check-unused-gdbarch-v1-0-7082f2121077@tromey.com> In-Reply-To: <20241104-check-unused-gdbarch-v1-0-7082f2121077@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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: 97.122.113.155 X-Source-L: No X-Exim-ID: 1t84Ot-003uOz-0Z X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-113-155.hlrn.qwest.net (prentzel.local) [97.122.113.155]:36924 X-Source-Auth: tom+tromey.com X-Email-Count: 11 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfAUhWe6jv8XazjfuSitD0T3lyxJV9gNnD1CIZIS9mI2qTOpuEwdwwR7JdIovAQ6oTkF5nZun4/HSjn2E0Rmq6Eq0H9h6bJoQ5Dceh23ZhkyRUf65z42h w7M4yI3ymUp3Pc6fCrvf/xBfVfZUvG/s6aifxlm5ZLJ546leGBydLdeqFCIB8QBZvbi6mltSvVvKfqeR9gewBoKRnMUFA02WaPE= 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: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org The auto_charset gdbarch hook has never been set by any architecture. I probably added it (don't remember) to be parallel to auto_wide_charset -- but considering that it hasn't ever been needed, it seems fine to remove it. --- gdb/arch-utils.h | 1 - gdb/charset.c | 9 +++++---- gdb/gdbarch-gen.c | 22 ---------------------- gdb/gdbarch-gen.h | 6 ------ gdb/gdbarch_components.py | 11 ----------- 5 files changed, 5 insertions(+), 44 deletions(-) diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 39094a0bf3e2e121c7df67a64d530ca6c471f661..807ab96ca4edad319cd42b7ff45768ef91a45a67 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -236,7 +236,6 @@ extern void default_gen_return_address (struct gdbarch *gdbarch, struct axs_value *value, CORE_ADDR scope); -extern const char *default_auto_charset (void); extern const char *default_auto_wide_charset (void); extern int default_return_in_first_hidden_param_p (struct gdbarch *, diff --git a/gdb/charset.c b/gdb/charset.c index 35e700a8caf71fffffe5b06081f08d964d2d6bce..04c424b7fb5fca50b310340c8394b70c1868d342 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -216,6 +216,7 @@ gdb_iconv (iconv_t utf_flag, ICONV_CONST char **inbuf, size_t *inbytesleft, /* The global lists of character sets and translations. */ +static const char *default_auto_charset (); #ifndef GDB_DEFAULT_TARGET_CHARSET #define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1" @@ -249,7 +250,7 @@ show_target_charset_name (struct ui_file *file, int from_tty, gdb_printf (file, _("The target character set is \"auto; " "currently %s\".\n"), - gdbarch_auto_charset (get_current_arch ())); + default_auto_charset ()); else gdb_printf (file, _("The target character set is \"%s\".\n"), value); @@ -425,7 +426,7 @@ const char * target_charset (struct gdbarch *gdbarch) { if (!strcmp (target_charset_name, "auto")) - return gdbarch_auto_charset (gdbarch); + return default_auto_charset (); return target_charset_name; } @@ -917,8 +918,8 @@ find_charset_names (void) /* The "auto" target charset used by default_auto_charset. */ static const char *auto_target_charset_name = GDB_DEFAULT_TARGET_CHARSET; -const char * -default_auto_charset (void) +static const char * +default_auto_charset () { return auto_target_charset_name; } diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c index 47f068967cce0e44f1e3e6a5b7eee485320ae705..4c3b9b7f9e27e853f4b6a52cf46c65173e252cef 100644 --- a/gdb/gdbarch-gen.c +++ b/gdb/gdbarch-gen.c @@ -228,7 +228,6 @@ struct gdbarch gdbarch_has_shared_address_space_ftype *has_shared_address_space = default_has_shared_address_space; gdbarch_fast_tracepoint_valid_at_ftype *fast_tracepoint_valid_at = default_fast_tracepoint_valid_at; gdbarch_guess_tracepoint_registers_ftype *guess_tracepoint_registers = default_guess_tracepoint_registers; - gdbarch_auto_charset_ftype *auto_charset = default_auto_charset; gdbarch_auto_wide_charset_ftype *auto_wide_charset = default_auto_wide_charset; int has_dos_based_file_system = 0; gdbarch_gen_return_address_ftype *gen_return_address = default_gen_return_address; @@ -494,7 +493,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of has_shared_address_space, invalid_p == 0. */ /* Skip verify of fast_tracepoint_valid_at, invalid_p == 0. */ /* Skip verify of guess_tracepoint_registers, invalid_p == 0. */ - /* Skip verify of auto_charset, invalid_p == 0. */ /* Skip verify of auto_wide_charset, invalid_p == 0. */ /* Skip verify of has_dos_based_file_system, invalid_p == 0. */ /* Skip verify of gen_return_address, invalid_p == 0. */ @@ -1260,9 +1258,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) gdb_printf (file, "gdbarch_dump: guess_tracepoint_registers = <%s>\n", host_address_to_string (gdbarch->guess_tracepoint_registers)); - gdb_printf (file, - "gdbarch_dump: auto_charset = <%s>\n", - host_address_to_string (gdbarch->auto_charset)); gdb_printf (file, "gdbarch_dump: auto_wide_charset = <%s>\n", host_address_to_string (gdbarch->auto_wide_charset)); @@ -4847,23 +4842,6 @@ set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, gdbarch->guess_tracepoint_registers = guess_tracepoint_registers; } -const char * -gdbarch_auto_charset (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->auto_charset != NULL); - if (gdbarch_debug >= 2) - gdb_printf (gdb_stdlog, "gdbarch_auto_charset called\n"); - return gdbarch->auto_charset (); -} - -void -set_gdbarch_auto_charset (struct gdbarch *gdbarch, - gdbarch_auto_charset_ftype auto_charset) -{ - gdbarch->auto_charset = auto_charset; -} - const char * gdbarch_auto_wide_charset (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h index d96bbe94f07b17a5ed173bdf20b3bfee7ff70cfa..4f7544c97b5ea2a6878d80dc253a04c2428551ed 100644 --- a/gdb/gdbarch-gen.h +++ b/gdb/gdbarch-gen.h @@ -1517,12 +1517,6 @@ typedef void (gdbarch_guess_tracepoint_registers_ftype) (struct gdbarch *gdbarch extern void gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr); extern void set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, gdbarch_guess_tracepoint_registers_ftype *guess_tracepoint_registers); -/* Return the "auto" target charset. */ - -typedef const char * (gdbarch_auto_charset_ftype) (); -extern const char * gdbarch_auto_charset (struct gdbarch *gdbarch); -extern void set_gdbarch_auto_charset (struct gdbarch *gdbarch, gdbarch_auto_charset_ftype *auto_charset); - /* Return the "auto" target wide charset. */ typedef const char * (gdbarch_auto_wide_charset_ftype) (); diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py index 78d9521154f629740bced42a44300c20a1e2b2cb..ca8731c69cf2d27d5a30654fdc5edde508a96564 100644 --- a/gdb/gdbarch_components.py +++ b/gdb/gdbarch_components.py @@ -2399,17 +2399,6 @@ On entry, regcache has all registers marked as unavailable. invalid=False, ) -Function( - comment=""" -Return the "auto" target charset. -""", - type="const char *", - name="auto_charset", - params=[], - predefault="default_auto_charset", - invalid=False, -) - Function( comment=""" Return the "auto" target wide charset. -- 2.46.1