This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC 4/7] make PSYMBOL_VALUE_ADDRESS take objfile argument
- 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:01 -0700
- Subject: [RFC 4/7] make PSYMBOL_VALUE_ADDRESS take objfile argument
- Authentication-results: sourceware.org; auth=none
- References: <1392931924-31095-1-git-send-email-tromey at redhat dot com>
This changes PSYMBOL_VALUE_ADDRESS to take an objfile argument. This
is necessary so that we can later relocate a partial symbol at its
point of use. It also adds a "raw" form of the accessor, to compute
the unrelocated value; and a special macro to be used for setting the
field.
Note that the macro doesn't actually perform any relocation -- it uses
the argument, to ensure that any possible syntax errors are caught,
but it multiplies it by 0 so that it has no effect.
2014-02-20 Tom Tromey <tromey@redhat.com>
* psympriv.h (SET_PSYMBOL_VALUE_ADDRESS)
(PSYMBOL_VALUE_RAW_ADDRESS): New macros.
(PSYMBOL_VALUE_ADDRESS): Add 'objfile' parameter.
* psymtab.c (find_pc_sect_psymtab_closer, find_pc_sect_psymbol)
(fixup_psymbol_section, relocate_psymtabs): Update.
(print_partial_symbols): Add 'objfile' parameter. Update.
(dump_psymtab, add_psymbol_to_bcache): Update.
---
gdb/ChangeLog | 10 ++++++++++
gdb/psympriv.h | 7 ++++++-
gdb/psymtab.c | 47 +++++++++++++++++++++++++++--------------------
3 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index ccf3d59..9648ded 100644
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -54,7 +54,12 @@ struct partial_symbol
};
#define PSYMBOL_VALUE(symbol) (symbol)->pginfo.value.ivalue
-#define PSYMBOL_VALUE_ADDRESS(symbol) (symbol)->pginfo.value.address
+#define SET_PSYMBOL_VALUE_ADDRESS(symbol, addr) \
+ (((symbol)->pginfo.value.address) = (addr))
+#define PSYMBOL_VALUE_RAW_ADDRESS(symbol) ((symbol)->pginfo.value.address + 0)
+#define PSYMBOL_VALUE_ADDRESS(objfile, symbol) \
+ ((symbol)->pginfo.value.address \
+ + (0 * (ANOFFSET ((objfile)->section_offsets, ((symbol)->pginfo.section)))))
#define PSYMBOL_LANGUAGE(symbol) (symbol)->pginfo.language
#define PSYMBOL_SECTION(symbol) (symbol)->pginfo.section
#define PSYMBOL_OBJ_SECTION(objfile, symbol) \
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index fcffee6..35f376e 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
- && PSYMBOL_VALUE_ADDRESS (p)
+ && PSYMBOL_VALUE_ADDRESS (objfile, 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 = PSYMBOL_VALUE_ADDRESS (p);
+ this_addr = PSYMBOL_VALUE_ADDRESS (objfile, 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
- || PSYMBOL_VALUE_ADDRESS (p)
+ || PSYMBOL_VALUE_ADDRESS (objfile, p)
!= BMSYMBOL_VALUE_ADDRESS (msymbol))
goto next;
}
@@ -421,10 +421,11 @@ find_pc_sect_psymbol (struct objfile *objfile,
p = *pp;
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
- && pc >= PSYMBOL_VALUE_ADDRESS (p)
- && (PSYMBOL_VALUE_ADDRESS (p) > best_pc
+ && pc >= PSYMBOL_VALUE_ADDRESS (objfile, p)
+ && (PSYMBOL_VALUE_ADDRESS (objfile, p) > best_pc
|| (psymtab->textlow == 0
- && best_pc == 0 && PSYMBOL_VALUE_ADDRESS (p) == 0)))
+ && best_pc == 0
+ && PSYMBOL_VALUE_ADDRESS (objfile, p) == 0)))
{
if (section) /* Match on a specific section. */
{
@@ -433,7 +434,7 @@ find_pc_sect_psymbol (struct objfile *objfile,
section))
continue;
}
- best_pc = PSYMBOL_VALUE_ADDRESS (p);
+ best_pc = PSYMBOL_VALUE_ADDRESS (objfile, p);
best = p;
}
}
@@ -446,10 +447,11 @@ find_pc_sect_psymbol (struct objfile *objfile,
p = *pp;
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
- && pc >= PSYMBOL_VALUE_ADDRESS (p)
- && (PSYMBOL_VALUE_ADDRESS (p) > best_pc
+ && pc >= PSYMBOL_VALUE_ADDRESS (objfile, p)
+ && (PSYMBOL_VALUE_ADDRESS (objfile, p) > best_pc
|| (psymtab->textlow == 0
- && best_pc == 0 && PSYMBOL_VALUE_ADDRESS (p) == 0)))
+ && best_pc == 0
+ && PSYMBOL_VALUE_ADDRESS (objfile, p) == 0)))
{
if (section) /* Match on a specific section. */
{
@@ -458,7 +460,7 @@ find_pc_sect_psymbol (struct objfile *objfile,
section))
continue;
}
- best_pc = PSYMBOL_VALUE_ADDRESS (p);
+ best_pc = PSYMBOL_VALUE_ADDRESS (objfile, p);
best = p;
}
}
@@ -484,7 +486,7 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)
case LOC_STATIC:
case LOC_LABEL:
case LOC_BLOCK:
- addr = PSYMBOL_VALUE_ADDRESS (psym);
+ addr = PSYMBOL_VALUE_ADDRESS (objfile, psym);
break;
default:
/* Nothing else will be listed in the minsyms -- no use looking
@@ -803,8 +805,9 @@ relocate_psymtabs (struct objfile *objfile,
{
fixup_psymbol_section (*psym, objfile);
if (PSYMBOL_SECTION (*psym) >= 0)
- PSYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- PSYMBOL_SECTION (*psym));
+ SET_PSYMBOL_VALUE_ADDRESS (*psym,
+ PSYMBOL_VALUE_RAW_ADDRESS (*psym)
+ + ANOFFSET (delta, PSYMBOL_SECTION (*psym)));
}
for (psym = objfile->static_psymbols.list;
psym < objfile->static_psymbols.next;
@@ -812,8 +815,9 @@ relocate_psymtabs (struct objfile *objfile,
{
fixup_psymbol_section (*psym, objfile);
if (PSYMBOL_SECTION (*psym) >= 0)
- PSYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- PSYMBOL_SECTION (*psym));
+ SET_PSYMBOL_VALUE_ADDRESS (*psym,
+ PSYMBOL_VALUE_RAW_ADDRESS (*psym)
+ + ANOFFSET (delta, PSYMBOL_SECTION (*psym)));
}
}
@@ -864,6 +868,7 @@ forget_cached_source_info_partial (struct objfile *objfile)
static void
print_partial_symbols (struct gdbarch *gdbarch,
+ struct objfile *objfile,
struct partial_symbol **p, int count, char *what,
struct ui_file *outfile)
{
@@ -947,7 +952,9 @@ print_partial_symbols (struct gdbarch *gdbarch,
break;
}
fputs_filtered (", ", outfile);
- fputs_filtered (paddress (gdbarch, PSYMBOL_VALUE_ADDRESS (*p)), outfile);
+ fputs_filtered (paddress (gdbarch,
+ PSYMBOL_VALUE_RAW_ADDRESS (*p)),
+ outfile);
fprintf_filtered (outfile, "\n");
p++;
}
@@ -1026,14 +1033,14 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
}
if (psymtab->n_global_syms > 0)
{
- print_partial_symbols (gdbarch,
+ print_partial_symbols (gdbarch, objfile,
objfile->global_psymbols.list
+ psymtab->globals_offset,
psymtab->n_global_syms, "Global", outfile);
}
if (psymtab->n_static_syms > 0)
{
- print_partial_symbols (gdbarch,
+ print_partial_symbols (gdbarch, objfile,
objfile->static_psymbols.list
+ psymtab->statics_offset,
psymtab->n_static_syms, "Static", outfile);
@@ -1599,7 +1606,7 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name,
}
else
{
- PSYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr;
+ SET_PSYMBOL_VALUE_ADDRESS (&psymbol, coreaddr);
}
PSYMBOL_SECTION (&psymbol) = -1;
PSYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack);
--
1.8.1.4