From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id AB5C93858405 for ; Mon, 4 Apr 2022 19:53:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AB5C93858405 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 1D90F10048289 for ; Mon, 4 Apr 2022 19:53:41 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id bSlgnJMXeQs3CbSlgnPKNK; Mon, 04 Apr 2022 19:53:41 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=A+Opg4aG c=1 sm=1 tr=0 ts=624b4cc5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=z0gMJWrwH1QA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=TBczGDfnNpANJyBmlUIA: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=9EQIJQpfIGxEmA2OKzGm5VF5qIGz7MX6RVAT3HClq+c=; b=H20zlO0jaTGXuNVqPK8UOF4AlC ssyrwfkHBKnD/lD/oy0yz6HI6LXA78/NKON0Crxu/r2sB0cydUIYJMd7Ude6ECMYXUI/MXVrNVI3O gre9f8GgzfrzNsimCPCMdx6o5; Received: from 71-211-176-135.hlrn.qwest.net ([71.211.176.135]:34798 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 1nbSlg-003u7z-27; Mon, 04 Apr 2022 13:53:40 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v4 06/34] Allow ada_decode not to decode operators Date: Mon, 4 Apr 2022 13:53:07 -0600 Message-Id: <20220404195335.2111906-7-tom@tromey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404195335.2111906-1-tom@tromey.com> References: <20220404195335.2111906-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: 71.211.176.135 X-Source-L: No X-Exim-ID: 1nbSlg-003u7z-27 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-176-135.hlrn.qwest.net (prentzel.Home) [71.211.176.135]:34798 X-Source-Auth: tom+tromey.com X-Email-Count: 14 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Mon, 04 Apr 2022 19:53:43 -0000 The new DWARF scanner records names as they appear in DWARF. However, because Ada is unusual, it also decodes the Ada names to synthesize package components for them. In order for this to work out properly, gdb also needs a mode where ada_decode can be instructed not to decode Ada operator names. That is what this patch implements. --- gdb/ada-lang.c | 13 ++++++++----- gdb/ada-lang.h | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f80ec5b1e04..21d9de5d56e 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1304,7 +1304,7 @@ convert_from_hex_encoded (std::string &out, const char *str, int n) /* See ada-lang.h. */ std::string -ada_decode (const char *encoded, bool wrap) +ada_decode (const char *encoded, bool wrap, bool operators) { int i; int len0; @@ -1399,7 +1399,7 @@ ada_decode (const char *encoded, bool wrap) while (i < len0) { /* Is this a symbol function? */ - if (at_start_name && encoded[i] == 'O') + if (operators && at_start_name && encoded[i] == 'O') { int k; @@ -1558,9 +1558,12 @@ ada_decode (const char *encoded, bool wrap) /* Decoded names should never contain any uppercase character. Double-check this, and abort the decoding if we find one. */ - for (i = 0; i < decoded.length(); ++i) - if (isupper (decoded[i]) || decoded[i] == ' ') - goto Suppress; + if (operators) + { + for (i = 0; i < decoded.length(); ++i) + if (isupper (decoded[i]) || decoded[i] == ' ') + goto Suppress; + } /* If the compiler added a suffix, append it now. */ if (suffix >= 0) diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index a6caf35b826..0dcdb56c198 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -218,8 +218,10 @@ extern const char *ada_decode_symbol (const struct general_symbol_info *); the name does not appear to be GNAT-encoded, then the result depends on WRAP. If WRAP is true (the default), then the result is simply wrapped in <...>. If WRAP is false, then the empty string - will be returned. */ -extern std::string ada_decode (const char *name, bool wrap = true); + will be returned. Also, when OPERATORS is false, operator names + will not be decoded. */ +extern std::string ada_decode (const char *name, bool wrap = true, + bool operators = true); extern std::vector ada_lookup_symbol_list (const char *, const struct block *, domain_enum); -- 2.34.1