This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC 3/7] change representation of psymbol to flush out accessors
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>
- Date: Thu, 20 Feb 2014 14:32:00 -0700
- Subject: [RFC 3/7] change representation of psymbol to flush out accessors
- Authentication-results: sourceware.org; auth=none
- References: <1392931924-31095-1-git-send-email-tromey at redhat dot com>
This is the psymbol analog to the patch to change the representation
of minimal symbols:
https://sourceware.org/ml/gdb-patches/2013-10/msg00524.html
It has the same rationale: namely, that we're going to change the code
to apply psymbol offsets at runtime. This will be done by adding an
argument to the SYMBOL_VALUE_ADDRESS macro -- but since we can't
convert all the symbol types at once, we need a new macro.
Also, as noted before, these macros implement a kind of "phony
polymorphism" that is not actually useful in practice.
2014-02-20 Tom Tromey <tromey@redhat.com>
* dwarf2read.c (write_psymbols): Update.
* psympriv.h (struct partial_symbol) <pginfo>: Rename from
'ginfo'.
(PSYMBOL_VALUE, PSYMBOL_VALUE_ADDRESS, PSYMBOL_LANGUAGE)
(PSYMBOL_SECTION, PSYMBOL_OBJ_SECTION, PSYMBOL_SET_LANGUAGE)
(PSYMBOL_SET_NAMES, PSYMBOL_LINKAGE_NAME, PSYMBOL_DEMANGLED_NAME)
(PSYMBOL_SEARCH_NAME, PSYMBOL_MATCHES_SEARCH_NAME): New macros.
* psymtab.c (find_pc_sect_psymtab_closer, find_pc_sect_psymtab)
(find_pc_sect_psymbol, fixup_psymbol_section)
(match_partial_symbol, lookup_partial_symbol, relocate_psymtabs)
(print_partial_symbols, recursively_search_psymtabs)
(compare_psymbols, psymbol_hash, psymbol_compare)
(add_psymbol_to_bcache, maintenance_check_psymtabs): Update.
---
gdb/ChangeLog | 16 ++++++++
gdb/dwarf2read.c | 4 +-
gdb/psympriv.h | 25 +++++++++++-
gdb/psymtab.c | 116 +++++++++++++++++++++++++++----------------------------
4 files changed, 100 insertions(+), 61 deletions(-)
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 72662a5..019f17b 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -22123,7 +22123,7 @@ write_psymbols (struct mapped_symtab *symtab,
struct partial_symbol *psym = *psymp;
void **slot;
- if (SYMBOL_LANGUAGE (psym) == language_ada)
+ if (PSYMBOL_LANGUAGE (psym) == language_ada)
error (_("Ada is not currently supported by the index"));
/* Only add a given psymbol once. */
@@ -22133,7 +22133,7 @@ write_psymbols (struct mapped_symtab *symtab,
gdb_index_symbol_kind kind = symbol_kind (psym);
*slot = psym;
- add_index_entry (symtab, SYMBOL_SEARCH_NAME (psym),
+ add_index_entry (symtab, PSYMBOL_SEARCH_NAME (psym),
is_static, kind, cu_index);
}
}
diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index 57442c2..ccf3d59 100644
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -39,7 +39,7 @@ struct partial_symbol
/* The general symbol info required for all types of symbols. */
- struct general_symbol_info ginfo;
+ struct general_symbol_info pginfo;
/* Name space code. */
@@ -53,9 +53,32 @@ struct partial_symbol
};
+#define PSYMBOL_VALUE(symbol) (symbol)->pginfo.value.ivalue
+#define PSYMBOL_VALUE_ADDRESS(symbol) (symbol)->pginfo.value.address
+#define PSYMBOL_LANGUAGE(symbol) (symbol)->pginfo.language
+#define PSYMBOL_SECTION(symbol) (symbol)->pginfo.section
+#define PSYMBOL_OBJ_SECTION(objfile, symbol) \
+ (((symbol)->pginfo.section >= 0) \
+ ? (&(((objfile)->sections)[(symbol)->pginfo.section])) \
+ : NULL)
+
+#define PSYMBOL_SET_LANGUAGE(symbol,language,obstack) \
+ (symbol_set_language (&(symbol)->pginfo, (language), (obstack)))
+#define PSYMBOL_SET_NAMES(symbol,linkage_name,len,copy_name,objfile) \
+ symbol_set_names (&(symbol)->pginfo, linkage_name, len, copy_name, objfile)
+
+#define PSYMBOL_LINKAGE_NAME(symbol) (symbol)->pginfo.name
+#define PSYMBOL_DEMANGLED_NAME(symbol) \
+ (symbol_demangled_name (&(symbol)->pginfo))
+#define PSYMBOL_SEARCH_NAME(symbol) \
+ (symbol_search_name (&(symbol)->pginfo))
+
#define PSYMBOL_DOMAIN(psymbol) (psymbol)->domain
#define PSYMBOL_CLASS(psymbol) (psymbol)->aclass
+#define PSYMBOL_MATCHES_SEARCH_NAME(symbol, name) \
+ (strcmp_iw (PSYMBOL_SEARCH_NAME (symbol), (name)) == 0)
+
/* A convenience enum to give names to some constants used when
searching psymtabs. This is internal to psymtab and should not be
used elsewhere. */
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 24faef9..fcffee6 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -265,7 +265,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile,
object's symbol table. */
p = find_pc_sect_psymbol (objfile, tpst, pc, section);
if (p != NULL
- && SYMBOL_VALUE_ADDRESS (p)
+ && PSYMBOL_VALUE_ADDRESS (p)
== BMSYMBOL_VALUE_ADDRESS (msymbol))
return tpst;
@@ -274,7 +274,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile,
symbol tables with line information but no debug
symbols (e.g. those produced by an assembler). */
if (p != NULL)
- this_addr = SYMBOL_VALUE_ADDRESS (p);
+ this_addr = PSYMBOL_VALUE_ADDRESS (p);
else
this_addr = tpst->textlow;
@@ -330,7 +330,7 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc,
object's symbol table. */
p = find_pc_sect_psymbol (objfile, pst, pc, section);
if (!p
- || SYMBOL_VALUE_ADDRESS (p)
+ || PSYMBOL_VALUE_ADDRESS (p)
!= BMSYMBOL_VALUE_ADDRESS (msymbol))
goto next;
}
@@ -421,19 +421,19 @@ find_pc_sect_psymbol (struct objfile *objfile,
p = *pp;
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
- && pc >= SYMBOL_VALUE_ADDRESS (p)
- && (SYMBOL_VALUE_ADDRESS (p) > best_pc
+ && pc >= PSYMBOL_VALUE_ADDRESS (p)
+ && (PSYMBOL_VALUE_ADDRESS (p) > best_pc
|| (psymtab->textlow == 0
- && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))
+ && best_pc == 0 && PSYMBOL_VALUE_ADDRESS (p) == 0)))
{
if (section) /* Match on a specific section. */
{
fixup_psymbol_section (p, objfile);
- if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p),
+ if (!matching_obj_sections (PSYMBOL_OBJ_SECTION (objfile, p),
section))
continue;
}
- best_pc = SYMBOL_VALUE_ADDRESS (p);
+ best_pc = PSYMBOL_VALUE_ADDRESS (p);
best = p;
}
}
@@ -446,19 +446,19 @@ find_pc_sect_psymbol (struct objfile *objfile,
p = *pp;
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
- && pc >= SYMBOL_VALUE_ADDRESS (p)
- && (SYMBOL_VALUE_ADDRESS (p) > best_pc
+ && pc >= PSYMBOL_VALUE_ADDRESS (p)
+ && (PSYMBOL_VALUE_ADDRESS (p) > best_pc
|| (psymtab->textlow == 0
- && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))
+ && best_pc == 0 && PSYMBOL_VALUE_ADDRESS (p) == 0)))
{
if (section) /* Match on a specific section. */
{
fixup_psymbol_section (p, objfile);
- if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p),
+ if (!matching_obj_sections (PSYMBOL_OBJ_SECTION (objfile, p),
section))
continue;
}
- best_pc = SYMBOL_VALUE_ADDRESS (p);
+ best_pc = PSYMBOL_VALUE_ADDRESS (p);
best = p;
}
}
@@ -474,7 +474,7 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
if (!psym)
return;
- if (SYMBOL_SECTION (psym) >= 0)
+ if (PSYMBOL_SECTION (psym) >= 0)
return;
gdb_assert (objfile);
@@ -484,7 +484,7 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
case LOC_STATIC:
case LOC_LABEL:
case LOC_BLOCK:
- addr = SYMBOL_VALUE_ADDRESS (psym);
+ addr = PSYMBOL_VALUE_ADDRESS (psym);
break;
default:
/* Nothing else will be listed in the minsyms -- no use looking
@@ -492,7 +492,7 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
return;
}
- fixup_section (&psym->ginfo, addr, objfile);
+ fixup_section (&psym->pginfo, addr, objfile);
}
static struct symtab *
@@ -582,9 +582,9 @@ match_partial_symbol (struct objfile *objfile,
center = bottom + (top - bottom) / 2;
gdb_assert (center < top);
if (!do_linear_search
- && (SYMBOL_LANGUAGE (*center) == language_java))
+ && (PSYMBOL_LANGUAGE (*center) == language_java))
do_linear_search = 1;
- if (ordered_compare (SYMBOL_SEARCH_NAME (*center), name) >= 0)
+ if (ordered_compare (PSYMBOL_SEARCH_NAME (*center), name) >= 0)
top = center;
else
bottom = center + 1;
@@ -592,9 +592,9 @@ match_partial_symbol (struct objfile *objfile,
gdb_assert (top == bottom);
while (top <= real_top
- && match (SYMBOL_SEARCH_NAME (*top), name) == 0)
+ && match (PSYMBOL_SEARCH_NAME (*top), name) == 0)
{
- if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
+ if (symbol_matches_domain (PSYMBOL_LANGUAGE (*top),
SYMBOL_DOMAIN (*top), domain))
return *top;
top++;
@@ -608,9 +608,9 @@ match_partial_symbol (struct objfile *objfile,
{
for (psym = start; psym < start + length; psym++)
{
- if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
+ if (symbol_matches_domain (PSYMBOL_LANGUAGE (*psym),
SYMBOL_DOMAIN (*psym), domain)
- && match (SYMBOL_SEARCH_NAME (*psym), name) == 0)
+ && match (PSYMBOL_SEARCH_NAME (*psym), name) == 0)
return *psym;
}
}
@@ -697,11 +697,11 @@ lookup_partial_symbol (struct objfile *objfile,
internal_error (__FILE__, __LINE__,
_("failed internal consistency check"));
if (!do_linear_search
- && SYMBOL_LANGUAGE (*center) == language_java)
+ && PSYMBOL_LANGUAGE (*center) == language_java)
{
do_linear_search = 1;
}
- if (strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*center),
+ if (strcmp_iw_ordered (PSYMBOL_SEARCH_NAME (*center),
search_name) >= 0)
{
top = center;
@@ -717,15 +717,15 @@ lookup_partial_symbol (struct objfile *objfile,
/* For `case_sensitivity == case_sensitive_off' strcmp_iw_ordered will
search more exactly than what matches SYMBOL_MATCHES_SEARCH_NAME. */
- while (top >= start && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
+ while (top >= start && PSYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
top--;
/* Fixup to have a symbol which matches SYMBOL_MATCHES_SEARCH_NAME. */
top++;
- while (top <= real_top && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
+ while (top <= real_top && PSYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
{
- if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
+ if (symbol_matches_domain (PSYMBOL_LANGUAGE (*top),
SYMBOL_DOMAIN (*top), domain))
{
do_cleanups (cleanup);
@@ -742,9 +742,9 @@ lookup_partial_symbol (struct objfile *objfile,
{
for (psym = start; psym < start + length; psym++)
{
- if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
+ if (symbol_matches_domain (PSYMBOL_LANGUAGE (*psym),
SYMBOL_DOMAIN (*psym), domain)
- && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name))
+ && PSYMBOL_MATCHES_SEARCH_NAME (*psym, search_name))
{
do_cleanups (cleanup);
return (*psym);
@@ -802,18 +802,18 @@ relocate_psymtabs (struct objfile *objfile,
psym++)
{
fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
+ if (PSYMBOL_SECTION (*psym) >= 0)
+ PSYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
+ PSYMBOL_SECTION (*psym));
}
for (psym = objfile->static_psymbols.list;
psym < objfile->static_psymbols.next;
psym++)
{
fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
+ if (PSYMBOL_SECTION (*psym) >= 0)
+ PSYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
+ PSYMBOL_SECTION (*psym));
}
}
@@ -871,10 +871,10 @@ print_partial_symbols (struct gdbarch *gdbarch,
while (count-- > 0)
{
QUIT;
- fprintf_filtered (outfile, " `%s'", SYMBOL_LINKAGE_NAME (*p));
- if (SYMBOL_DEMANGLED_NAME (*p) != NULL)
+ fprintf_filtered (outfile, " `%s'", PSYMBOL_LINKAGE_NAME (*p));
+ if (PSYMBOL_DEMANGLED_NAME (*p) != NULL)
{
- fprintf_filtered (outfile, " `%s'", SYMBOL_DEMANGLED_NAME (*p));
+ fprintf_filtered (outfile, " `%s'", PSYMBOL_DEMANGLED_NAME (*p));
}
fputs_filtered (", ", outfile);
switch (SYMBOL_DOMAIN (*p))
@@ -947,7 +947,7 @@ print_partial_symbols (struct gdbarch *gdbarch,
break;
}
fputs_filtered (", ", outfile);
- fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (*p)), outfile);
+ fputs_filtered (paddress (gdbarch, PSYMBOL_VALUE_ADDRESS (*p)), outfile);
fprintf_filtered (outfile, "\n");
p++;
}
@@ -1348,7 +1348,7 @@ recursively_search_psymtabs (struct partial_symtab *ps,
&& PSYMBOL_CLASS (*psym) == LOC_BLOCK)
|| (kind == TYPES_DOMAIN
&& PSYMBOL_CLASS (*psym) == LOC_TYPEDEF))
- && (*sym_matcher) (SYMBOL_SEARCH_NAME (*psym), data))
+ && (*sym_matcher) (PSYMBOL_SEARCH_NAME (*psym), data))
{
/* Found a match, so notify our caller. */
result = PST_SEARCHED_AND_FOUND;
@@ -1449,8 +1449,8 @@ compare_psymbols (const void *s1p, const void *s2p)
struct partial_symbol *const *s1 = s1p;
struct partial_symbol *const *s2 = s2p;
- return strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*s1),
- SYMBOL_SEARCH_NAME (*s2));
+ return strcmp_iw_ordered (PSYMBOL_SEARCH_NAME (*s1),
+ PSYMBOL_SEARCH_NAME (*s2));
}
void
@@ -1494,15 +1494,15 @@ psymbol_hash (const void *addr, int length)
{
unsigned long h = 0;
struct partial_symbol *psymbol = (struct partial_symbol *) addr;
- unsigned int lang = psymbol->ginfo.language;
+ unsigned int lang = PSYMBOL_LANGUAGE (psymbol);
unsigned int domain = PSYMBOL_DOMAIN (psymbol);
unsigned int class = PSYMBOL_CLASS (psymbol);
- h = hash_continue (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h);
+ h = hash_continue (&psymbol->pginfo.value, sizeof (psymbol->pginfo.value), h);
h = hash_continue (&lang, sizeof (unsigned int), h);
h = hash_continue (&domain, sizeof (unsigned int), h);
h = hash_continue (&class, sizeof (unsigned int), h);
- h = hash_continue (psymbol->ginfo.name, strlen (psymbol->ginfo.name), h);
+ h = hash_continue (psymbol->pginfo.name, strlen (psymbol->pginfo.name), h);
return h;
}
@@ -1517,12 +1517,12 @@ psymbol_compare (const void *addr1, const void *addr2, int length)
struct partial_symbol *sym1 = (struct partial_symbol *) addr1;
struct partial_symbol *sym2 = (struct partial_symbol *) addr2;
- return (memcmp (&sym1->ginfo.value, &sym1->ginfo.value,
- sizeof (sym1->ginfo.value)) == 0
- && sym1->ginfo.language == sym2->ginfo.language
+ return (memcmp (&sym1->pginfo.value, &sym1->pginfo.value,
+ sizeof (sym1->pginfo.value)) == 0
+ && sym1->pginfo.language == sym2->pginfo.language
&& PSYMBOL_DOMAIN (sym1) == PSYMBOL_DOMAIN (sym2)
&& PSYMBOL_CLASS (sym1) == PSYMBOL_CLASS (sym2)
- && sym1->ginfo.name == sym2->ginfo.name);
+ && sym1->pginfo.name == sym2->pginfo.name);
}
/* Initialize a partial symbol bcache. */
@@ -1595,18 +1595,18 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name,
/* val and coreaddr are mutually exclusive, one of them *will* be zero. */
if (val != 0)
{
- SYMBOL_VALUE (&psymbol) = val;
+ PSYMBOL_VALUE (&psymbol) = val;
}
else
{
- SYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr;
+ PSYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr;
}
- SYMBOL_SECTION (&psymbol) = -1;
- SYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack);
+ PSYMBOL_SECTION (&psymbol) = -1;
+ PSYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack);
PSYMBOL_DOMAIN (&psymbol) = domain;
PSYMBOL_CLASS (&psymbol) = class;
- SYMBOL_SET_NAMES (&psymbol, name, namelength, copy_name, objfile);
+ PSYMBOL_SET_NAMES (&psymbol, name, namelength, copy_name, objfile);
/* Stash the partial symbol away in the cache. */
return psymbol_bcache_full (&psymbol,
@@ -2039,12 +2039,12 @@ maintenance_check_psymtabs (char *ignore, int from_tty)
length = ps->n_static_syms;
while (length--)
{
- sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ sym = lookup_block_symbol (b, PSYMBOL_LINKAGE_NAME (*psym),
SYMBOL_DOMAIN (*psym));
if (!sym)
{
printf_filtered ("Static symbol `");
- puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
+ puts_filtered (PSYMBOL_LINKAGE_NAME (*psym));
printf_filtered ("' only found in ");
puts_filtered (ps->filename);
printf_filtered (" psymtab\n");
@@ -2056,12 +2056,12 @@ maintenance_check_psymtabs (char *ignore, int from_tty)
length = ps->n_global_syms;
while (length--)
{
- sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ sym = lookup_block_symbol (b, PSYMBOL_LINKAGE_NAME (*psym),
SYMBOL_DOMAIN (*psym));
if (!sym)
{
printf_filtered ("Global symbol `");
- puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
+ puts_filtered (PSYMBOL_LINKAGE_NAME (*psym));
printf_filtered ("' only found in ");
puts_filtered (ps->filename);
printf_filtered (" psymtab\n");
--
1.8.1.4