From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 09/29] Use a .def file for domain_enum
Date: Mon, 20 Nov 2023 20:53:40 -0700 [thread overview]
Message-ID: <20231120-submit-domain-hacks-2-v1-9-29650d01b198@tromey.com> (raw)
In-Reply-To: <20231120-submit-domain-hacks-2-v1-0-29650d01b198@tromey.com>
Future patches will change and reuse the names from domain_enum. This
patch makes this less error-prone by having a single point to define
these names, using the typical gdb ".def" file.
---
gdb/guile/scm-symbol.c | 18 ++++++++++--------
gdb/python/py-symbol.c | 21 ++++++++-------------
gdb/sym-domains.def | 47 +++++++++++++++++++++++++++++++++++++++++++++++
gdb/symtab.c | 10 ++++------
gdb/symtab.h | 31 +++----------------------------
5 files changed, 72 insertions(+), 55 deletions(-)
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 1619705f065..a7dd21db088 100644
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -693,16 +693,18 @@ static const scheme_integer_constant symbol_integer_constants[] =
X (LOC_OPTIMIZED_OUT),
X (LOC_COMPUTED),
X (LOC_REGPARM_ADDR),
-
- X (UNDEF_DOMAIN),
- X (VAR_DOMAIN),
- X (STRUCT_DOMAIN),
- X (LABEL_DOMAIN),
- X (VARIABLES_DOMAIN),
- X (FUNCTIONS_DOMAIN),
- X (TYPES_DOMAIN),
#undef X
+#define DOMAIN(X) \
+ { "SYMBOL_" #X "_DOMAIN", X ## _DOMAIN },
+#include "sym-domains.def"
+#undef DOMAIN
+
+ /* These were never correct. */
+ { "SYMBOL_VARIABLES_DOMAIN", VAR_DOMAIN },
+ { "SYMBOL_FUNCTIONS_DOMAIN", FUNCTION_DOMAIN },
+ { "SYMBOL_TYPES_DOMAIN", TYPE_DOMAIN },
+
END_INTEGER_CONSTANTS
};
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 99724cfc95b..ceea4b7e241 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -670,20 +670,15 @@ gdbpy_initialize_symbols (void)
|| PyModule_AddIntConstant (gdb_module, "SYMBOL_LOC_COMMON_BLOCK",
LOC_COMMON_BLOCK) < 0
|| PyModule_AddIntConstant (gdb_module, "SYMBOL_LOC_REGPARM_ADDR",
- LOC_REGPARM_ADDR) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_UNDEF_DOMAIN",
- UNDEF_DOMAIN) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_VAR_DOMAIN",
- VAR_DOMAIN) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_STRUCT_DOMAIN",
- STRUCT_DOMAIN) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_LABEL_DOMAIN",
- LABEL_DOMAIN) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_MODULE_DOMAIN",
- MODULE_DOMAIN) < 0
- || PyModule_AddIntConstant (gdb_module, "SYMBOL_COMMON_BLOCK_DOMAIN",
- COMMON_BLOCK_DOMAIN) < 0)
+ LOC_REGPARM_ADDR) < 0)
+ return -1;
+
+#define DOMAIN(X) \
+ if (PyModule_AddIntConstant (gdb_module, "SYMBOL_" #X "_DOMAIN", \
+ X ## _DOMAIN) < 0) \
return -1;
+#include "sym-domains.def"
+#undef DOMAIN
/* These remain defined for compatibility, but as they were never
correct, they are no longer documented. Eventually we can remove
diff --git a/gdb/sym-domains.def b/gdb/sym-domains.def
new file mode 100644
index 00000000000..251c66fa04b
--- /dev/null
+++ b/gdb/sym-domains.def
@@ -0,0 +1,47 @@
+/* Symbol domains -*- c++ -*-
+
+ Copyright (C) 2023 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 <http://www.gnu.org/licenses/>. */
+
+/* UNDEF_DOMAIN is used when a domain has not been discovered or
+ none of the following apply. This usually indicates an error either
+ in the symbol information or in gdb's handling of symbols. */
+
+DOMAIN (UNDEF)
+
+/* VAR_DOMAIN is the usual domain. In C, this contains variables,
+ function names, typedef names and enum type values. */
+
+DOMAIN (VAR)
+
+/* STRUCT_DOMAIN is used in C to hold struct, union and enum type names.
+ Thus, if `struct foo' is used in a C program, it produces a symbol named
+ `foo' in the STRUCT_DOMAIN. */
+
+DOMAIN (STRUCT)
+
+/* MODULE_DOMAIN is used in Fortran to hold module type names. */
+
+DOMAIN (MODULE)
+
+/* LABEL_DOMAIN may be used for names of labels (for gotos). */
+
+DOMAIN (LABEL)
+
+/* Fortran common blocks. Their naming must be separate from VAR_DOMAIN.
+ They also always use LOC_COMMON_BLOCK. */
+DOMAIN (COMMON_BLOCK)
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 9e28edff7b4..3bc158cec43 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -304,12 +304,10 @@ domain_name (domain_enum e)
{
switch (e)
{
- case UNDEF_DOMAIN: return "UNDEF_DOMAIN";
- case VAR_DOMAIN: return "VAR_DOMAIN";
- case STRUCT_DOMAIN: return "STRUCT_DOMAIN";
- case MODULE_DOMAIN: return "MODULE_DOMAIN";
- case LABEL_DOMAIN: return "LABEL_DOMAIN";
- case COMMON_BLOCK_DOMAIN: return "COMMON_BLOCK_DOMAIN";
+#define DOMAIN(X) \
+ case X ## _DOMAIN: return #X "_DOMAIN";
+#include "sym-domains.def"
+#undef DOMAIN
default: gdb_assert_not_reached ("bad domain_enum");
}
}
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 71d37e84a43..20cc0e90c14 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -888,34 +888,9 @@ struct minimal_symbol : public general_symbol_info
enum domain_enum
{
- /* UNDEF_DOMAIN is used when a domain has not been discovered or
- none of the following apply. This usually indicates an error either
- in the symbol information or in gdb's handling of symbols. */
-
- UNDEF_DOMAIN,
-
- /* VAR_DOMAIN is the usual domain. In C, this contains variables,
- function names, typedef names and enum type values. */
-
- VAR_DOMAIN,
-
- /* STRUCT_DOMAIN is used in C to hold struct, union and enum type names.
- Thus, if `struct foo' is used in a C program, it produces a symbol named
- `foo' in the STRUCT_DOMAIN. */
-
- STRUCT_DOMAIN,
-
- /* MODULE_DOMAIN is used in Fortran to hold module type names. */
-
- MODULE_DOMAIN,
-
- /* LABEL_DOMAIN may be used for names of labels (for gotos). */
-
- LABEL_DOMAIN,
-
- /* Fortran common blocks. Their naming must be separate from VAR_DOMAIN.
- They also always use LOC_COMMON_BLOCK. */
- COMMON_BLOCK_DOMAIN,
+#define DOMAIN(X) X ## _DOMAIN,
+#include "sym-domains.def"
+#undef DOMAIN
};
/* The number of bits in a symbol used to represent the domain. */
--
2.41.0
next prev parent reply other threads:[~2023-11-21 3:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 3:53 [PATCH 00/29] Restructure symbol domains Tom Tromey
2023-11-21 3:53 ` [PATCH 01/29] Fix bug in cooked index scanner Tom Tromey
2023-11-21 3:53 ` [PATCH 02/29] Small cleanup in DWARF reader Tom Tromey
2023-11-21 3:53 ` [PATCH 03/29] Make nsalias.exp more reliable Tom Tromey
2023-11-21 3:53 ` [PATCH 04/29] Fix latent bug in mdebugread.c Tom Tromey
2023-11-21 3:53 ` [PATCH 05/29] Give names to unspecified types Tom Tromey
2023-11-21 3:53 ` [PATCH 06/29] Remove NR_DOMAINS Tom Tromey
2023-11-21 3:53 ` [PATCH 07/29] Simplify symbol_to_info_string Tom Tromey
2023-11-21 3:53 ` [PATCH 08/29] Split up a big 'if' in symtab.c Tom Tromey
2023-11-21 3:53 ` Tom Tromey [this message]
2023-11-21 3:53 ` [PATCH 10/29] Add two new symbol domains Tom Tromey
2023-11-21 3:53 ` [PATCH 11/29] Add domain_search_flags Tom Tromey
2023-11-21 3:53 ` [PATCH 12/29] Replace search_domain with domain_search_flags Tom Tromey
2023-11-21 3:53 ` [PATCH 13/29] Remove a check of VAR_DOMAIN Tom Tromey
2023-11-21 3:53 ` [PATCH 14/29] Introduce "scripting" domains Tom Tromey
2023-11-21 3:53 ` [PATCH 15/29] Use domain_search_flags in lookup_global_symbol_language Tom Tromey
2023-11-21 3:53 ` [PATCH 16/29] Use domain_search_flags in lookup_symbol et al Tom Tromey
2023-11-21 3:53 ` [PATCH 17/29] Remove some obsolete Python constants Tom Tromey
2023-11-21 3:53 ` [PATCH 18/29] Remove old symbol_matches_domain Tom Tromey
2023-11-21 3:53 ` [PATCH 19/29] Use the new symbol domains Tom Tromey
2023-11-21 3:53 ` [PATCH 20/29] Simplify some symbol searches in Ada code Tom Tromey
2023-11-21 3:53 ` [PATCH 21/29] Simplify some symbol searches in linespec.c Tom Tromey
2023-11-21 3:53 ` [PATCH 22/29] Only search for "main" as a function Tom Tromey
2023-11-21 3:53 ` [PATCH 23/29] Only look for functions in expand_symtabs_for_function Tom Tromey
2023-11-21 3:53 ` [PATCH 24/29] Use a function-domain search in inside_main_func Tom Tromey
2023-11-21 3:53 ` [PATCH 25/29] Only search types in cp_lookup_rtti_type Tom Tromey
2023-11-21 3:53 ` [PATCH 26/29] Only search types in lookup_typename Tom Tromey
2023-11-21 3:53 ` [PATCH 27/29] Only search for functions in rust_structop::evaluate_funcall Tom Tromey
2023-11-21 3:53 ` [PATCH 28/29] Refine search in cp_search_static_and_baseclasses Tom Tromey
2023-11-21 3:54 ` [PATCH 29/29] Document new Python and Guile constants Tom Tromey
2023-11-21 11:39 ` Eli Zaretskii
2024-01-23 0:34 ` Tom Tromey
2024-01-23 18:11 ` Eli Zaretskii
2023-11-21 18:37 ` [PATCH 00/29] Restructure symbol domains John Baldwin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231120-submit-domain-hacks-2-v1-9-29650d01b198@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).