1999-04-16 03:35:26 +02:00
|
|
|
|
/* GDB routines for manipulating the minimal symbol tables.
|
2012-01-04 09:17:56 +01:00
|
|
|
|
Copyright (C) 1992-2004, 2007-2012 Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Contributed by Cygnus Support, using pieces from other GDB modules.
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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
|
2007-08-23 20:08:50 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(at your option) any later version.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 20:08:50 +02:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This file contains support routines for creating, manipulating, and
|
|
|
|
|
destroying minimal symbol tables.
|
|
|
|
|
|
|
|
|
|
Minimal symbol tables are used to hold some very basic information about
|
|
|
|
|
all defined global symbols (text, data, bss, abs, etc). The only two
|
|
|
|
|
required pieces of information are the symbol's name and the address
|
|
|
|
|
associated with that symbol.
|
|
|
|
|
|
|
|
|
|
In many cases, even if a file was compiled with no special options for
|
|
|
|
|
debugging at all, as long as was not stripped it will contain sufficient
|
|
|
|
|
information to build useful minimal symbol tables using this structure.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Even when a file contains enough debugging information to build a full
|
|
|
|
|
symbol table, these minimal symbols are still useful for quickly mapping
|
|
|
|
|
between names and addresses, and vice versa. They are also sometimes used
|
2011-01-09 04:20:33 +01:00
|
|
|
|
to figure out what full symbol table entries need to be read in. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
2000-03-07 05:33:52 +01:00
|
|
|
|
#include <ctype.h>
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "bfd.h"
|
2011-03-23 19:23:56 +01:00
|
|
|
|
#include "filenames.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include "symfile.h"
|
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "demangle.h"
|
2001-05-22 23:02:41 +02:00
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "cp-abi.h"
|
2008-05-16 14:51:21 +02:00
|
|
|
|
#include "target.h"
|
2009-03-31 22:21:08 +02:00
|
|
|
|
#include "cp-support.h"
|
|
|
|
|
#include "language.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Accumulate the minimal symbols for each objfile in bunches of BUNCH_SIZE.
|
|
|
|
|
At the end, copy them all into one newly allocated location on an objfile's
|
|
|
|
|
symbol obstack. */
|
|
|
|
|
|
|
|
|
|
#define BUNCH_SIZE 127
|
|
|
|
|
|
|
|
|
|
struct msym_bunch
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct msym_bunch *next;
|
|
|
|
|
struct minimal_symbol contents[BUNCH_SIZE];
|
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Bunch currently being filled up.
|
|
|
|
|
The next field points to chain of filled bunches. */
|
|
|
|
|
|
|
|
|
|
static struct msym_bunch *msym_bunch;
|
|
|
|
|
|
|
|
|
|
/* Number of slots filled in current bunch. */
|
|
|
|
|
|
|
|
|
|
static int msym_bunch_index;
|
|
|
|
|
|
|
|
|
|
/* Total number of minimal symbols recorded so far for the objfile. */
|
|
|
|
|
|
|
|
|
|
static int msym_count;
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
msymbol_hash_iw (const char *string)
|
|
|
|
|
{
|
|
|
|
|
unsigned int hash = 0;
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2000-03-07 05:33:52 +01:00
|
|
|
|
while (*string && *string != '(')
|
|
|
|
|
{
|
|
|
|
|
while (isspace (*string))
|
|
|
|
|
++string;
|
|
|
|
|
if (*string && *string != '(')
|
2001-10-12 21:07:07 +02:00
|
|
|
|
{
|
2011-04-06 21:50:05 +02:00
|
|
|
|
hash = SYMBOL_HASH_NEXT (hash, *string);
|
2001-10-12 21:07:07 +02:00
|
|
|
|
++string;
|
|
|
|
|
}
|
2000-03-07 05:33:52 +01:00
|
|
|
|
}
|
2002-07-11 22:46:19 +02:00
|
|
|
|
return hash;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
msymbol_hash (const char *string)
|
|
|
|
|
{
|
|
|
|
|
unsigned int hash = 0;
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2000-03-07 05:33:52 +01:00
|
|
|
|
for (; *string; ++string)
|
2011-04-06 21:50:05 +02:00
|
|
|
|
hash = SYMBOL_HASH_NEXT (hash, *string);
|
2002-07-11 22:46:19 +02:00
|
|
|
|
return hash;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the minimal symbol SYM to an objfile's minsym hash table, TABLE. */
|
2011-12-19 17:11:14 +01:00
|
|
|
|
static void
|
2000-03-07 05:33:52 +01:00
|
|
|
|
add_minsym_to_hash_table (struct minimal_symbol *sym,
|
|
|
|
|
struct minimal_symbol **table)
|
|
|
|
|
{
|
|
|
|
|
if (sym->hash_next == NULL)
|
|
|
|
|
{
|
2003-03-10 21:40:45 +01:00
|
|
|
|
unsigned int hash
|
|
|
|
|
= msymbol_hash (SYMBOL_LINKAGE_NAME (sym)) % MINIMAL_SYMBOL_HASH_SIZE;
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2000-03-07 05:33:52 +01:00
|
|
|
|
sym->hash_next = table[hash];
|
|
|
|
|
table[hash] = sym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-30 05:03:23 +02:00
|
|
|
|
/* Add the minimal symbol SYM to an objfile's minsym demangled hash table,
|
|
|
|
|
TABLE. */
|
|
|
|
|
static void
|
|
|
|
|
add_minsym_to_demangled_hash_table (struct minimal_symbol *sym,
|
|
|
|
|
struct minimal_symbol **table)
|
|
|
|
|
{
|
|
|
|
|
if (sym->demangled_hash_next == NULL)
|
|
|
|
|
{
|
2011-01-05 23:22:53 +01:00
|
|
|
|
unsigned int hash = msymbol_hash_iw (SYMBOL_SEARCH_NAME (sym))
|
|
|
|
|
% MINIMAL_SYMBOL_HASH_SIZE;
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2000-03-30 05:03:23 +02:00
|
|
|
|
sym->demangled_hash_next = table[hash];
|
|
|
|
|
table[hash] = sym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2008-05-03 02:37:35 +02:00
|
|
|
|
struct objfile *
|
|
|
|
|
msymbol_objfile (struct minimal_symbol *sym)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objf;
|
|
|
|
|
struct minimal_symbol *tsym;
|
|
|
|
|
|
|
|
|
|
unsigned int hash
|
|
|
|
|
= msymbol_hash (SYMBOL_LINKAGE_NAME (sym)) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
|
|
|
|
for (objf = object_files; objf; objf = objf->next)
|
|
|
|
|
for (tsym = objf->msymbol_hash[hash]; tsym; tsym = tsym->hash_next)
|
|
|
|
|
if (tsym == sym)
|
|
|
|
|
return objf;
|
|
|
|
|
|
|
|
|
|
/* We should always be able to find the objfile ... */
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Look through all the current minimal symbol tables and find the
|
|
|
|
|
first minimal symbol that matches NAME. If OBJF is non-NULL, limit
|
2003-01-08 19:38:47 +01:00
|
|
|
|
the search to that objfile. If SFILE is non-NULL, the only file-scope
|
|
|
|
|
symbols considered will be from that source file (global symbols are
|
|
|
|
|
still preferred). Returns a pointer to the minimal symbol that
|
1999-04-16 03:35:26 +02:00
|
|
|
|
matches, or NULL if no match is found.
|
|
|
|
|
|
|
|
|
|
Note: One instance where there may be duplicate minimal symbols with
|
|
|
|
|
the same name is when the symbol tables for a shared library and the
|
|
|
|
|
symbol tables for an executable contain global symbols with the same
|
2004-09-20 18:54:28 +02:00
|
|
|
|
names (the dynamic linker deals with the duplication).
|
|
|
|
|
|
|
|
|
|
It's also possible to have minimal symbols with different mangled
|
|
|
|
|
names, but identical demangled names. For example, the GNU C++ v3
|
|
|
|
|
ABI requires the generation of two (or perhaps three) copies of
|
|
|
|
|
constructor functions --- "in-charge", "not-in-charge", and
|
|
|
|
|
"allocate" copies; destructors may be duplicated as well.
|
|
|
|
|
Obviously, there must be distinct mangled names for each of these,
|
|
|
|
|
but the demangled names are all the same: S::S or S::~S. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
lookup_minimal_symbol (const char *name, const char *sfile,
|
2000-07-30 03:48:28 +02:00
|
|
|
|
struct objfile *objf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *found_symbol = NULL;
|
|
|
|
|
struct minimal_symbol *found_file_symbol = NULL;
|
|
|
|
|
struct minimal_symbol *trampoline_symbol = NULL;
|
|
|
|
|
|
2002-07-11 22:46:19 +02:00
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
unsigned int dem_hash = msymbol_hash_iw (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
2009-03-31 22:21:08 +02:00
|
|
|
|
int needtofreename = 0;
|
|
|
|
|
const char *modified_name;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (sfile != NULL)
|
2011-03-09 13:48:56 +01:00
|
|
|
|
sfile = lbasename (sfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* For C++, canonicalize the input name. */
|
2009-03-31 22:21:08 +02:00
|
|
|
|
modified_name = name;
|
|
|
|
|
if (current_language->la_language == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
char *cname = cp_canonicalize_string (name);
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2009-03-31 22:21:08 +02:00
|
|
|
|
if (cname)
|
|
|
|
|
{
|
|
|
|
|
modified_name = cname;
|
|
|
|
|
needtofreename = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2007-12-18 17:02:54 +01:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 11:11:04 +01:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-03-07 05:33:52 +01:00
|
|
|
|
/* Do two passes: the first over the ordinary hash table,
|
|
|
|
|
and the second over the demangled hash table. */
|
2000-03-30 05:03:23 +02:00
|
|
|
|
int pass;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
2000-03-30 05:03:23 +02:00
|
|
|
|
for (pass = 1; pass <= 2 && found_symbol == NULL; pass++)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-03-30 05:03:23 +02:00
|
|
|
|
/* Select hash list according to pass. */
|
|
|
|
|
if (pass == 1)
|
|
|
|
|
msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
else
|
|
|
|
|
msymbol = objfile->msymbol_demangled_hash[dem_hash];
|
|
|
|
|
|
|
|
|
|
while (msymbol != NULL && found_symbol == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 20:14:39 +02:00
|
|
|
|
int match;
|
|
|
|
|
|
|
|
|
|
if (pass == 1)
|
2009-03-31 22:21:08 +02:00
|
|
|
|
{
|
2011-04-27 22:03:04 +02:00
|
|
|
|
int (*cmp) (const char *, const char *);
|
|
|
|
|
|
|
|
|
|
cmp = (case_sensitivity == case_sensitive_on
|
|
|
|
|
? strcmp : strcasecmp);
|
|
|
|
|
match = cmp (SYMBOL_LINKAGE_NAME (msymbol),
|
|
|
|
|
modified_name) == 0;
|
2009-03-31 22:21:08 +02:00
|
|
|
|
}
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 20:14:39 +02:00
|
|
|
|
else
|
2009-03-31 22:21:08 +02:00
|
|
|
|
{
|
2011-04-27 22:03:04 +02:00
|
|
|
|
/* The function respects CASE_SENSITIVITY. */
|
2009-03-31 22:21:08 +02:00
|
|
|
|
match = SYMBOL_MATCHES_SEARCH_NAME (msymbol,
|
|
|
|
|
modified_name);
|
|
|
|
|
}
|
|
|
|
|
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 20:14:39 +02:00
|
|
|
|
if (match)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-03-30 05:03:23 +02:00
|
|
|
|
switch (MSYMBOL_TYPE (msymbol))
|
|
|
|
|
{
|
|
|
|
|
case mst_file_text:
|
|
|
|
|
case mst_file_data:
|
|
|
|
|
case mst_file_bss:
|
2003-11-08 01:13:03 +01:00
|
|
|
|
if (sfile == NULL
|
2011-03-23 19:23:56 +01:00
|
|
|
|
|| filename_cmp (msymbol->filename, sfile) == 0)
|
2000-03-30 05:03:23 +02:00
|
|
|
|
found_file_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case mst_solib_trampoline:
|
|
|
|
|
|
|
|
|
|
/* If a trampoline symbol is found, we prefer to
|
2011-01-09 04:20:33 +01:00
|
|
|
|
keep looking for the *real* symbol. If the
|
2000-03-30 05:03:23 +02:00
|
|
|
|
actual symbol is not found, then we'll use the
|
2011-01-09 04:20:33 +01:00
|
|
|
|
trampoline entry. */
|
2000-03-30 05:03:23 +02:00
|
|
|
|
if (trampoline_symbol == NULL)
|
|
|
|
|
trampoline_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case mst_unknown:
|
|
|
|
|
default:
|
|
|
|
|
found_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
2000-03-30 05:03:23 +02:00
|
|
|
|
/* Find the next symbol on the hash chain. */
|
|
|
|
|
if (pass == 1)
|
|
|
|
|
msymbol = msymbol->hash_next;
|
|
|
|
|
else
|
|
|
|
|
msymbol = msymbol->demangled_hash_next;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-03-31 22:21:08 +02:00
|
|
|
|
|
|
|
|
|
if (needtofreename)
|
|
|
|
|
xfree ((void *) modified_name);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* External symbols are best. */
|
|
|
|
|
if (found_symbol)
|
|
|
|
|
return found_symbol;
|
|
|
|
|
|
|
|
|
|
/* File-local symbols are next best. */
|
|
|
|
|
if (found_file_symbol)
|
|
|
|
|
return found_file_symbol;
|
|
|
|
|
|
|
|
|
|
/* Symbols for shared library trampolines are next best. */
|
|
|
|
|
if (trampoline_symbol)
|
|
|
|
|
return trampoline_symbol;
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
the "ambiguous linespec" series
gdb
2011-12-06 Joel Brobecker <brobecker@acacore.com>
* language.h (struct language_defn): Add new component
la_symbol_name_compare.
* symfile.h (struct quick_symbol_functions): Update the profile
of parameter "name_matcher" for the expand_symtabs_matching
method. Update the documentation accordingly.
* ada-lang.h (ada_name_for_lookup): Add declaration.
* ada-lang.c (ada_name_for_lookup): New function, extracted out
from ada_iterate_over_symbols.
(ada_iterate_over_symbols): Do not encode symbol name anymore.
(ada_expand_partial_symbol_name): Adjust profile.
(ada_language_defn): Add value for la_symbol_name_compare field.
* linespec.c: #include "ada-lang.h".
(iterate_name_matcher): Add language parameter. Replace call
to strcmp_iw by call to language->la_symbol_name_compare.
(decode_variable): Encode COPY if current language is Ada.
* dwarf2read.c (dw2_expand_symtabs_matching): Adjust profile
of name_matcher parameter. Adjust call to name_matcher.
* psymtab.c (expand_symtabs_matching_via_partial): Likewise.
(expand_partial_symbol_names): Update profile of parameter "fun".
* psymtab.h (expand_partial_symbol_names): Update profile of
parameter "fun".
* symtab.c (demangle_for_lookup): Update function documentation.
(search_symbols_name_matches): Add language parameter.
(expand_partial_symbol_name): Likewise.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Add value for
la_symbol_name_compare field.
* d-lang.c (d_language_defn): Likewise.
* f-lang.c (f_language_defn): Ditto.
* jv-lang.c (java_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* opencl-lang.c (opencl_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* language.c (unknown_language_defn, auto_language_defn)
(local_language_defn): Ditto.
2011-12-06 Tom Tromey <tromey@redhat.com>
* linespec.c (iterate_over_all_matching_symtabs): Use
LA_ITERATE_OVER_SYMBOLS.
(lookup_prefix_sym, add_matching_symbols_to_info): Likewise.
(find_function_symbols, decode_variable): Remove Ada special
case.
* language.h (struct language_defn) <la_iterate_over_symbols>: New
field.
(LA_ITERATE_OVER_SYMBOLS): New macro.
* language.c (unknown_language_defn, auto_language_defn)
(local_language_defn): Update.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Update.
* d-lang.c (d_language_defn): Update.
* f-lang.c (f_language_defn): Update.
* jv-lang.c (java_language_defn): Update.
* m2-lang.c (m2_language_defn): Update.
* objc-lang.c (objc_language_defn): Update.
* opencl-lang.c (opencl_language_defn): Update.
* p-lang.c (pascal_language_defn): Update.
* ada-lang.c (ada_iterate_over_symbols): New function.
(ada_language_defn): Update.
2011-12-06 Tom Tromey <tromey@redhat.com>
Joel Brobecker <brobecker@acacore.com>
PR breakpoints/13105, PR objc/8341, PR objc/8343, PR objc/8366,
PR objc/8535, PR breakpoints/11657, PR breakpoints/11970,
PR breakpoints/12023, PR breakpoints/12334, PR breakpoints/12856,
PR shlibs/8929, PR shlibs/7393:
* python/py-type.c (compare_maybe_null_strings): Rename from
compare_strings.
(check_types_equal): Update.
* utils.c (compare_strings): New function.
* tui/tui-winsource.c (tui_update_breakpoint_info): Update for
location changes.
* tracepoint.c (scope_info): Update.
(trace_find_line_command): Use DECODE_LINE_FUNFIRSTLINE.
* symtab.h (iterate_over_minimal_symbols)
(iterate_over_some_symtabs, iterate_over_symtabs)
(find_pcs_for_symtab_line, iterate_over_symbols)
(demangle_for_lookup): Declare.
(expand_line_sal): Remove.
* symtab.c (iterate_over_some_symtabs, iterate_over_symtabs)
(lookup_symtab_callback): New functions.
(lookup_symtab): Rewrite.
(demangle_for_lookup): New function, extract from
lookup_symbol_in_language.
(lookup_symbol_in_language): Use it.
(iterate_over_symbols): New function.
(find_line_symtab): Update.
(find_pcs_for_symtab_line): New functions.
(find_line_common): Add 'start' argument.
(decode_line_spec): Update. Change argument to 'flags', change
interpretation.
(append_expanded_sal): Remove.
(append_exact_match_to_sals): Remove.
(expand_line_sal): Remove.
* symfile.h (struct quick_symbol_functions) <lookup_symtab>:
Remove.
<map_symtabs_matching_filename>: New field.
* stack.c (func_command): Only look in the current program space.
Use DECODE_LINE_FUNFIRSTLINE.
* source.c (line_info): Set pspace on sal. Check program space in
the loop. Use DECODE_LINE_LIST_MODE.
(select_source_symtab): Use DECODE_LINE_FUNFIRSTLINE.
* solib-target.c: Remove DEF_VEC_I(CORE_ADDR).
* python/python.c (gdbpy_decode_line): Update.
* psymtab.c (partial_map_expand_apply): New function.
(partial_map_symtabs_matching_filename): Rename from
lookup_partial_symbol. Update arguments.
(lookup_symtab_via_partial_symtab): Remove.
(psym_functions): Update.
* objc-lang.h (parse_selector, parse_method): Don't declare.
(find_imps): Update.
* objc-lang.c (parse_selector, parse_method): Now static.
(find_methods): Change arguments. Fill in a vector of symbol
names.
(uniquify_strings): New function.
(find_imps): Change arguments.
* minsyms.c (iterate_over_minimal_symbols): New function.
* linespec.h (enum decode_line_flags): New.
(struct linespec_sals): New.
(struct linespec_result) <canonical>: Remove.
<pre_expanded, addr_string, sals>: New fields.
(destroy_linespec_result, make_cleanup_destroy_linespec_result)
(decode_line_full): Declare.
(decode_line_1): Update.
* linespec.c (struct address_entry, struct linespec_state, struct
collect_info): New types.
(add_sal_to_sals_basic, add_sal_to_sals, hash_address_entry)
(eq_address_entry, maybe_add_address): New functions.
(total_number_of_methods): Remove.
(iterate_name_matcher, iterate_over_all_matching_symtabs): New
functions.
(find_methods): Change arguments. Don't canonicalize input.
Simplify logic.
(add_matching_methods, add_constructors)
(build_canonical_line_spec): Remove.
(filter_results, convert_results_to_lsals): New functions.
(decode_line_2): Change arguments. Rewrite for new data
structures.
(decode_line_internal): Rename from decode_line_1. Change
arguments. Add cleanups. Update for new data structures.
(linespec_state_constructor, linespec_state_destructor)
(decode_line_full, decode_line_1): New functions.
(decode_indirect): Change arguments. Update.
(locate_first_half): Use skip_spaces.
(decode_objc): Change arguments. Update for new data structures.
Simplify logic.
(decode_compound): Change arguments. Add cleanups. Remove
fallback code, replace with error.
(struct decode_compound_collector): New type.
(collect_one_symbol): New function.
(lookup_prefix_sym): Change arguments. Update.
(compare_symbol_name, add_all_symbol_names_from_pspace)
(find_superclass_methods ): New functions.
(find_method): Rewrite.
(struct symtab_collector): New type.
(add_symtabs_to_list, collect_symtabs_from_filename): New
functions.
(symtabs_from_filename): Change API. Rename from
symtab_from_filename.
(collect_function_symbols): New function.
(find_function_symbols): Change API. Rename from
find_function_symbol. Rewrite.
(decode_all_digits): Change arguments. Rewrite.
(decode_dollar): Change arguments. Use decode_variable.
(decode_label): Change arguments. Rewrite.
(collect_symbols): New function.
(minsym_found): Change arguments. Rewrite.
(check_minsym, search_minsyms_for_name)
(add_matching_symbols_to_info): New function.
(decode_variable): Change arguments. Iterate over all symbols.
(symbol_found): Remove.
(symbol_to_sal): New function.
(init_linespec_result, destroy_linespec_result)
(cleanup_linespec_result, make_cleanup_destroy_linespec_result):
New functions.
(decode_digits_list_mode, decode_digits_ordinary): New functions.
* dwarf2read.c (dw2_map_expand_apply): New function.
(dw2_map_symtabs_matching_filename): Rename from
dw2_lookup_symtab. Change arguments.
(dwarf2_gdb_index_functions): Update.
* dwarf2loc.c: Remove DEF_VEC_I(CORE_ADDR).
* defs.h (compare_strings): Declare.
* cli/cli-cmds.c (compare_strings): Move to utils.c.
(edit_command, list_command): Use DECODE_LINE_LIST_MODE. Call
filter_sals.
(compare_symtabs, filter_sals): New functions.
* breakpoint.h (struct bp_location) <line_number, source_file>:
New fields.
(struct breakpoint) <line_number, source_file>: Remove.
<filter>: New field.
* breakpoint.c (print_breakpoint_location, init_raw_breakpoint)
(momentary_breakpoint_from_master, add_location_to_breakpoint):
Update for changes to locations.
(init_breakpoint_sal): Add 'filter' argument. Set 'filter' on
breakpoint.
(create_breakpoint_sal): Add 'filter' argument.
(remove_sal, expand_line_sal_maybe): Remove.
(create_breakpoints_sal): Remove 'sals' argument. Handle
pre-expanded sals and the filter.
(parse_breakpoint_sals): Use decode_line_full.
(check_fast_tracepoint_sals): Use get_sal_arch.
(create_breakpoint): Create a linespec_sals. Update.
(break_range_command): Use decode_line_full. Update.
(until_break_command): Update.
(clear_command): Update match conditions for linespec.c changes.
Use DECODE_LINE_LIST_MODE.
(say_where): Update for changes to locations.
(bp_location_dtor): Free 'source_file'.
(base_breakpoint_dtor): Free 'filter'. Don't free 'source_file'.
(update_static_tracepoint): Update for changes to locations.
(update_breakpoint_locations): Disable ranged breakpoint if too
many locations match. Update.
(addr_string_to_sals): Use decode_line_full. Resolve all sal
PCs.
(breakpoint_re_set_default): Don't call expand_line_sal_maybe.
(decode_line_spec_1): Update. Change argument name to 'flags',
change interpretation.
* block.h (block_containing_function): Declare.
* block.c (block_containing_function): New function.
* skip.c (skip_function_command): Update.
(skip_re_set): Update.
* infcmd.c (jump_command): Use DECODE_LINE_FUNFIRSTLINE.
* mi/mi-main.c (mi_cmd_trace_find): Use DECODE_LINE_FUNFIRSTLINE.
* NEWS: Add entry.
2011-12-06 Tom Tromey <tromey@redhat.com>
* elfread.c (elf_gnu_ifunc_resolver_return_stop): Allow
breakpoint's pspace to be NULL.
* breakpoint.h (struct breakpoint) <pspace>: Update comment.
* breakpoint.c (init_raw_breakpoint): Conditionally set
breakpoint's pspace.
(init_breakpoint_sal): Don't set breakpoint's pspace.
(prepare_re_set_context): Conditionally switch program space.
(addr_string_to_sals): Check executing_startup on location's
program space.
2011-12-06 Tom Tromey <tromey@redhat.com>
* breakpoint.h (enum enable_state) <bp_startup_disabled>: Remove.
* breakpoint.c (should_be_inserted): Explicitly check if program
space is executing startup.
(describe_other_breakpoints): Update.
(disable_breakpoints_before_startup): Change executing_startup
earlier. Remove loop.
(enable_breakpoints_after_startup): Likewise.
(init_breakpoint_sal): Don't use bp_startup_disabled.
(create_breakpoint): Don't use bp_startup_disabled.
(update_global_location_list): Use should_be_inserted.
(bkpt_re_set): Update.
gdb/testsuite
2011-12-06 Joel Brobecker <brobecker@acacore.com>
* gdb.ada/fullname_bp.exp: Add tests for other valid linespecs
involving a fully qualified function name.
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.ada/homonym.exp: Add three breakpoint tests.
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.base/solib-weak.exp (do_test): Remove kfail.
* gdb.trace/tracecmd.exp: Disable pending breakpoints earlier.
* gdb.objc/objcdecode.exp: Update for output changes.
* gdb.linespec/linespec.exp: New file.
* gdb.linespec/lspec.cc: New file.
* gdb.linespec/lspec.h: New file.
* gdb.linespec/body.h: New file.
* gdb.linespec/base/two/thefile.cc: New file.
* gdb.linespec/base/one/thefile.cc: New file.
* gdb.linespec/Makefile.in: New file.
* gdb.cp/templates.exp (test_template_breakpoints): Update for
output changes.
* gdb.cp/re-set-overloaded.exp: Remove kfail.
* gdb.cp/ovldbreak.exp: Update for output changes. "all" test now
makes one breakpoint.
* gdb.cp/method2.exp (test_break): Update for output changes.
* gdb.cp/mb-templates.exp: Update for output changes.
* gdb.cp/mb-inline.exp: Update for output changes.
* gdb.cp/mb-ctor.exp: Update for output changes.
* gdb.cp/ovsrch.exp: Use fully-qualified names.
* gdb.base/solib-symbol.exp: Run to main later. Breakpoint now
has multiple matches.
* gdb.base/sepdebug.exp: Disable pending breakpoints. Update for
error message change.
* gdb.base/list.exp (test_list_filename_and_number): Update for
error message change.
* gdb.base/break.exp: Disable pending breakpoints. Update for
output changes.
* configure.ac: Add gdb.linespec.
* configure: Rebuild.
* Makefile.in (ALL_SUBDIRS): Add gdb.linespec.
gdb/doc
2011-12-06 Tom Tromey <tromey@redhat.com>
* gdb.texinfo (Set Breaks): Update for new behavior.
2011-12-06 19:54:43 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
iterate_over_minimal_symbols (struct objfile *objf, const char *name,
|
|
|
|
|
void (*callback) (struct minimal_symbol *,
|
|
|
|
|
void *),
|
|
|
|
|
void *user_data)
|
|
|
|
|
{
|
|
|
|
|
unsigned int hash;
|
|
|
|
|
struct minimal_symbol *iter;
|
|
|
|
|
int (*cmp) (const char *, const char *);
|
|
|
|
|
|
|
|
|
|
/* The first pass is over the ordinary hash table. */
|
|
|
|
|
hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
iter = objf->msymbol_hash[hash];
|
|
|
|
|
cmp = (case_sensitivity == case_sensitive_on ? strcmp : strcasecmp);
|
|
|
|
|
while (iter)
|
|
|
|
|
{
|
|
|
|
|
if (cmp (SYMBOL_LINKAGE_NAME (iter), name) == 0)
|
|
|
|
|
(*callback) (iter, user_data);
|
|
|
|
|
iter = iter->hash_next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The second pass is over the demangled table. */
|
|
|
|
|
hash = msymbol_hash_iw (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
iter = objf->msymbol_demangled_hash[hash];
|
|
|
|
|
while (iter)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_MATCHES_SEARCH_NAME (iter, name))
|
|
|
|
|
(*callback) (iter, user_data);
|
|
|
|
|
iter = iter->demangled_hash_next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct minimal_symbol *
|
2003-10-22 00:56:39 +02:00
|
|
|
|
lookup_minimal_symbol_text (const char *name, struct objfile *objf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *found_symbol = NULL;
|
|
|
|
|
struct minimal_symbol *found_file_symbol = NULL;
|
|
|
|
|
|
2003-01-08 19:38:47 +01:00
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2007-12-18 17:02:54 +01:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 11:11:04 +01:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-01-08 19:38:47 +01:00
|
|
|
|
for (msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
msymbol != NULL && found_symbol == NULL;
|
|
|
|
|
msymbol = msymbol->hash_next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-03-10 21:40:45 +01:00
|
|
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (msymbol), name) == 0 &&
|
2011-03-28 22:21:04 +02:00
|
|
|
|
(MSYMBOL_TYPE (msymbol) == mst_text
|
|
|
|
|
|| MSYMBOL_TYPE (msymbol) == mst_text_gnu_ifunc
|
|
|
|
|
|| MSYMBOL_TYPE (msymbol) == mst_file_text))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (MSYMBOL_TYPE (msymbol))
|
|
|
|
|
{
|
|
|
|
|
case mst_file_text:
|
|
|
|
|
found_file_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
found_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* External symbols are best. */
|
|
|
|
|
if (found_symbol)
|
|
|
|
|
return found_symbol;
|
|
|
|
|
|
|
|
|
|
/* File-local symbols are next best. */
|
|
|
|
|
if (found_file_symbol)
|
|
|
|
|
return found_file_symbol;
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
2008-05-16 14:58:49 +02:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
|
|
|
|
lookup_minimal_symbol_by_pc_name (CORE_ADDR pc, const char *name,
|
|
|
|
|
struct objfile *objf)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
|
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL;
|
|
|
|
|
objfile = objfile->next)
|
|
|
|
|
{
|
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 11:11:04 +01:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
2008-05-16 14:58:49 +02:00
|
|
|
|
{
|
|
|
|
|
for (msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
msymbol != NULL;
|
|
|
|
|
msymbol = msymbol->hash_next)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (msymbol) == pc
|
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (msymbol), name) == 0)
|
|
|
|
|
return msymbol;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct minimal_symbol *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
lookup_minimal_symbol_solib_trampoline (const char *name,
|
|
|
|
|
struct objfile *objf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *found_symbol = NULL;
|
|
|
|
|
|
2003-01-08 19:38:47 +01:00
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2007-12-18 17:02:54 +01:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 11:11:04 +01:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-01-08 19:38:47 +01:00
|
|
|
|
for (msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
msymbol != NULL && found_symbol == NULL;
|
|
|
|
|
msymbol = msymbol->hash_next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-03-10 21:40:45 +01:00
|
|
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (msymbol), name) == 0 &&
|
1999-04-16 03:35:26 +02:00
|
|
|
|
MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
|
|
|
|
|
return msymbol;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search through the minimal symbol table for each objfile and find
|
|
|
|
|
the symbol whose address is the largest address that is still less
|
2009-09-14 19:17:30 +02:00
|
|
|
|
than or equal to PC, and matches SECTION (which is not NULL).
|
|
|
|
|
Returns a pointer to the minimal symbol if such a symbol is found,
|
|
|
|
|
or NULL if PC is not in a suitable range.
|
|
|
|
|
Note that we need to look through ALL the minimal symbol tables
|
|
|
|
|
before deciding on the symbol that comes closest to the specified PC.
|
|
|
|
|
This is because objfiles can overlap, for example objfile A has .text
|
|
|
|
|
at 0x100 and .data at 0x40000 and objfile B has .text at 0x234 and
|
|
|
|
|
.data at 0x40048.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2008-05-14 20:14:34 +02:00
|
|
|
|
If WANT_TRAMPOLINE is set, prefer mst_solib_trampoline symbols when
|
|
|
|
|
there are text and trampoline symbols at the same address.
|
|
|
|
|
Otherwise prefer mst_text symbols. */
|
|
|
|
|
|
|
|
|
|
static struct minimal_symbol *
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
lookup_minimal_symbol_by_pc_section_1 (CORE_ADDR pc,
|
|
|
|
|
struct obj_section *section,
|
2008-05-14 20:14:34 +02:00
|
|
|
|
int want_trampoline)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int lo;
|
|
|
|
|
int hi;
|
|
|
|
|
int new;
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *best_symbol = NULL;
|
2008-05-14 20:14:34 +02:00
|
|
|
|
enum minimal_symbol_type want_type, other_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2008-05-14 20:14:34 +02:00
|
|
|
|
want_type = want_trampoline ? mst_solib_trampoline : mst_text;
|
|
|
|
|
other_type = want_trampoline ? mst_text : mst_solib_trampoline;
|
2009-09-14 19:17:30 +02:00
|
|
|
|
|
|
|
|
|
/* We can not require the symbol found to be in section, because
|
2007-07-02 00:39:04 +02:00
|
|
|
|
e.g. IRIX 6.5 mdebug relies on this code returning an absolute
|
|
|
|
|
symbol - but find_pc_section won't return an absolute section and
|
|
|
|
|
hence the code below would skip over absolute symbols. We can
|
|
|
|
|
still take advantage of the call to find_pc_section, though - the
|
|
|
|
|
object file still must match. In case we have separate debug
|
|
|
|
|
files, search both the file and its separate debug file. There's
|
|
|
|
|
no telling which one will have the minimal symbols. */
|
|
|
|
|
|
2009-09-14 19:17:30 +02:00
|
|
|
|
gdb_assert (section != NULL);
|
2007-07-02 00:39:04 +02:00
|
|
|
|
|
2010-01-06 11:11:04 +01:00
|
|
|
|
for (objfile = section->objfile;
|
|
|
|
|
objfile != NULL;
|
|
|
|
|
objfile = objfile_separate_debug_iterate (section->objfile, objfile))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* If this objfile has a minimal symbol table, go search it using
|
1999-07-07 22:19:36 +02:00
|
|
|
|
a binary search. Note that a minimal symbol table always consists
|
|
|
|
|
of at least two symbols, a "real" symbol and the terminating
|
|
|
|
|
"null symbol". If there are no real symbols, then there is no
|
2011-01-09 04:20:33 +01:00
|
|
|
|
minimal symbol table at all. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-02-03 21:39:41 +01:00
|
|
|
|
if (objfile->minimal_symbol_count > 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2006-07-19 04:17:23 +02:00
|
|
|
|
int best_zero_sized = -1;
|
|
|
|
|
|
2003-02-03 21:39:41 +01:00
|
|
|
|
msymbol = objfile->msymbols;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
lo = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
hi = objfile->minimal_symbol_count - 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* This code assumes that the minimal symbols are sorted by
|
|
|
|
|
ascending address values. If the pc value is greater than or
|
|
|
|
|
equal to the first symbol's address, then some symbol in this
|
|
|
|
|
minimal symbol table is a suitable candidate for being the
|
|
|
|
|
"best" symbol. This includes the last real symbol, for cases
|
|
|
|
|
where the pc value is larger than any address in this vector.
|
|
|
|
|
|
|
|
|
|
By iterating until the address associated with the current
|
|
|
|
|
hi index (the endpoint of the test interval) is less than
|
|
|
|
|
or equal to the desired pc value, we accomplish two things:
|
|
|
|
|
(1) the case where the pc value is larger than any minimal
|
|
|
|
|
symbol address is trivially solved, (2) the address associated
|
|
|
|
|
with the hi index is always the one we want when the interation
|
|
|
|
|
terminates. In essence, we are iterating the test interval
|
|
|
|
|
down until the pc value is pushed out of it from the high end.
|
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
Warning: this code is trickier than it would appear at first. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* Should also require that pc is <= end of objfile. FIXME! */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (pc >= SYMBOL_VALUE_ADDRESS (&msymbol[lo]))
|
|
|
|
|
{
|
|
|
|
|
while (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) > pc)
|
|
|
|
|
{
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* pc is still strictly less than highest address. */
|
|
|
|
|
/* Note "new" will always be >= lo. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
new = (lo + hi) / 2;
|
|
|
|
|
if ((SYMBOL_VALUE_ADDRESS (&msymbol[new]) >= pc) ||
|
|
|
|
|
(lo == new))
|
|
|
|
|
{
|
|
|
|
|
hi = new;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
lo = new;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have multiple symbols at the same address, we want
|
1999-07-07 22:19:36 +02:00
|
|
|
|
hi to point to the last one. That way we can find the
|
|
|
|
|
right symbol if it has an index greater than hi. */
|
|
|
|
|
while (hi < objfile->minimal_symbol_count - 1
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
|
1999-07-07 22:19:36 +02:00
|
|
|
|
== SYMBOL_VALUE_ADDRESS (&msymbol[hi + 1])))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
hi++;
|
|
|
|
|
|
2006-07-19 04:17:23 +02:00
|
|
|
|
/* Skip various undesirable symbols. */
|
|
|
|
|
while (hi >= 0)
|
|
|
|
|
{
|
|
|
|
|
/* Skip any absolute symbols. This is apparently
|
|
|
|
|
what adb and dbx do, and is needed for the CM-5.
|
|
|
|
|
There are two known possible problems: (1) on
|
|
|
|
|
ELF, apparently end, edata, etc. are absolute.
|
|
|
|
|
Not sure ignoring them here is a big deal, but if
|
|
|
|
|
we want to use them, the fix would go in
|
|
|
|
|
elfread.c. (2) I think shared library entry
|
|
|
|
|
points on the NeXT are absolute. If we want
|
|
|
|
|
special handling for this it probably should be
|
|
|
|
|
triggered by a special mst_abs_or_lib or some
|
|
|
|
|
such. */
|
|
|
|
|
|
2008-10-01 18:56:52 +02:00
|
|
|
|
if (MSYMBOL_TYPE (&msymbol[hi]) == mst_abs)
|
2006-07-19 04:17:23 +02:00
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If SECTION was specified, skip any symbol from
|
|
|
|
|
wrong section. */
|
|
|
|
|
if (section
|
|
|
|
|
/* Some types of debug info, such as COFF,
|
|
|
|
|
don't fill the bfd_section member, so don't
|
|
|
|
|
throw away symbols on those platforms. */
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
&& SYMBOL_OBJ_SECTION (&msymbol[hi]) != NULL
|
|
|
|
|
&& (!matching_obj_sections
|
|
|
|
|
(SYMBOL_OBJ_SECTION (&msymbol[hi]), section)))
|
2006-07-19 04:17:23 +02:00
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-14 20:14:34 +02:00
|
|
|
|
/* If we are looking for a trampoline and this is a
|
|
|
|
|
text symbol, or the other way around, check the
|
2011-07-05 06:35:00 +02:00
|
|
|
|
preceding symbol too. If they are otherwise
|
2008-05-14 20:14:34 +02:00
|
|
|
|
identical prefer that one. */
|
|
|
|
|
if (hi > 0
|
|
|
|
|
&& MSYMBOL_TYPE (&msymbol[hi]) == other_type
|
|
|
|
|
&& MSYMBOL_TYPE (&msymbol[hi - 1]) == want_type
|
|
|
|
|
&& (MSYMBOL_SIZE (&msymbol[hi])
|
|
|
|
|
== MSYMBOL_SIZE (&msymbol[hi - 1]))
|
|
|
|
|
&& (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
|
|
|
|
|
== SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1]))
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
&& (SYMBOL_OBJ_SECTION (&msymbol[hi])
|
|
|
|
|
== SYMBOL_OBJ_SECTION (&msymbol[hi - 1])))
|
2008-05-14 20:14:34 +02:00
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-19 04:17:23 +02:00
|
|
|
|
/* If the minimal symbol has a zero size, save it
|
|
|
|
|
but keep scanning backwards looking for one with
|
|
|
|
|
a non-zero size. A zero size may mean that the
|
|
|
|
|
symbol isn't an object or function (e.g. a
|
|
|
|
|
label), or it may just mean that the size was not
|
|
|
|
|
specified. */
|
|
|
|
|
if (MSYMBOL_SIZE (&msymbol[hi]) == 0
|
|
|
|
|
&& best_zero_sized == -1)
|
|
|
|
|
{
|
|
|
|
|
best_zero_sized = hi;
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-09 23:14:35 +01:00
|
|
|
|
/* If we are past the end of the current symbol, try
|
|
|
|
|
the previous symbol if it has a larger overlapping
|
|
|
|
|
size. This happens on i686-pc-linux-gnu with glibc;
|
|
|
|
|
the nocancel variants of system calls are inside
|
|
|
|
|
the cancellable variants, but both have sizes. */
|
|
|
|
|
if (hi > 0
|
|
|
|
|
&& MSYMBOL_SIZE (&msymbol[hi]) != 0
|
|
|
|
|
&& pc >= (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
|
|
|
|
|
+ MSYMBOL_SIZE (&msymbol[hi]))
|
|
|
|
|
&& pc < (SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1])
|
|
|
|
|
+ MSYMBOL_SIZE (&msymbol[hi - 1])))
|
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-19 04:17:23 +02:00
|
|
|
|
/* Otherwise, this symbol must be as good as we're going
|
|
|
|
|
to get. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If HI has a zero size, and best_zero_sized is set,
|
|
|
|
|
then we had two or more zero-sized symbols; prefer
|
|
|
|
|
the first one we found (which may have a higher
|
|
|
|
|
address). Also, if we ran off the end, be sure
|
|
|
|
|
to back up. */
|
|
|
|
|
if (best_zero_sized != -1
|
|
|
|
|
&& (hi < 0 || MSYMBOL_SIZE (&msymbol[hi]) == 0))
|
|
|
|
|
hi = best_zero_sized;
|
|
|
|
|
|
|
|
|
|
/* If the minimal symbol has a non-zero size, and this
|
|
|
|
|
PC appears to be outside the symbol's contents, then
|
|
|
|
|
refuse to use this symbol. If we found a zero-sized
|
|
|
|
|
symbol with an address greater than this symbol's,
|
|
|
|
|
use that instead. We assume that if symbols have
|
|
|
|
|
specified sizes, they do not overlap. */
|
|
|
|
|
|
|
|
|
|
if (hi >= 0
|
|
|
|
|
&& MSYMBOL_SIZE (&msymbol[hi]) != 0
|
|
|
|
|
&& pc >= (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
|
|
|
|
|
+ MSYMBOL_SIZE (&msymbol[hi])))
|
|
|
|
|
{
|
|
|
|
|
if (best_zero_sized != -1)
|
|
|
|
|
hi = best_zero_sized;
|
|
|
|
|
else
|
|
|
|
|
/* Go on to the next object file. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* The minimal symbol indexed by hi now is the best one in this
|
1999-07-07 22:19:36 +02:00
|
|
|
|
objfile's minimal symbol table. See if it is the best one
|
2011-01-09 04:20:33 +01:00
|
|
|
|
overall. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (hi >= 0
|
|
|
|
|
&& ((best_symbol == NULL) ||
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(SYMBOL_VALUE_ADDRESS (best_symbol) <
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE_ADDRESS (&msymbol[hi]))))
|
|
|
|
|
{
|
|
|
|
|
best_symbol = &msymbol[hi];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (best_symbol);
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-14 20:14:34 +02:00
|
|
|
|
struct minimal_symbol *
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, struct obj_section *section)
|
2008-05-14 20:14:34 +02:00
|
|
|
|
{
|
2009-09-14 19:17:30 +02:00
|
|
|
|
if (section == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* NOTE: cagney/2004-01-27: This was using find_pc_mapped_section to
|
|
|
|
|
force the section but that (well unless you're doing overlay
|
|
|
|
|
debugging) always returns NULL making the call somewhat useless. */
|
|
|
|
|
section = find_pc_section (pc);
|
|
|
|
|
if (section == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2008-05-14 20:14:34 +02:00
|
|
|
|
return lookup_minimal_symbol_by_pc_section_1 (pc, section, 0);
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
lookup_minimal_symbol_by_pc (CORE_ADDR pc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2009-09-14 19:17:30 +02:00
|
|
|
|
return lookup_minimal_symbol_by_pc_section (pc, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2010-01-21 18:12:18 +01:00
|
|
|
|
|
2011-03-28 22:21:04 +02:00
|
|
|
|
/* Return non-zero iff PC is in an STT_GNU_IFUNC function resolver. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
in_gnu_ifunc_stub (CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (pc);
|
|
|
|
|
|
|
|
|
|
return msymbol && MSYMBOL_TYPE (msymbol) == mst_text_gnu_ifunc;
|
|
|
|
|
}
|
|
|
|
|
|
gdb/
STT_GNU_IFUNC reader implementation.
* elfread.c: Include gdbtypes.h, value.h and infcall.h.
(SYMBOL_GOT_PLT_SUFFIX, elf_rel_plt_read)
(elf_objfile_gnu_ifunc_cache_data, struct elf_gnu_ifunc_cache)
(elf_gnu_ifunc_cache_hash, elf_gnu_ifunc_cache_eq)
(elf_gnu_ifunc_record_cache, elf_gnu_ifunc_resolve_by_cache)
(elf_gnu_ifunc_resolve_by_got, elf_gnu_ifunc_resolve_name)
(elf_gnu_ifunc_resolve_addr): New.
(elf_symfile_read): Call elf_rel_plt_read.
(elf_gnu_ifunc_fns): New.
(_initialize_elfread): Initialize elf_objfile_gnu_ifunc_cache_data.
Install elf_gnu_ifunc_fns.
* infcall.c (find_function_return_type): New function.
(find_function_addr): Resolve TYPE_GNU_IFUNC functions, if possible.
* minsyms.c (stub_gnu_ifunc_resolve_addr)
(stub_gnu_ifunc_resolve_name): New functions.
(stub_gnu_ifunc_fns, gnu_ifunc_fns_p): New variables.
* symtab.h (struct gnu_ifunc_fns, gnu_ifunc_resolve_addr)
(gnu_ifunc_resolve_name, gnu_ifunc_fns_p): New.
2011-03-28 22:26:24 +02:00
|
|
|
|
/* See elf_gnu_ifunc_resolve_addr for its real implementation. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
stub_gnu_ifunc_resolve_addr (struct gdbarch *gdbarch, CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
error (_("GDB cannot resolve STT_GNU_IFUNC symbol at address %s without "
|
|
|
|
|
"the ELF support compiled in."),
|
|
|
|
|
paddress (gdbarch, pc));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See elf_gnu_ifunc_resolve_name for its real implementation. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
stub_gnu_ifunc_resolve_name (const char *function_name,
|
|
|
|
|
CORE_ADDR *function_address_p)
|
|
|
|
|
{
|
|
|
|
|
error (_("GDB cannot resolve STT_GNU_IFUNC symbol \"%s\" without "
|
|
|
|
|
"the ELF support compiled in."),
|
|
|
|
|
function_name);
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-28 22:29:51 +02:00
|
|
|
|
/* See elf_gnu_ifunc_resolver_stop for its real implementation. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
stub_gnu_ifunc_resolver_stop (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
_("elf_gnu_ifunc_resolver_stop cannot be reached."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See elf_gnu_ifunc_resolver_return_stop for its real implementation. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
stub_gnu_ifunc_resolver_return_stop (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
_("elf_gnu_ifunc_resolver_return_stop cannot be reached."));
|
|
|
|
|
}
|
|
|
|
|
|
gdb/
STT_GNU_IFUNC reader implementation.
* elfread.c: Include gdbtypes.h, value.h and infcall.h.
(SYMBOL_GOT_PLT_SUFFIX, elf_rel_plt_read)
(elf_objfile_gnu_ifunc_cache_data, struct elf_gnu_ifunc_cache)
(elf_gnu_ifunc_cache_hash, elf_gnu_ifunc_cache_eq)
(elf_gnu_ifunc_record_cache, elf_gnu_ifunc_resolve_by_cache)
(elf_gnu_ifunc_resolve_by_got, elf_gnu_ifunc_resolve_name)
(elf_gnu_ifunc_resolve_addr): New.
(elf_symfile_read): Call elf_rel_plt_read.
(elf_gnu_ifunc_fns): New.
(_initialize_elfread): Initialize elf_objfile_gnu_ifunc_cache_data.
Install elf_gnu_ifunc_fns.
* infcall.c (find_function_return_type): New function.
(find_function_addr): Resolve TYPE_GNU_IFUNC functions, if possible.
* minsyms.c (stub_gnu_ifunc_resolve_addr)
(stub_gnu_ifunc_resolve_name): New functions.
(stub_gnu_ifunc_fns, gnu_ifunc_fns_p): New variables.
* symtab.h (struct gnu_ifunc_fns, gnu_ifunc_resolve_addr)
(gnu_ifunc_resolve_name, gnu_ifunc_fns_p): New.
2011-03-28 22:26:24 +02:00
|
|
|
|
/* See elf_gnu_ifunc_fns for its real implementation. */
|
|
|
|
|
|
|
|
|
|
static const struct gnu_ifunc_fns stub_gnu_ifunc_fns =
|
|
|
|
|
{
|
|
|
|
|
stub_gnu_ifunc_resolve_addr,
|
|
|
|
|
stub_gnu_ifunc_resolve_name,
|
2011-03-28 22:29:51 +02:00
|
|
|
|
stub_gnu_ifunc_resolver_stop,
|
|
|
|
|
stub_gnu_ifunc_resolver_return_stop,
|
gdb/
STT_GNU_IFUNC reader implementation.
* elfread.c: Include gdbtypes.h, value.h and infcall.h.
(SYMBOL_GOT_PLT_SUFFIX, elf_rel_plt_read)
(elf_objfile_gnu_ifunc_cache_data, struct elf_gnu_ifunc_cache)
(elf_gnu_ifunc_cache_hash, elf_gnu_ifunc_cache_eq)
(elf_gnu_ifunc_record_cache, elf_gnu_ifunc_resolve_by_cache)
(elf_gnu_ifunc_resolve_by_got, elf_gnu_ifunc_resolve_name)
(elf_gnu_ifunc_resolve_addr): New.
(elf_symfile_read): Call elf_rel_plt_read.
(elf_gnu_ifunc_fns): New.
(_initialize_elfread): Initialize elf_objfile_gnu_ifunc_cache_data.
Install elf_gnu_ifunc_fns.
* infcall.c (find_function_return_type): New function.
(find_function_addr): Resolve TYPE_GNU_IFUNC functions, if possible.
* minsyms.c (stub_gnu_ifunc_resolve_addr)
(stub_gnu_ifunc_resolve_name): New functions.
(stub_gnu_ifunc_fns, gnu_ifunc_fns_p): New variables.
* symtab.h (struct gnu_ifunc_fns, gnu_ifunc_resolve_addr)
(gnu_ifunc_resolve_name, gnu_ifunc_fns_p): New.
2011-03-28 22:26:24 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A placeholder for &elf_gnu_ifunc_fns. */
|
|
|
|
|
|
|
|
|
|
const struct gnu_ifunc_fns *gnu_ifunc_fns_p = &stub_gnu_ifunc_fns;
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
2010-01-21 18:12:18 +01:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
|
|
|
|
lookup_minimal_symbol_and_objfile (const char *name,
|
|
|
|
|
struct objfile **objfile_p)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
|
|
|
|
ALL_OBJFILES (objfile)
|
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *msym;
|
|
|
|
|
|
|
|
|
|
for (msym = objfile->msymbol_hash[hash];
|
|
|
|
|
msym != NULL;
|
|
|
|
|
msym = msym->hash_next)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (msym), name) == 0)
|
|
|
|
|
{
|
|
|
|
|
*objfile_p = objfile;
|
|
|
|
|
return msym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* Return leading symbol character for a BFD. If BFD is NULL,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return the leading symbol character from the main objfile. */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int get_symbol_leading_char (bfd *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
get_symbol_leading_char (bfd *abfd)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (abfd != NULL)
|
|
|
|
|
return bfd_get_symbol_leading_char (abfd);
|
|
|
|
|
if (symfile_objfile != NULL && symfile_objfile->obfd != NULL)
|
|
|
|
|
return bfd_get_symbol_leading_char (symfile_objfile->obfd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
init_minimal_symbol_collection (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
msym_count = 0;
|
|
|
|
|
msym_bunch = NULL;
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* Note that presetting msym_bunch_index to BUNCH_SIZE causes the
|
|
|
|
|
first call to save a minimal symbol to allocate the memory for
|
|
|
|
|
the first bunch. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch_index = BUNCH_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
prim_record_minimal_symbol (const char *name, CORE_ADDR address,
|
|
|
|
|
enum minimal_symbol_type ms_type,
|
|
|
|
|
struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int section;
|
|
|
|
|
|
|
|
|
|
switch (ms_type)
|
|
|
|
|
{
|
|
|
|
|
case mst_text:
|
2011-03-28 22:21:04 +02:00
|
|
|
|
case mst_text_gnu_ifunc:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case mst_file_text:
|
|
|
|
|
case mst_solib_trampoline:
|
Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* objfiles.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Define as functions of OBJFILE. Add
sect_index_text, sect_index_data, sect_index_rodata,
sect_index_bss to objfile structure.
* gdb-stabs.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Remove.
* objfiles.c (allocate_objfile): Initialize
sect_index_{text,data,bss,rodata} to -1, for error detection.
* symfile.c (default_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata} from bfd information.
* xcoffread.c (xcoff_symfile_offsets): Ditto.
* somread.c (som_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata}.
* coffread.c, dbxread.c, elfread.c, hp-psymtab-read.c,
hp-symtab-read.c, hpread.c, mdebugread.c, minsyms.c,
mipsread.c, objfiles.c, os9kread.c, pa64solib.c, partial-stab.h,
remote-os9k.c, remote-vx.c, remote.c, rs6000-nat.c, somsolib.c,
stabsread.c, symfile.c, xcoffread.c:
Update use of SECT_OFF_{TEXT,DATA,BSS,RODATA} to depend on the
current objfile.
* xcoffread.c: Add new field objfile to find_targ_sec_arg.
2000-05-04 18:52:34 +02:00
|
|
|
|
section = SECT_OFF_TEXT (objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case mst_data:
|
|
|
|
|
case mst_file_data:
|
Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* objfiles.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Define as functions of OBJFILE. Add
sect_index_text, sect_index_data, sect_index_rodata,
sect_index_bss to objfile structure.
* gdb-stabs.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Remove.
* objfiles.c (allocate_objfile): Initialize
sect_index_{text,data,bss,rodata} to -1, for error detection.
* symfile.c (default_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata} from bfd information.
* xcoffread.c (xcoff_symfile_offsets): Ditto.
* somread.c (som_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata}.
* coffread.c, dbxread.c, elfread.c, hp-psymtab-read.c,
hp-symtab-read.c, hpread.c, mdebugread.c, minsyms.c,
mipsread.c, objfiles.c, os9kread.c, pa64solib.c, partial-stab.h,
remote-os9k.c, remote-vx.c, remote.c, rs6000-nat.c, somsolib.c,
stabsread.c, symfile.c, xcoffread.c:
Update use of SECT_OFF_{TEXT,DATA,BSS,RODATA} to depend on the
current objfile.
* xcoffread.c: Add new field objfile to find_targ_sec_arg.
2000-05-04 18:52:34 +02:00
|
|
|
|
section = SECT_OFF_DATA (objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case mst_bss:
|
|
|
|
|
case mst_file_bss:
|
Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* objfiles.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Define as functions of OBJFILE. Add
sect_index_text, sect_index_data, sect_index_rodata,
sect_index_bss to objfile structure.
* gdb-stabs.h (SECT_OFF_DATA, SECT_OFF_TEXT, SECT_OFF_BSS,
SECT_OFF_RODATA): Remove.
* objfiles.c (allocate_objfile): Initialize
sect_index_{text,data,bss,rodata} to -1, for error detection.
* symfile.c (default_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata} from bfd information.
* xcoffread.c (xcoff_symfile_offsets): Ditto.
* somread.c (som_symfile_offsets): Initialize
sect_index_{text,data,bss,rodata}.
* coffread.c, dbxread.c, elfread.c, hp-psymtab-read.c,
hp-symtab-read.c, hpread.c, mdebugread.c, minsyms.c,
mipsread.c, objfiles.c, os9kread.c, pa64solib.c, partial-stab.h,
remote-os9k.c, remote-vx.c, remote.c, rs6000-nat.c, somsolib.c,
stabsread.c, symfile.c, xcoffread.c:
Update use of SECT_OFF_{TEXT,DATA,BSS,RODATA} to depend on the
current objfile.
* xcoffread.c: Add new field objfile to find_targ_sec_arg.
2000-05-04 18:52:34 +02:00
|
|
|
|
section = SECT_OFF_BSS (objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
section = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prim_record_minimal_symbol_and_info (name, address, ms_type,
|
2008-10-01 18:41:27 +02:00
|
|
|
|
section, NULL, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2009-11-16 19:40:23 +01:00
|
|
|
|
prim_record_minimal_symbol_full (const char *name, int name_len, int copy_name,
|
|
|
|
|
CORE_ADDR address,
|
|
|
|
|
enum minimal_symbol_type ms_type,
|
|
|
|
|
int section,
|
|
|
|
|
asection *bfd_section,
|
|
|
|
|
struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
struct obj_section *obj_section;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct msym_bunch *new;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-29 13:26:04 +02:00
|
|
|
|
/* Don't put gcc_compiled, __gnu_compiled_cplus, and friends into
|
|
|
|
|
the minimal symbols, because if there is also another symbol
|
|
|
|
|
at the same address (e.g. the first function of the file),
|
|
|
|
|
lookup_minimal_symbol_by_pc would have no way of getting the
|
|
|
|
|
right one. */
|
|
|
|
|
if (ms_type == mst_file_text && name[0] == 'g'
|
|
|
|
|
&& (strcmp (name, GCC_COMPILED_FLAG_SYMBOL) == 0
|
|
|
|
|
|| strcmp (name, GCC2_COMPILED_FLAG_SYMBOL) == 0))
|
|
|
|
|
return (NULL);
|
|
|
|
|
|
|
|
|
|
/* It's safe to strip the leading char here once, since the name
|
2011-01-09 04:20:33 +01:00
|
|
|
|
is also stored stripped in the minimal symbol table. */
|
2004-03-29 13:26:04 +02:00
|
|
|
|
if (name[0] == get_symbol_leading_char (objfile->obfd))
|
2009-11-16 19:40:23 +01:00
|
|
|
|
{
|
|
|
|
|
++name;
|
|
|
|
|
--name_len;
|
|
|
|
|
}
|
2004-03-29 13:26:04 +02:00
|
|
|
|
|
|
|
|
|
if (ms_type == mst_file_text && strncmp (name, "__gnu_compiled", 14) == 0)
|
|
|
|
|
return (NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (msym_bunch_index == BUNCH_SIZE)
|
|
|
|
|
{
|
gdb/
* NEWS: Document inlined function support.
* Makefile.in (SFILES): Add inline-frame.c.
(COMMON_OBS): Add inline-frame.o.
* block.c (contained_in): Rewrite to use lexical nesting.
(block_linkage_function): Skip inlined function blocks.
(block_inlined_p): New.
* block.h (struct block): Update comment.
(block_inlined_p): New prototype.
* blockframe.c (get_frame_block): Handle inlined functions.
(get_frame_function): Do not use block_linkage_function.
(block_innermost_frame): Use get_frame_block and contained_in.
* breakpoint.c (watchpoint_check): Remove extra reinit_frame_cache.
Skip over inlined functions. Simplify epilogue check.
(bpstat_check_breakpoint_conditions): Use get_stack_frame_id.
Update comments.
(set_momentary_breakpoint): Only accept non-inlined frames.
(watch_command_1): Use frame_unwind_caller_pc and
frame_unwind_caller_id instead of get_prev_frame.
(until_break_command): Likewise. Use get_stack_frame_id.
* buildsym.c (end_symtab): Set SYMBOL_SYMTAB for block functions.
* dwarf2loc.c (dwarf_expr_frame_base): Use block_linkage_function.
* dwarf2read.c (process_die): Handle DW_TAG_inlined_subroutine.
(read_func_scope, new_symbol): Likewise. Handle arguments specially
for inlined functions without call site information.
(inherit_abstract_dies): Allow tag mismatch for inlined subroutines.
(die_specification): Treat DW_AT_abstract_origin as a specification.
(read_type_die): Handle DW_TAG_inlined_subroutine.
* frame-unwind.c (frame_unwind_init): Add inline_frame_unwind.
* frame.c (fprint_frame_id): Print inline depth.
(fprint_frame_type): Handle INLINE_FRAME and SENTINEL_FRAME.
(skip_inlined_frames, get_stack_frame_id): New.
(frame_unwind_caller_id): Use skip_inlined_frames.
(frame_id_inlined_p): New.
(frame_id_eq): Make the logic match the comments. Add inline_depth
check.
(frame_id_inner): Handle inlined functions.
(frame_unwind_pc): New function, copied from frame_unwind_caller_pc.
(frame_unwind_caller_pc): Use skip_inlined_frames and frame_unwind_pc.
(get_prev_frame_1): Check for inline frames. Split out frame
allocation to get_prev_frame_raw.
(get_prev_frame_raw): New function.
(get_prev_frame): Handle inline frames.
(get_frame_pc): Use frame_unwind_pc.
(get_frame_address_in_block): Skip inlined frames on both sides.
(pc_notcurrent): Delete.
(find_frame_sal): Rewrite to handle inline call sites. Use
get_frame_address_in_block.
(deprecated_update_frame_pc_hack): Make static.
* frame.h: Update comments.
(struct frame_id): Add inline_depth.
(enum frame_type): Add INLINE_FRAME.
(frame_id_inlined_p, get_stack_frame_id): New prototypes.
* gdbthread.h (struct thread_info): Add step_stack_frame_id field.
* infcmd.c (set_step_frame): New function.
(step_once): Use set_step_frame. Handle inlined functions.
(until_next_command): Use set_step_frame.
(finish_backward), finish_forward): Use get_stack_frame_id.
(finish_command): Support inlined functions.
* inferior.h (set_step_info): New prototype.
* infrun.c (RESUME_ALL): Use minus_one_ptid.
(clear_proceed_status): Clear step_stack_frame_id.
(init_wait_for_inferior): Call clear_inline_frame_state.
(init_execution_control_state): Make static.
(set_step_info): New function.
(init_thread_stepping_state): Do not set the symtab or line here.
(stepped_in_from): New function.
(handle_inferior_event): Handle inlined functions. Use set_step_info.
(insert_step_resume_breakpoint_at_frame): Use get_stack_frame_id.
(struct inferior_status): Add step_stack_frame_id.
(save_inferior_status, restore_inferior_status): Save and restore
step_stack_frame_id.
* inline-frame.c, inline-frame.h: New files.
* minsyms.c (prim_record_minimal_symbol_and_info): Use XCALLOC.
* regcache.c (regcache_write_pc): Call reinit_frame_cache.
* s390-tdep.c (s390_prologue_frame_unwind_cache): Handle INLINE_FRAME.
* stack.c (frame_show_address): New.
(print_frame_info, print_frame): Use it.
(find_frame_funname): Use get_frame_function. Handle inlined blocks.
(frame_info): Mark inlined functions.
(backtrace_command_1): Use get_current_user_frame.
(print_frame_local_vars, print_frame_label_vars): Update comments.
(return_command): Refuse inlined functions.
* symtab.c (lookup_symbol_aux_local): Stop at inlined function
boundaries.
(find_function_start_sal): Avoid inlined functions.
(completion_list_add_fields): New function.
(default_make_symbol_completion_list): Use it. Use block_static_block
and block_global_block. Check for inlined functions.
(skip_prologue_using_sal): Avoid line number comparison across
inlining.
* symtab.h (struct symbol): Add is_inlined.
(SYMBOL_INLINED): New.
* target.c (target_resume): Call clear_inline_frame_state.
* valops.c (value_of_variable): Check block_inlined_p.
gdb/doc/
* gdb.texinfo (Debugging Optimized Code): New chapter.
(Compiling for Debugging): Reference it. Move some
text to the new section.
gdb/testsuite/
* gdb.base/break.exp: Add an XFAIL for gcc/36748.
* gdb.cp/annota2.exp: Accept frames-invalid in more places.
* gdb.opt/Makefile.in (EXECUTABLES): Update.
* gdb.opt/clobbered-registers-O2.exp: Update to GPL v3.
* gdb.opt/inline-bt.c, gdb.opt/inline-bt.exp,
gdb.opt/inline-cmds.c, gdb.opt/inline-cmds.exp,
gdb.opt/inline-locals.c, gdb.opt/inline-locals.exp,
gdb.opt/inline-markers.c: New files.
* lib/gdb.exp (skip_inline_frame_tests): New function.
(skip_inline_var_tests): New function.
2009-06-28 02:20:24 +02:00
|
|
|
|
new = XCALLOC (1, struct msym_bunch);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch_index = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
new->next = msym_bunch;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch = new;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
msymbol = &msym_bunch->contents[msym_bunch_index];
|
2010-08-09 21:42:48 +02:00
|
|
|
|
SYMBOL_SET_LANGUAGE (msymbol, language_auto);
|
2009-11-16 19:40:23 +01:00
|
|
|
|
SYMBOL_SET_NAMES (msymbol, name, name_len, copy_name, objfile);
|
2003-02-04 19:07:01 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE_ADDRESS (msymbol) = address;
|
|
|
|
|
SYMBOL_SECTION (msymbol) = section;
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
SYMBOL_OBJ_SECTION (msymbol) = NULL;
|
|
|
|
|
|
|
|
|
|
/* Find obj_section corresponding to bfd_section. */
|
|
|
|
|
if (bfd_section)
|
|
|
|
|
ALL_OBJFILE_OSECTIONS (objfile, obj_section)
|
|
|
|
|
{
|
|
|
|
|
if (obj_section->the_bfd_section == bfd_section)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_OBJ_SECTION (msymbol) = obj_section;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
MSYMBOL_TYPE (msymbol) = ms_type;
|
2008-10-01 18:41:27 +02:00
|
|
|
|
MSYMBOL_TARGET_FLAG_1 (msymbol) = 0;
|
|
|
|
|
MSYMBOL_TARGET_FLAG_2 (msymbol) = 0;
|
2003-11-11 21:04:52 +01:00
|
|
|
|
MSYMBOL_SIZE (msymbol) = 0;
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
2000-03-09 23:58:49 +01:00
|
|
|
|
/* The hash pointers must be cleared! If they're not,
|
2011-01-09 04:20:33 +01:00
|
|
|
|
add_minsym_to_hash_table will NOT add this msymbol to the hash table. */
|
2000-03-07 05:33:52 +01:00
|
|
|
|
msymbol->hash_next = NULL;
|
|
|
|
|
msymbol->demangled_hash_next = NULL;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch_index++;
|
|
|
|
|
msym_count++;
|
|
|
|
|
OBJSTAT (objfile, n_minsyms++);
|
|
|
|
|
return msymbol;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
2009-11-16 19:40:23 +01:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
|
|
|
|
prim_record_minimal_symbol_and_info (const char *name, CORE_ADDR address,
|
|
|
|
|
enum minimal_symbol_type ms_type,
|
|
|
|
|
int section,
|
|
|
|
|
asection *bfd_section,
|
|
|
|
|
struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
return prim_record_minimal_symbol_full (name, strlen (name), 1,
|
|
|
|
|
address, ms_type, section,
|
|
|
|
|
bfd_section, objfile);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Compare two minimal symbols by address and return a signed result based
|
2011-01-09 04:20:33 +01:00
|
|
|
|
on unsigned comparisons, so that we sort into unsigned numeric order.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Within groups with the same address, sort by name. */
|
|
|
|
|
|
|
|
|
|
static int
|
2002-03-19 20:00:04 +01:00
|
|
|
|
compare_minimal_symbols (const void *fn1p, const void *fn2p)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
const struct minimal_symbol *fn1;
|
|
|
|
|
const struct minimal_symbol *fn2;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
fn1 = (const struct minimal_symbol *) fn1p;
|
|
|
|
|
fn2 = (const struct minimal_symbol *) fn2p;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (fn1) < SYMBOL_VALUE_ADDRESS (fn2))
|
|
|
|
|
{
|
2011-01-09 04:20:33 +01:00
|
|
|
|
return (-1); /* addr 1 is less than addr 2. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else if (SYMBOL_VALUE_ADDRESS (fn1) > SYMBOL_VALUE_ADDRESS (fn2))
|
|
|
|
|
{
|
2011-01-09 04:20:33 +01:00
|
|
|
|
return (1); /* addr 1 is greater than addr 2. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
else
|
|
|
|
|
/* addrs are equal: sort by name */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* gdbtypes.h (struct main_type): Change type of name,tag_name,
and fields.name members from char * to const char *. All uses updated.
(struct cplus_struct_type): Change type of fn_fieldlists.name member
from char * to const char *. All uses updated.
(type_name_no_tag): Update.
(lookup_unsigned_typename, lookup_signed_typename): Update.
* gdbtypes.c (type_name_no_tag): Change result type
from char * to const char *. All callers updated.
(lookup_unsigned_typename, lookup_signed_typename): Change type of
name parameter from char * to const char *.
* symtab.h (struct cplus_specific): Change type of demangled_name
member from char * to const char *. All uses updated.
(struct general_symbol_info): Change type of name and
mangled_lang.demangled_name members from char * to const char *.
All uses updated.
(symbol_get_demangled_name, symbol_natural_name): Update.
(symbol_demangled_name, symbol_search_name): Update.
* symtab.c (symbol_get_demangled_name): Change result type
from char * to const char *. All callers updated.
(symbol_natural_name, symbol_demangled_name): Ditto.
(symbol_search_name): Ditto.
(completion_list_add_name): Change type of symname,sym_text,
text,word parameters from char * to const char *.
(completion_list_objc_symbol): Change type of sym_text,
text,word parameters from char * to const char *.
* ada-lang.c (find_struct_field): Change type of name parameter
from char * to const char *.
(encoded_ordered_before): Similarly for N0,N1 parameters.
(old_renaming_is_invisible): Similarly for function_name parameter.
(ada_type_name): Change result type from char * to const char *.
All callers updated.
* ada-lang.h (ada_type_name): Update.
* buildsym.c (hashname): Change type of name parameter
from char * to const char *.
* buildsym.h (hashname): Update.
* dbxread.c (end_psymtab): Change type of include_list parameter
from char ** to const char **.
* dwarf2read.c (determine_prefix): Change result type
from char * to const char *. All callers updated.
* f-lang.c (find_common_for_function): Change type of name, funcname
parameters from char * to const char *.
* f-lang.c (find_common_for_function): Update.
* f-valprint.c (list_all_visible_commons): Change type of funcname
parameters from char * to const char *.
* gdbarch.sh (static_transform_name): Change type of name parameter
and result from char * to const char *.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* i386-sol2-tdep.c (i386_sol2_static_transform_name): Change type
of name parameter from char * to const char *.
* jv-lang.c (java_primitive_type_from_name): Ditto.
(java_demangled_signature_length): Similarly for signature parameter.
(java_demangled_signature_copy): Ditto.
(java_demangle_type_signature): Ditto.
* jv-lang.h (java_primitive_type_from_name): Update.
(java_demangle_type_signature): Update.
* objc-lang.c (specialcmp): Change type of a,b parameters
from char * to const char *.
* p-lang.c (is_pascal_string_type): Change type of arrayname parameter
from char * to const char *. All callers updated.
* p-lang.h (is_pascal_string_type): Update.
* solib-frv.c (find_canonical_descriptor_in_load_object): Change type
of name parameter from char * to const char *.
* sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* defs.h (fprintf_symbol_filtered): Update.
* sparc-tdep.h (sparc_sol2_static_transform_name): Update.
* stabsread.h (end_psymtab): Update.
* stack.c (find_frame_funname): Change type of funname parameter
from char ** to const char **.
* stack.h (find_frame_funname): Update.
* typeprint.c (type_print): Change type of varstring parameter
from char * to const char *.
* value.h (type_print): Update.
* xcoffread.c (xcoff_start_psymtab): Change type of filename parameter
from char * to const char *. All callers updated.
(xcoff_end_psymtab): Change type of include_list parameter
from char ** to const char **. All callers updated.
(swap_sym): Similarly for name parameter. All callers updated.
* coffread.c (patch_type): Add (char*) cast to xfree parameter.
Use xstrdup.
(process_coff_symbol): Use xstrdup.
* stabsread.c (stabs_method_name_from_physname): Renamed from
update_method_name_from_physname. Change result type from void
to char *. All callers updated.
(read_member_functions): In has_destructor case, store name in objfile
obstack instead of malloc space. In !has_stub case, fix mem leak.
2012-02-07 05:48:23 +01:00
|
|
|
|
const char *name1 = SYMBOL_LINKAGE_NAME (fn1);
|
|
|
|
|
const char *name2 = SYMBOL_LINKAGE_NAME (fn2);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (name1 && name2) /* both have names */
|
|
|
|
|
return strcmp (name1, name2);
|
|
|
|
|
else if (name2)
|
2011-01-09 04:20:33 +01:00
|
|
|
|
return 1; /* fn1 has no name, so it is "less". */
|
|
|
|
|
else if (name1) /* fn2 has no name, so it is "less". */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return -1;
|
|
|
|
|
else
|
2011-01-09 04:20:33 +01:00
|
|
|
|
return (0); /* Neither has a name, so they're equal. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Discard the currently collected minimal symbols, if any. If we wish
|
|
|
|
|
to save them for later use, we must have already copied them somewhere
|
|
|
|
|
else before calling this function.
|
|
|
|
|
|
|
|
|
|
FIXME: We could allocate the minimal symbol bunches on their own
|
|
|
|
|
obstack and then simply blow the obstack away when we are done with
|
2011-01-09 04:20:33 +01:00
|
|
|
|
it. Is it worth the extra trouble though? */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-16 06:07:39 +02:00
|
|
|
|
static void
|
|
|
|
|
do_discard_minimal_symbols_cleanup (void *arg)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct msym_bunch *next;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
while (msym_bunch != NULL)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
next = msym_bunch->next;
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (msym_bunch);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch = next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
|
|
|
|
|
2000-05-16 06:07:39 +02:00
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_discard_minimal_symbols (void)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_discard_minimal_symbols_cleanup, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-03-07 05:33:52 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Compact duplicate entries out of a minimal symbol table by walking
|
|
|
|
|
through the table and compacting out entries with duplicate addresses
|
|
|
|
|
and matching names. Return the number of entries remaining.
|
|
|
|
|
|
|
|
|
|
On entry, the table resides between msymbol[0] and msymbol[mcount].
|
|
|
|
|
On exit, it resides between msymbol[0] and msymbol[result_count].
|
|
|
|
|
|
|
|
|
|
When files contain multiple sources of symbol information, it is
|
|
|
|
|
possible for the minimal symbol table to contain many duplicate entries.
|
|
|
|
|
As an example, SVR4 systems use ELF formatted object files, which
|
|
|
|
|
usually contain at least two different types of symbol tables (a
|
|
|
|
|
standard ELF one and a smaller dynamic linking table), as well as
|
|
|
|
|
DWARF debugging information for files compiled with -g.
|
|
|
|
|
|
|
|
|
|
Without compacting, the minimal symbol table for gdb itself contains
|
|
|
|
|
over a 1000 duplicates, about a third of the total table size. Aside
|
|
|
|
|
from the potential trap of not noticing that two successive entries
|
|
|
|
|
identify the same location, this duplication impacts the time required
|
|
|
|
|
to linearly scan the table, which is done in a number of places. So we
|
|
|
|
|
just do one linear scan here and toss out the duplicates.
|
|
|
|
|
|
|
|
|
|
Note that we are not concerned here about recovering the space that
|
|
|
|
|
is potentially freed up, because the strings themselves are allocated
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
on the objfile_obstack, and will get automatically freed when the symbol
|
1999-04-16 03:35:26 +02:00
|
|
|
|
table is freed. The caller can free up the unused minimal symbols at
|
|
|
|
|
the end of the compacted region if their allocation strategy allows it.
|
|
|
|
|
|
|
|
|
|
Also note we only go up to the next to last entry within the loop
|
|
|
|
|
and then copy the last entry explicitly after the loop terminates.
|
|
|
|
|
|
|
|
|
|
Since the different sources of information for each symbol may
|
|
|
|
|
have different levels of "completeness", we may have duplicates
|
|
|
|
|
that have one entry with type "mst_unknown" and the other with a
|
|
|
|
|
known type. So if the one we are leaving alone has type mst_unknown,
|
|
|
|
|
overwrite its type with the type from the one we are compacting out. */
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
compact_minimal_symbols (struct minimal_symbol *msymbol, int mcount,
|
|
|
|
|
struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *copyfrom;
|
|
|
|
|
struct minimal_symbol *copyto;
|
|
|
|
|
|
|
|
|
|
if (mcount > 0)
|
|
|
|
|
{
|
|
|
|
|
copyfrom = copyto = msymbol;
|
|
|
|
|
while (copyfrom < msymbol + mcount - 1)
|
|
|
|
|
{
|
2003-11-08 01:13:03 +01:00
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (copyfrom)
|
|
|
|
|
== SYMBOL_VALUE_ADDRESS ((copyfrom + 1))
|
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (copyfrom),
|
|
|
|
|
SYMBOL_LINKAGE_NAME ((copyfrom + 1))) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (MSYMBOL_TYPE ((copyfrom + 1)) == mst_unknown)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
MSYMBOL_TYPE ((copyfrom + 1)) = MSYMBOL_TYPE (copyfrom);
|
|
|
|
|
}
|
|
|
|
|
copyfrom++;
|
|
|
|
|
}
|
|
|
|
|
else
|
2000-08-04 20:41:05 +02:00
|
|
|
|
*copyto++ = *copyfrom++;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
*copyto++ = *copyfrom++;
|
|
|
|
|
mcount = copyto - msymbol;
|
|
|
|
|
}
|
|
|
|
|
return (mcount);
|
|
|
|
|
}
|
|
|
|
|
|
2000-08-04 20:41:05 +02:00
|
|
|
|
/* Build (or rebuild) the minimal symbol hash tables. This is necessary
|
|
|
|
|
after compacting or sorting the table since the entries move around
|
2011-01-09 04:20:33 +01:00
|
|
|
|
thus causing the internal minimal_symbol pointers to become jumbled. */
|
2000-08-04 20:41:05 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
build_minimal_symbol_hash_tables (struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct minimal_symbol *msym;
|
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* Clear the hash tables. */
|
2000-08-04 20:41:05 +02:00
|
|
|
|
for (i = 0; i < MINIMAL_SYMBOL_HASH_SIZE; i++)
|
|
|
|
|
{
|
|
|
|
|
objfile->msymbol_hash[i] = 0;
|
|
|
|
|
objfile->msymbol_demangled_hash[i] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-09 04:20:33 +01:00
|
|
|
|
/* Now, (re)insert the actual entries. */
|
2000-08-04 20:41:05 +02:00
|
|
|
|
for (i = objfile->minimal_symbol_count, msym = objfile->msymbols;
|
|
|
|
|
i > 0;
|
|
|
|
|
i--, msym++)
|
|
|
|
|
{
|
|
|
|
|
msym->hash_next = 0;
|
|
|
|
|
add_minsym_to_hash_table (msym, objfile->msymbol_hash);
|
|
|
|
|
|
|
|
|
|
msym->demangled_hash_next = 0;
|
2004-05-20 11:51:34 +02:00
|
|
|
|
if (SYMBOL_SEARCH_NAME (msym) != SYMBOL_LINKAGE_NAME (msym))
|
2000-08-04 20:41:05 +02:00
|
|
|
|
add_minsym_to_demangled_hash_table (msym,
|
|
|
|
|
objfile->msymbol_demangled_hash);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Add the minimal symbols in the existing bunches to the objfile's official
|
|
|
|
|
minimal symbol table. In most cases there is no minimal symbol table yet
|
|
|
|
|
for this objfile, and the existing bunches are used to create one. Once
|
|
|
|
|
in a while (for shared libraries for example), we add symbols (e.g. common
|
|
|
|
|
symbols) to an existing objfile.
|
|
|
|
|
|
|
|
|
|
Because of the way minimal symbols are collected, we generally have no way
|
|
|
|
|
of knowing what source language applies to any particular minimal symbol.
|
|
|
|
|
Specifically, we have no way of knowing if the minimal symbol comes from a
|
|
|
|
|
C++ compilation unit or not. So for the sake of supporting cached
|
|
|
|
|
demangled C++ names, we have no choice but to try and demangle each new one
|
|
|
|
|
that comes in. If the demangling succeeds, then we assume it is a C++
|
|
|
|
|
symbol and set the symbol's language and demangled name fields
|
|
|
|
|
appropriately. Note that in order to avoid unnecessary demanglings, and
|
|
|
|
|
allocating obstack space that subsequently can't be freed for the demangled
|
|
|
|
|
names, we mark all newly added symbols with language_auto. After
|
|
|
|
|
compaction of the minimal symbols, we go back and scan the entire minimal
|
|
|
|
|
symbol table looking for these new symbols. For each new symbol we attempt
|
|
|
|
|
to demangle it, and if successful, record it as a language_cplus symbol
|
|
|
|
|
and cache the demangled form on the symbol obstack. Symbols which don't
|
|
|
|
|
demangle are marked as language_unknown symbols, which inhibits future
|
2011-01-09 04:20:33 +01:00
|
|
|
|
attempts to demangle them if we later add more minimal symbols. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
install_minimal_symbols (struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int bindex;
|
|
|
|
|
int mcount;
|
|
|
|
|
struct msym_bunch *bunch;
|
|
|
|
|
struct minimal_symbol *msymbols;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int alloc_count;
|
|
|
|
|
|
|
|
|
|
if (msym_count > 0)
|
|
|
|
|
{
|
2012-06-26 22:14:03 +02:00
|
|
|
|
if (symtab_create_debug)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"Installing %d minimal symbols of objfile %s.\n",
|
|
|
|
|
msym_count, objfile->name);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Allocate enough space in the obstack, into which we will gather the
|
1999-07-07 22:19:36 +02:00
|
|
|
|
bunches of new and existing minimal symbols, sort them, and then
|
|
|
|
|
compact out the duplicate entries. Once we have a final table,
|
|
|
|
|
we will give back the excess space. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
alloc_count = msym_count + objfile->minimal_symbol_count + 1;
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_blank (&objfile->objfile_obstack,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
alloc_count * sizeof (struct minimal_symbol));
|
|
|
|
|
msymbols = (struct minimal_symbol *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_base (&objfile->objfile_obstack);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Copy in the existing minimal symbols, if there are any. */
|
|
|
|
|
|
|
|
|
|
if (objfile->minimal_symbol_count)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
memcpy ((char *) msymbols, (char *) objfile->msymbols,
|
|
|
|
|
objfile->minimal_symbol_count * sizeof (struct minimal_symbol));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Walk through the list of minimal symbol bunches, adding each symbol
|
1999-07-07 22:19:36 +02:00
|
|
|
|
to the new contiguous array of symbols. Note that we start with the
|
|
|
|
|
current, possibly partially filled bunch (thus we use the current
|
|
|
|
|
msym_bunch_index for the first bunch we copy over), and thereafter
|
2011-01-09 04:20:33 +01:00
|
|
|
|
each bunch is full. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
mcount = objfile->minimal_symbol_count;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
for (bunch = msym_bunch; bunch != NULL; bunch = bunch->next)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
for (bindex = 0; bindex < msym_bunch_index; bindex++, mcount++)
|
2004-03-29 13:26:04 +02:00
|
|
|
|
msymbols[mcount] = bunch->contents[bindex];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msym_bunch_index = BUNCH_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort the minimal symbols by address. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
qsort (msymbols, mcount, sizeof (struct minimal_symbol),
|
|
|
|
|
compare_minimal_symbols);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Compact out any duplicates, and free up whatever space we are
|
1999-07-07 22:19:36 +02:00
|
|
|
|
no longer using. */
|
|
|
|
|
|
2000-03-07 05:33:52 +01:00
|
|
|
|
mcount = compact_minimal_symbols (msymbols, mcount, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_blank (&objfile->objfile_obstack,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
(mcount + 1 - alloc_count) * sizeof (struct minimal_symbol));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
msymbols = (struct minimal_symbol *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_finish (&objfile->objfile_obstack);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* We also terminate the minimal symbol table with a "null symbol",
|
1999-07-07 22:19:36 +02:00
|
|
|
|
which is *not* included in the size of the table. This makes it
|
|
|
|
|
easier to find the end of the table when we are handed a pointer
|
|
|
|
|
to some symbol in the middle of it. Zero out the fields in the
|
|
|
|
|
"null symbol" allocated at the end of the array. Note that the
|
|
|
|
|
symbol count does *not* include this null symbol, which is why it
|
2011-01-09 04:20:33 +01:00
|
|
|
|
is indexed by mcount and not mcount-1. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-03-10 21:40:45 +01:00
|
|
|
|
SYMBOL_LINKAGE_NAME (&msymbols[mcount]) = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE_ADDRESS (&msymbols[mcount]) = 0;
|
2008-10-01 18:41:27 +02:00
|
|
|
|
MSYMBOL_TARGET_FLAG_1 (&msymbols[mcount]) = 0;
|
|
|
|
|
MSYMBOL_TARGET_FLAG_2 (&msymbols[mcount]) = 0;
|
2003-11-11 21:04:52 +01:00
|
|
|
|
MSYMBOL_SIZE (&msymbols[mcount]) = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
MSYMBOL_TYPE (&msymbols[mcount]) = mst_unknown;
|
2010-08-09 21:42:48 +02:00
|
|
|
|
SYMBOL_SET_LANGUAGE (&msymbols[mcount], language_unknown);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Attach the minimal symbol table to the specified objfile.
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
The strings themselves are also located in the objfile_obstack
|
1999-07-07 22:19:36 +02:00
|
|
|
|
of this objfile. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
objfile->minimal_symbol_count = mcount;
|
|
|
|
|
objfile->msymbols = msymbols;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-05-22 23:02:41 +02:00
|
|
|
|
/* Try to guess the appropriate C++ ABI by looking at the names
|
|
|
|
|
of the minimal symbols in the table. */
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < mcount; i++)
|
|
|
|
|
{
|
2003-04-13 17:25:23 +02:00
|
|
|
|
/* If a symbol's name starts with _Z and was successfully
|
|
|
|
|
demangled, then we can assume we've found a GNU v3 symbol.
|
|
|
|
|
For now we set the C++ ABI globally; if the user is
|
|
|
|
|
mixing ABIs then the user will need to "set cp-abi"
|
|
|
|
|
manually. */
|
2003-03-10 21:40:45 +01:00
|
|
|
|
const char *name = SYMBOL_LINKAGE_NAME (&objfile->msymbols[i]);
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2003-04-13 17:25:23 +02:00
|
|
|
|
if (name[0] == '_' && name[1] == 'Z'
|
|
|
|
|
&& SYMBOL_DEMANGLED_NAME (&objfile->msymbols[i]) != NULL)
|
2001-05-22 23:02:41 +02:00
|
|
|
|
{
|
* cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
(auto_cp_abi): New variable.
(current_cp_abi, num_cp_abis): Make static.
(CP_ABI_MAX): Define.
(cp_abis): Turn into an array.
(value_virtual_fn_field): Fix formatting.
(switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
takes a pointer.
(set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
(list_cp_abis, _initialize_cp_abi): New functions.
* cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
declarations for cp_abis, num_cp_abis, current_cp_abi, and
switch_to_cp_abi. Update prototype for register_cp_abi.
* Makefile.in (cp-abi.o): Update dependencies.
* minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
instead of switch_to_cp_abi.
* gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
register_cp_abi.
* gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
register_cp_abi.
* hpacc-abi.c (_initialize_hpacc_abi): Likewise.
2003-03-05 19:01:46 +01:00
|
|
|
|
set_cp_abi_as_auto_default ("gnu-v3");
|
2001-05-22 23:02:41 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-08-04 20:41:05 +02:00
|
|
|
|
|
|
|
|
|
/* Now build the hash tables; we can't do this incrementally
|
|
|
|
|
at an earlier point since we weren't finished with the obstack
|
|
|
|
|
yet. (And if the msymbol obstack gets moved, all the internal
|
2011-01-09 04:20:33 +01:00
|
|
|
|
pointers to other msymbols need to be adjusted.) */
|
2000-08-04 20:41:05 +02:00
|
|
|
|
build_minimal_symbol_hash_tables (objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-21 22:51:57 +01:00
|
|
|
|
/* See minsyms.h. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
terminate_minimal_symbol_table (struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
if (! objfile->msymbols)
|
|
|
|
|
objfile->msymbols = ((struct minimal_symbol *)
|
|
|
|
|
obstack_alloc (&objfile->objfile_obstack,
|
|
|
|
|
sizeof (objfile->msymbols[0])));
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *m
|
|
|
|
|
= &objfile->msymbols[objfile->minimal_symbol_count];
|
|
|
|
|
|
|
|
|
|
memset (m, 0, sizeof (*m));
|
|
|
|
|
/* Don't rely on these enumeration values being 0's. */
|
|
|
|
|
MSYMBOL_TYPE (m) = mst_unknown;
|
|
|
|
|
SYMBOL_SET_LANGUAGE (m, language_unknown);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Sort all the minimal symbols in OBJFILE. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
msymbols_sort (struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
qsort (objfile->msymbols, objfile->minimal_symbol_count,
|
|
|
|
|
sizeof (struct minimal_symbol), compare_minimal_symbols);
|
2000-08-04 20:41:05 +02:00
|
|
|
|
build_minimal_symbol_hash_tables (objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 03:34:34 +01:00
|
|
|
|
/* See minsyms.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
lookup_solib_trampoline_symbol_by_pc (CORE_ADDR pc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2008-05-14 20:14:34 +02:00
|
|
|
|
struct obj_section *section = find_pc_section (pc);
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
|
|
|
|
|
if (section == NULL)
|
|
|
|
|
return NULL;
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
msymbol = lookup_minimal_symbol_by_pc_section_1 (pc, section, 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (msymbol != NULL && MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
|
|
|
|
|
return msymbol;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If PC is in a shared library trampoline code stub, return the
|
|
|
|
|
address of the `real' function belonging to the stub.
|
|
|
|
|
Return 0 if PC is not in a trampoline code stub or if the real
|
|
|
|
|
function is not found in the minimal symbol table.
|
|
|
|
|
|
|
|
|
|
We may fail to find the right function if a function with the
|
|
|
|
|
same name is defined in more than one shared library, but this
|
2011-01-09 04:20:33 +01:00
|
|
|
|
is considered bad programming style. We could return 0 if we find
|
1999-04-16 03:35:26 +02:00
|
|
|
|
a duplicate function in case this matters someday. */
|
|
|
|
|
|
|
|
|
|
CORE_ADDR
|
2007-06-16 00:39:52 +02:00
|
|
|
|
find_solib_trampoline_target (struct frame_info *frame, CORE_ADDR pc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *tsymbol = lookup_solib_trampoline_symbol_by_pc (pc);
|
|
|
|
|
|
|
|
|
|
if (tsymbol != NULL)
|
|
|
|
|
{
|
|
|
|
|
ALL_MSYMBOLS (objfile, msymbol)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
2011-03-28 22:21:04 +02:00
|
|
|
|
if ((MSYMBOL_TYPE (msymbol) == mst_text
|
|
|
|
|
|| MSYMBOL_TYPE (msymbol) == mst_text_gnu_ifunc)
|
2003-11-08 01:13:03 +01:00
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (msymbol),
|
|
|
|
|
SYMBOL_LINKAGE_NAME (tsymbol)) == 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
return SYMBOL_VALUE_ADDRESS (msymbol);
|
2008-05-16 14:51:21 +02:00
|
|
|
|
|
|
|
|
|
/* Also handle minimal symbols pointing to function descriptors. */
|
|
|
|
|
if (MSYMBOL_TYPE (msymbol) == mst_data
|
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (msymbol),
|
|
|
|
|
SYMBOL_LINKAGE_NAME (tsymbol)) == 0)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR func;
|
2010-05-16 02:18:02 +02:00
|
|
|
|
|
2008-05-16 14:51:21 +02:00
|
|
|
|
func = gdbarch_convert_from_func_ptr_addr
|
|
|
|
|
(get_objfile_arch (objfile),
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (msymbol),
|
|
|
|
|
¤t_target);
|
|
|
|
|
|
|
|
|
|
/* Ignore data symbols that are not function descriptors. */
|
|
|
|
|
if (func != SYMBOL_VALUE_ADDRESS (msymbol))
|
|
|
|
|
return func;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|