From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.47.144]) by sourceware.org (Postfix) with ESMTPS id 69A6C385840B for ; Thu, 26 Aug 2021 02:19:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 69A6C385840B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tromey.com Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 194D3123C9 for ; Wed, 25 Aug 2021 21:19:41 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id J4zVmVjk0jSwzJ4zVmrmra; Wed, 25 Aug 2021 21:19:41 -0500 X-Authority-Reason: nr=8 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=cFJgiAH1tYY9+zjK8UK380ADt8SVttmxTlpoEYId2o0=; b=Q3ufB5FOxGlCw9mkYZEzVRCBMa xAqb5XY9ICyEo6/oWBdLxJNyhIGsFJImQDLsjudRV2NeLK3wGVti+syfWF3NM0xpXdm/2XuxkJDT8 G9zfc4gRGl1UfOvndRx459Bzn; Received: from 97-122-86-84.hlrn.qwest.net ([97.122.86.84]:46876 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mJ4zU-003LSg-Rg; Wed, 25 Aug 2021 20:19:40 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 07/30] Add name splitting Date: Wed, 25 Aug 2021 20:19:14 -0600 Message-Id: <20210826021937.1490292-8-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210826021937.1490292-1-tom@tromey.com> References: <20210826021937.1490292-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: 97.122.86.84 X-Source-L: No X-Exim-ID: 1mJ4zU-003LSg-Rg X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-86-84.hlrn.qwest.net (localhost.localdomain) [97.122.86.84]:46876 X-Source-Auth: tom+tromey.com X-Email-Count: 8 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS_A 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, 26 Aug 2021 02:20:00 -0000 The new DWARF index code works by keeping names pre-split. That is, rather than storing a symbol name like "a::b::c", the names "a", "b", and "c" will be stored separately. This patch introduces some helper code to split a full name into its components. --- gdb/Makefile.in | 2 ++ gdb/split-name.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ gdb/split-name.h | 45 +++++++++++++++++++++++++++ gdb/symtab.h | 37 ++++++++++++++++++++++ 4 files changed, 165 insertions(+) create mode 100644 gdb/split-name.c create mode 100644 gdb/split-name.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 73a1bf83c85..45fc6bdcd05 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1147,6 +1147,7 @@ COMMON_SFILES = \ solib-target.c \ source.c \ source-cache.c \ + split-name.c \ stabsread.c \ stack.c \ std-regs.c \ @@ -1436,6 +1437,7 @@ HFILES_NO_SRCDIR = \ sparc-ravenscar-thread.h \ sparc-tdep.h \ sparc64-tdep.h \ + split-name.h \ stabsread.h \ stack.h \ stap-probe.h \ diff --git a/gdb/split-name.c b/gdb/split-name.c new file mode 100644 index 00000000000..9e2fbd25659 --- /dev/null +++ b/gdb/split-name.c @@ -0,0 +1,81 @@ +/* Split a symbol name. + + Copyright (C) 2021 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 "split-name.h" +#include "cp-support.h" + +/* See split-name.h. */ + +std::vector +split_name (const char *name, split_style style) +{ + std::vector result; + unsigned int previous_len = 0; + + switch (style) + { + case split_style::CXX: + for (unsigned int current_len = cp_find_first_component (name); + name[current_len] != '\0'; + current_len += cp_find_first_component (name + current_len)) + { + gdb_assert (name[current_len] == ':'); + result.emplace_back (&name[previous_len], + current_len - previous_len); + /* Skip the '::'. */ + current_len += 2; + previous_len = current_len; + } + break; + + case split_style::UNDERSCORE: + /* Handle the Ada encoded (aka mangled) form here. */ + for (const char *iter = strstr (name, "__"); + iter != nullptr; + iter = strstr (iter, "__")) + { + result.emplace_back (&name[previous_len], + iter - &name[previous_len]); + iter += 2; + previous_len = iter - name; + } + break; + + case split_style::DOT: + /* D and Go-style names. */ + for (const char *iter = strchr (name, '.'); + iter != nullptr; + iter = strchr (iter, '.')) + { + result.emplace_back (&name[previous_len], + iter - &name[previous_len]); + ++iter; + previous_len = iter - name; + } + break; + + default: + break; + } + + result.emplace_back (&name[previous_len]); + return result; +} + diff --git a/gdb/split-name.h b/gdb/split-name.h new file mode 100644 index 00000000000..b602917622e --- /dev/null +++ b/gdb/split-name.h @@ -0,0 +1,45 @@ +/* Split a symbol name. + + Copyright (C) 2021 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 . */ + +#ifndef GDB_SPLIT_NAME_H +#define GDB_SPLIT_NAME_H + +#include "gdbsupport/gdb_string_view.h" + +/* The available styles of name splitting. */ + +enum class split_style +{ + /* No splitting - C style. */ + NONE, + /* C++ style, with "::" and template parameter intelligence. */ + CXX, + /* Split at ".". Used by Ada, Go, D. */ + DOT, + /* Split at "__". Used by Ada encoded names. */ + UNDERSCORE, +}; + +/* Split NAME into components at module boundaries. STYLE indicates + which style of splitting to use. */ + +extern std::vector split_name (const char *name, + split_style style); + +#endif /* GDB_SPLIT_NAME_H */ diff --git a/gdb/symtab.h b/gdb/symtab.h index fd8dd62a406..e353c648002 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -36,6 +36,7 @@ #include "gdbsupport/iterator-range.h" #include "completer.h" #include "gdb-demangle.h" +#include "split-name.h" /* Opaque declarations. */ struct ui_file; @@ -121,6 +122,21 @@ class ada_lookup_name_info final bool verbatim_p () const { return m_verbatim_p; } + /* A wrapper for ::split_name that handles some Ada-specific + peculiarities. */ + std::vector split_name () const + { + if (m_verbatim_p || m_standard_p) + { + std::vector result; + if (m_standard_p) + result.emplace_back ("standard"); + result.emplace_back (m_encoded_name); + return result; + } + return ::split_name (m_encoded_name.c_str (), split_style::UNDERSCORE); + } + private: /* The Ada-encoded lookup name. */ std::string m_encoded_name; @@ -272,6 +288,27 @@ class lookup_name_info final } } + /* A wrapper for ::split_name (see split-name.h) that splits this + name, and that handles any language-specific peculiarities. */ + std::vector split_name (language lang) const + { + if (lang == language_ada) + return ada ().split_name (); + split_style style = split_style::NONE; + switch (lang) + { + case language_cplus: + case language_rust: + style = split_style::CXX; + break; + case language_d: + case language_go: + style = split_style::DOT; + break; + } + return ::split_name (language_lookup_name (lang), style); + } + /* Get the Ada-specific lookup info. */ const ada_lookup_name_info &ada () const { -- 2.31.1