From patchwork Thu Nov 21 19:10:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 36101 Received: (qmail 78762 invoked by alias); 21 Nov 2019 19:10:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 78753 invoked by uid 89); 21 Nov 2019 19:10:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f202.google.com Received: from mail-qt1-f202.google.com (HELO mail-qt1-f202.google.com) (209.85.160.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 21 Nov 2019 19:10:38 +0000 Received: by mail-qt1-f202.google.com with SMTP id r12so2930521qtp.21 for ; Thu, 21 Nov 2019 11:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=6BIjJq99+sBFq8tQIWxdnfrMCtFOUUqRHYv3GLKcG1o=; b=c8Xy50Sh+SoOAE+7WeYkk9zmTUyX97KXOCq1rN9uI5XnN2JUNWLdIWuog2uSF8ksnl 8f9HPjRDckg1gvBlm3FHzNCy15XH3G/pk5TmHSyHOM3GURmKw8vcANd/Mu0p4YvN76Jd /wkl6bIrupkePJrS6V20OZRvQFs8NKQXhpcGz1m/fablDCV3GW1iVeLRgK3WOZQXOVNy DCvmWiOjGhbDzCnTZlZdW6ngoVGzU0vx1ufa0E144oEBiZ+Iq34AEVaNo/YRfLj69MLA gYMJ4NAIsUilkpU12u1+syLnlwol2IOmLR51HF0GCRefYLGQZ4UiNlwPb+B13xzLVG8F hwew== Date: Thu, 21 Nov 2019 13:10:19 -0600 Message-Id: <20191121191019.28301-1-cbiesinger@google.com> Mime-Version: 1.0 Subject: [PATCH] Rename demangle.c to gdb-demangle.c, and some cleanup X-Patchwork-Original-From: "Christian Biesinger via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger X-IsSubscribed: yes In addition to renaming demangle.c to match the header file naming, this also makes is_cplus_marker return a bool and removes a duplicate declaration of "bool demangle" from symtab.h. gdb/ChangeLog: 2019-11-21 Christian Biesinger * Makefile.in: Update. * demangle.c: Rename to... * gdb-demangle.c: ..this. (is_cplus_marker): Change return type to bool. (_initialize_demangler): Rename to... (_initialize_gdb_demangle): ...this. * gdb-demangle.h (is_cplus_marker): Change return type to bool. * symtab.h (demangle): Remove declaration; instead include gdb-demangle.h. Change-Id: I83c3b3f7ee71b2bf6f5b5d0f9eb1d4b5208f2a97 --- gdb/Makefile.in | 2 +- gdb/{demangle.c => gdb-demangle.c} | 4 ++-- gdb/gdb-demangle.h | 2 +- gdb/symtab.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename gdb/{demangle.c => gdb-demangle.c} (99%) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5a4ffd5a81..600ebabb1f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1009,7 +1009,6 @@ COMMON_SFILES = \ dbxread.c \ dcache.c \ debug.c \ - demangle.c \ dictionary.c \ disasm.c \ disasm-selftests.c \ @@ -1040,6 +1039,7 @@ COMMON_SFILES = \ frame-base.c \ frame-unwind.c \ gcore.c \ + gdb-demangle.c \ gdb_bfd.c \ gdb_obstack.c \ gdb_regex.c \ diff --git a/gdb/demangle.c b/gdb/gdb-demangle.c similarity index 99% rename from gdb/demangle.c rename to gdb/gdb-demangle.c index d8b03104d7..2ed64d4e5b 100644 --- a/gdb/demangle.c +++ b/gdb/gdb-demangle.c @@ -149,7 +149,7 @@ static char cplus_markers[] = {'$', '.', '\0'}; /* See documentation in gdb-demangle.h. */ -int +bool is_cplus_marker (int c) { return c && strchr (cplus_markers, c) != NULL; @@ -213,7 +213,7 @@ demangle_command (const char *args, int from_tty) } void -_initialize_demangler (void) +_initialize_gdb_demangle (void) { int i, ndems; diff --git a/gdb/gdb-demangle.h b/gdb/gdb-demangle.h index 327a63313b..e68973f5b3 100644 --- a/gdb/gdb-demangle.h +++ b/gdb/gdb-demangle.h @@ -29,6 +29,6 @@ extern bool demangle; extern bool asm_demangle; /* Check if a character is one of the commonly used C++ marker characters. */ -extern int is_cplus_marker (int); +extern bool is_cplus_marker (int); #endif /* GDB_DEMANGLE_H */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 1e82182df7..8f95a3a4d2 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -33,6 +33,7 @@ #include "gdbsupport/gdb_string_view.h" #include "gdbsupport/next-iterator.h" #include "completer.h" +#include "gdb-demangle.h" /* Opaque declarations. */ struct ui_file; @@ -553,7 +554,6 @@ extern const char *symbol_demangled_name #define SYMBOL_PRINT_NAME(symbol) \ (demangle ? SYMBOL_NATURAL_NAME (symbol) : SYMBOL_LINKAGE_NAME (symbol)) -extern bool demangle; /* Macro that returns the name to be used when sorting and searching symbols. In C++, we search for the demangled form of a name,