1999-04-16 01:35:26 +00:00
|
|
|
|
/* GDB routines for manipulating the minimal symbol tables.
|
2005-12-17 22:34:03 +00:00
|
|
|
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
2010-01-01 07:32:07 +00:00
|
|
|
|
2002, 2003, 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
Contributed by Cygnus Support, using pieces from other GDB modules.
|
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
1999-07-07 20:19:36 +00: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 18:08:50 +00:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-07 20:19:36 +00:00
|
|
|
|
(at your option) any later version.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
1999-07-07 20:19:36 +00: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 01:35:26 +00:00
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 18:08:50 +00:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 01:35:26 +00: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 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00: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
|
|
|
|
|
to figure out what full symbol table entries need to be read in. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
2000-03-07 04:33:52 +00:00
|
|
|
|
#include <ctype.h>
|
1999-04-16 01:35:26 +00:00
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "symfile.h"
|
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "demangle.h"
|
2001-05-22 21:02:41 +00:00
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "cp-abi.h"
|
2008-05-16 12:51:21 +00:00
|
|
|
|
#include "target.h"
|
2009-03-31 20:21:08 +00:00
|
|
|
|
#include "cp-support.h"
|
|
|
|
|
#include "language.h"
|
1999-04-16 01:35:26 +00: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 20:19:36 +00:00
|
|
|
|
{
|
|
|
|
|
struct msym_bunch *next;
|
|
|
|
|
struct minimal_symbol contents[BUNCH_SIZE];
|
|
|
|
|
};
|
1999-04-16 01:35:26 +00: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;
|
|
|
|
|
|
2000-03-07 04:33:52 +00:00
|
|
|
|
/* Compute a hash code based using the same criteria as `strcmp_iw'. */
|
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
msymbol_hash_iw (const char *string)
|
|
|
|
|
{
|
|
|
|
|
unsigned int hash = 0;
|
|
|
|
|
while (*string && *string != '(')
|
|
|
|
|
{
|
|
|
|
|
while (isspace (*string))
|
|
|
|
|
++string;
|
|
|
|
|
if (*string && *string != '(')
|
2001-10-12 19:07:07 +00:00
|
|
|
|
{
|
|
|
|
|
hash = hash * 67 + *string - 113;
|
|
|
|
|
++string;
|
|
|
|
|
}
|
2000-03-07 04:33:52 +00:00
|
|
|
|
}
|
2002-07-11 20:46:19 +00:00
|
|
|
|
return hash;
|
2000-03-07 04:33:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute a hash code for a string. */
|
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
msymbol_hash (const char *string)
|
|
|
|
|
{
|
|
|
|
|
unsigned int hash = 0;
|
|
|
|
|
for (; *string; ++string)
|
2001-10-12 19:07:07 +00:00
|
|
|
|
hash = hash * 67 + *string - 113;
|
2002-07-11 20:46:19 +00:00
|
|
|
|
return hash;
|
2000-03-07 04:33:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the minimal symbol SYM to an objfile's minsym hash table, TABLE. */
|
|
|
|
|
void
|
|
|
|
|
add_minsym_to_hash_table (struct minimal_symbol *sym,
|
|
|
|
|
struct minimal_symbol **table)
|
|
|
|
|
{
|
|
|
|
|
if (sym->hash_next == NULL)
|
|
|
|
|
{
|
2003-03-10 20:40:45 +00:00
|
|
|
|
unsigned int hash
|
|
|
|
|
= msymbol_hash (SYMBOL_LINKAGE_NAME (sym)) % MINIMAL_SYMBOL_HASH_SIZE;
|
2000-03-07 04:33:52 +00:00
|
|
|
|
sym->hash_next = table[hash];
|
|
|
|
|
table[hash] = sym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-30 03:03:23 +00: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)
|
|
|
|
|
{
|
* 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 18:14:39 +00:00
|
|
|
|
unsigned int hash
|
|
|
|
|
= msymbol_hash_iw (SYMBOL_SEARCH_NAME (sym)) % MINIMAL_SYMBOL_HASH_SIZE;
|
2000-03-30 03:03:23 +00:00
|
|
|
|
sym->demangled_hash_next = table[hash];
|
|
|
|
|
table[hash] = sym;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2008-05-03 00:37:35 +00:00
|
|
|
|
/* Return OBJFILE where minimal symbol SYM is defined. */
|
|
|
|
|
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 01:35:26 +00: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 18:38:47 +00: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 01:35:26 +00: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 16:54:28 +00: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 01:35:26 +00: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 18:56:35 +00:00
|
|
|
|
lookup_minimal_symbol (const char *name, const char *sfile,
|
2000-07-30 01:48:28 +00:00
|
|
|
|
struct objfile *objf)
|
1999-04-16 01:35:26 +00: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 20:46:19 +00: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 04:33:52 +00:00
|
|
|
|
|
2009-03-31 20:21:08 +00:00
|
|
|
|
int needtofreename = 0;
|
|
|
|
|
const char *modified_name;
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
if (sfile != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *p = strrchr (sfile, '/');
|
|
|
|
|
if (p != NULL)
|
|
|
|
|
sfile = p + 1;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-31 20:21:08 +00:00
|
|
|
|
/* For C++, canonicalize the input name. */
|
|
|
|
|
modified_name = name;
|
|
|
|
|
if (current_language->la_language == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
char *cname = cp_canonicalize_string (name);
|
|
|
|
|
if (cname)
|
|
|
|
|
{
|
|
|
|
|
modified_name = cname;
|
|
|
|
|
needtofreename = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2007-12-18 16:02:54 +00:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 10:11:04 +00:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2000-03-07 04:33:52 +00:00
|
|
|
|
/* Do two passes: the first over the ordinary hash table,
|
|
|
|
|
and the second over the demangled hash table. */
|
2000-03-30 03:03:23 +00:00
|
|
|
|
int pass;
|
2000-03-07 04:33:52 +00:00
|
|
|
|
|
2000-03-30 03:03:23 +00:00
|
|
|
|
for (pass = 1; pass <= 2 && found_symbol == NULL; pass++)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2000-03-30 03:03:23 +00: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 01:35:26 +00: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 18:14:39 +00:00
|
|
|
|
int match;
|
|
|
|
|
|
|
|
|
|
if (pass == 1)
|
2009-03-31 20:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
match = strcmp (SYMBOL_LINKAGE_NAME (msymbol),
|
|
|
|
|
modified_name) == 0;
|
|
|
|
|
}
|
* 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 18:14:39 +00:00
|
|
|
|
else
|
2009-03-31 20:21:08 +00: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 18:14:39 +00:00
|
|
|
|
if (match)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2000-03-30 03:03:23 +00:00
|
|
|
|
switch (MSYMBOL_TYPE (msymbol))
|
|
|
|
|
{
|
|
|
|
|
case mst_file_text:
|
|
|
|
|
case mst_file_data:
|
|
|
|
|
case mst_file_bss:
|
2003-11-08 00:13:03 +00:00
|
|
|
|
if (sfile == NULL
|
|
|
|
|
|| strcmp (msymbol->filename, sfile) == 0)
|
2000-03-30 03:03:23 +00:00
|
|
|
|
found_file_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case mst_solib_trampoline:
|
|
|
|
|
|
|
|
|
|
/* If a trampoline symbol is found, we prefer to
|
|
|
|
|
keep looking for the *real* symbol. If the
|
|
|
|
|
actual symbol is not found, then we'll use the
|
|
|
|
|
trampoline entry. */
|
|
|
|
|
if (trampoline_symbol == NULL)
|
|
|
|
|
trampoline_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case mst_unknown:
|
|
|
|
|
default:
|
|
|
|
|
found_symbol = msymbol;
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
2000-03-07 04:33:52 +00:00
|
|
|
|
|
2000-03-30 03:03:23 +00: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 04:33:52 +00:00
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-03-31 20:21:08 +00:00
|
|
|
|
|
|
|
|
|
if (needtofreename)
|
|
|
|
|
xfree ((void *) modified_name);
|
|
|
|
|
|
1999-04-16 01:35:26 +00: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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look through all the current minimal symbol tables and find the
|
2003-01-08 18:38:47 +00:00
|
|
|
|
first minimal symbol that matches NAME and has text type. If OBJF
|
2003-10-21 22:56:39 +00:00
|
|
|
|
is non-NULL, limit the search to that objfile. Returns a pointer
|
|
|
|
|
to the minimal symbol that matches, or NULL if no match is found.
|
2003-01-08 18:38:47 +00:00
|
|
|
|
|
|
|
|
|
This function only searches the mangled (linkage) names. */
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
struct minimal_symbol *
|
2003-10-21 22:56:39 +00:00
|
|
|
|
lookup_minimal_symbol_text (const char *name, struct objfile *objf)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *found_symbol = NULL;
|
|
|
|
|
struct minimal_symbol *found_file_symbol = NULL;
|
|
|
|
|
|
2003-01-08 18:38:47 +00:00
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2007-12-18 16:02:54 +00:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 10:11:04 +00:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2003-01-08 18:38:47 +00:00
|
|
|
|
for (msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
msymbol != NULL && found_symbol == NULL;
|
|
|
|
|
msymbol = msymbol->hash_next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2003-03-10 20:40:45 +00:00
|
|
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (msymbol), name) == 0 &&
|
1999-04-16 01:35:26 +00:00
|
|
|
|
(MSYMBOL_TYPE (msymbol) == mst_text ||
|
|
|
|
|
MSYMBOL_TYPE (msymbol) == mst_file_text))
|
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-16 12:58:49 +00:00
|
|
|
|
/* Look through all the current minimal symbol tables and find the
|
|
|
|
|
first minimal symbol that matches NAME and PC. If OBJF is non-NULL,
|
|
|
|
|
limit the search to that objfile. Returns a pointer to the minimal
|
|
|
|
|
symbol that matches, or NULL if no match is found. */
|
|
|
|
|
|
|
|
|
|
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 10:11:04 +00:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
2008-05-16 12:58:49 +00: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;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
/* Look through all the current minimal symbol tables and find the
|
2003-10-21 22:56:39 +00:00
|
|
|
|
first minimal symbol that matches NAME and is a solib trampoline.
|
|
|
|
|
If OBJF is non-NULL, limit the search to that objfile. Returns a
|
|
|
|
|
pointer to the minimal symbol that matches, or NULL if no match is
|
|
|
|
|
found.
|
2003-01-08 18:38:47 +00:00
|
|
|
|
|
|
|
|
|
This function only searches the mangled (linkage) names. */
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00: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 18:56:35 +00:00
|
|
|
|
lookup_minimal_symbol_solib_trampoline (const char *name,
|
|
|
|
|
struct objfile *objf)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *found_symbol = NULL;
|
|
|
|
|
|
2003-01-08 18:38:47 +00:00
|
|
|
|
unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
for (objfile = object_files;
|
|
|
|
|
objfile != NULL && found_symbol == NULL;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
objfile = objfile->next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2007-12-18 16:02:54 +00:00
|
|
|
|
if (objf == NULL || objf == objfile
|
2010-01-06 10:11:04 +00:00
|
|
|
|
|| objf == objfile->separate_debug_objfile_backlink)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2003-01-08 18:38:47 +00:00
|
|
|
|
for (msymbol = objfile->msymbol_hash[hash];
|
|
|
|
|
msymbol != NULL && found_symbol == NULL;
|
|
|
|
|
msymbol = msymbol->hash_next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2003-03-10 20:40:45 +00:00
|
|
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (msymbol), name) == 0 &&
|
1999-04-16 01:35:26 +00: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 17:17:30 +00: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 01:35:26 +00:00
|
|
|
|
|
2008-05-14 18:14:34 +00: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 11:37:18 +00:00
|
|
|
|
lookup_minimal_symbol_by_pc_section_1 (CORE_ADDR pc,
|
|
|
|
|
struct obj_section *section,
|
2008-05-14 18:14:34 +00:00
|
|
|
|
int want_trampoline)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
int lo;
|
|
|
|
|
int hi;
|
|
|
|
|
int new;
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct minimal_symbol *best_symbol = NULL;
|
2008-05-14 18:14:34 +00:00
|
|
|
|
enum minimal_symbol_type want_type, other_type;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2008-05-14 18:14:34 +00:00
|
|
|
|
want_type = want_trampoline ? mst_solib_trampoline : mst_text;
|
|
|
|
|
other_type = want_trampoline ? mst_text : mst_solib_trampoline;
|
2009-09-14 17:17:30 +00:00
|
|
|
|
|
|
|
|
|
/* We can not require the symbol found to be in section, because
|
2007-07-01 22:39:04 +00: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 17:17:30 +00:00
|
|
|
|
gdb_assert (section != NULL);
|
2007-07-01 22:39:04 +00:00
|
|
|
|
|
2010-01-06 10:11:04 +00:00
|
|
|
|
for (objfile = section->objfile;
|
|
|
|
|
objfile != NULL;
|
|
|
|
|
objfile = objfile_separate_debug_iterate (section->objfile, objfile))
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
/* If this objfile has a minimal symbol table, go search it using
|
1999-07-07 20:19:36 +00: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
|
|
|
|
|
minimal symbol table at all. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2003-02-03 20:39:41 +00:00
|
|
|
|
if (objfile->minimal_symbol_count > 0)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2006-07-19 02:17:23 +00:00
|
|
|
|
int best_zero_sized = -1;
|
|
|
|
|
|
2003-02-03 20:39:41 +00:00
|
|
|
|
msymbol = objfile->msymbols;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
lo = 0;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
hi = objfile->minimal_symbol_count - 1;
|
1999-04-16 01:35:26 +00: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.
|
|
|
|
|
|
|
|
|
|
Warning: this code is trickier than it would appear at first. */
|
|
|
|
|
|
|
|
|
|
/* Should also require that pc is <= end of objfile. FIXME! */
|
|
|
|
|
if (pc >= SYMBOL_VALUE_ADDRESS (&msymbol[lo]))
|
|
|
|
|
{
|
|
|
|
|
while (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) > pc)
|
|
|
|
|
{
|
|
|
|
|
/* pc is still strictly less than highest address */
|
|
|
|
|
/* Note "new" will always be >= lo */
|
|
|
|
|
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 20:19:36 +00: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 01:35:26 +00:00
|
|
|
|
&& (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
|
1999-07-07 20:19:36 +00:00
|
|
|
|
== SYMBOL_VALUE_ADDRESS (&msymbol[hi + 1])))
|
1999-04-16 01:35:26 +00:00
|
|
|
|
hi++;
|
|
|
|
|
|
2006-07-19 02:17:23 +00: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 16:56:52 +00:00
|
|
|
|
if (MSYMBOL_TYPE (&msymbol[hi]) == mst_abs)
|
2006-07-19 02:17:23 +00: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 11:37:18 +00:00
|
|
|
|
&& SYMBOL_OBJ_SECTION (&msymbol[hi]) != NULL
|
|
|
|
|
&& (!matching_obj_sections
|
|
|
|
|
(SYMBOL_OBJ_SECTION (&msymbol[hi]), section)))
|
2006-07-19 02:17:23 +00:00
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-14 18:14:34 +00:00
|
|
|
|
/* If we are looking for a trampoline and this is a
|
|
|
|
|
text symbol, or the other way around, check the
|
|
|
|
|
preceeding symbol too. If they are otherwise
|
|
|
|
|
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 11:37:18 +00:00
|
|
|
|
&& (SYMBOL_OBJ_SECTION (&msymbol[hi])
|
|
|
|
|
== SYMBOL_OBJ_SECTION (&msymbol[hi - 1])))
|
2008-05-14 18:14:34 +00:00
|
|
|
|
{
|
|
|
|
|
hi--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-19 02:17:23 +00: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 22:14:35 +00: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 02:17:23 +00: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 01:35:26 +00:00
|
|
|
|
/* The minimal symbol indexed by hi now is the best one in this
|
1999-07-07 20:19:36 +00:00
|
|
|
|
objfile's minimal symbol table. See if it is the best one
|
|
|
|
|
overall. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
if (hi >= 0
|
|
|
|
|
&& ((best_symbol == NULL) ||
|
1999-07-07 20:19:36 +00:00
|
|
|
|
(SYMBOL_VALUE_ADDRESS (best_symbol) <
|
1999-04-16 01:35:26 +00:00
|
|
|
|
SYMBOL_VALUE_ADDRESS (&msymbol[hi]))))
|
|
|
|
|
{
|
|
|
|
|
best_symbol = &msymbol[hi];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (best_symbol);
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-14 18:14:34 +00: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 11:37:18 +00:00
|
|
|
|
lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, struct obj_section *section)
|
2008-05-14 18:14:34 +00:00
|
|
|
|
{
|
2009-09-14 17:17:30 +00: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 18:14:34 +00:00
|
|
|
|
return lookup_minimal_symbol_by_pc_section_1 (pc, section, 0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
/* Backward compatibility: search through the minimal symbol table
|
|
|
|
|
for a matching PC (no section given) */
|
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2000-07-30 01:48:28 +00:00
|
|
|
|
lookup_minimal_symbol_by_pc (CORE_ADDR pc)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2009-09-14 17:17:30 +00:00
|
|
|
|
return lookup_minimal_symbol_by_pc_section (pc, NULL);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
/* Return leading symbol character for a BFD. If BFD is NULL,
|
|
|
|
|
return the leading symbol character from the main objfile. */
|
|
|
|
|
|
2000-05-28 01:12:42 +00:00
|
|
|
|
static int get_symbol_leading_char (bfd *);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
|
get_symbol_leading_char (bfd *abfd)
|
1999-04-16 01:35:26 +00: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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Prepare to start collecting minimal symbols. 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. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
init_minimal_symbol_collection (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
msym_count = 0;
|
|
|
|
|
msym_bunch = NULL;
|
|
|
|
|
msym_bunch_index = BUNCH_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
prim_record_minimal_symbol (const char *name, CORE_ADDR address,
|
|
|
|
|
enum minimal_symbol_type ms_type,
|
|
|
|
|
struct objfile *objfile)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
int section;
|
|
|
|
|
|
|
|
|
|
switch (ms_type)
|
|
|
|
|
{
|
|
|
|
|
case mst_text:
|
|
|
|
|
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 16:52:34 +00:00
|
|
|
|
section = SECT_OFF_TEXT (objfile);
|
1999-04-16 01:35:26 +00: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 16:52:34 +00:00
|
|
|
|
section = SECT_OFF_DATA (objfile);
|
1999-04-16 01:35:26 +00: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 16:52:34 +00:00
|
|
|
|
section = SECT_OFF_BSS (objfile);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
section = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prim_record_minimal_symbol_and_info (name, address, ms_type,
|
2008-10-01 16:41:27 +00:00
|
|
|
|
section, NULL, objfile);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record a minimal symbol in the msym bunches. Returns the symbol
|
|
|
|
|
newly created. */
|
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2009-11-16 18:40:23 +00: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 01:35:26 +00: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 11:37:18 +00: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 16:32:14 +00:00
|
|
|
|
struct msym_bunch *new;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2004-03-29 11:26:04 +00: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
|
|
|
|
|
is also stored stripped in the minimal symbol table. */
|
|
|
|
|
if (name[0] == get_symbol_leading_char (objfile->obfd))
|
2009-11-16 18:40:23 +00:00
|
|
|
|
{
|
|
|
|
|
++name;
|
|
|
|
|
--name_len;
|
|
|
|
|
}
|
2004-03-29 11:26:04 +00:00
|
|
|
|
|
|
|
|
|
if (ms_type == mst_file_text && strncmp (name, "__gnu_compiled", 14) == 0)
|
|
|
|
|
return (NULL);
|
1999-04-16 01:35:26 +00: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 00:20:24 +00:00
|
|
|
|
new = XCALLOC (1, struct msym_bunch);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
msym_bunch_index = 0;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
new->next = msym_bunch;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
msym_bunch = new;
|
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
|
msymbol = &msym_bunch->contents[msym_bunch_index];
|
1999-04-16 01:35:26 +00:00
|
|
|
|
SYMBOL_INIT_LANGUAGE_SPECIFIC (msymbol, language_unknown);
|
2003-02-04 18:07:01 +00:00
|
|
|
|
SYMBOL_LANGUAGE (msymbol) = language_auto;
|
2009-11-16 18:40:23 +00:00
|
|
|
|
SYMBOL_SET_NAMES (msymbol, name, name_len, copy_name, objfile);
|
2003-02-04 18:07:01 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00: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 11:37:18 +00: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 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
MSYMBOL_TYPE (msymbol) = ms_type;
|
2008-10-01 16:41:27 +00:00
|
|
|
|
MSYMBOL_TARGET_FLAG_1 (msymbol) = 0;
|
|
|
|
|
MSYMBOL_TARGET_FLAG_2 (msymbol) = 0;
|
2003-11-11 20:04:52 +00:00
|
|
|
|
MSYMBOL_SIZE (msymbol) = 0;
|
2000-03-07 04:33:52 +00:00
|
|
|
|
|
2000-03-09 22:58:49 +00:00
|
|
|
|
/* The hash pointers must be cleared! If they're not,
|
2000-04-19 21:13:09 +00:00
|
|
|
|
add_minsym_to_hash_table will NOT add this msymbol to the hash table. */
|
2000-03-07 04:33:52 +00:00
|
|
|
|
msymbol->hash_next = NULL;
|
|
|
|
|
msymbol->demangled_hash_next = NULL;
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
msym_bunch_index++;
|
|
|
|
|
msym_count++;
|
|
|
|
|
OBJSTAT (objfile, n_minsyms++);
|
|
|
|
|
return msymbol;
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-16 18:40:23 +00:00
|
|
|
|
/* Record a minimal symbol in the msym bunches. Returns the symbol
|
|
|
|
|
newly created. */
|
|
|
|
|
|
|
|
|
|
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 01:35:26 +00:00
|
|
|
|
/* Compare two minimal symbols by address and return a signed result based
|
|
|
|
|
on unsigned comparisons, so that we sort into unsigned numeric order.
|
|
|
|
|
Within groups with the same address, sort by name. */
|
|
|
|
|
|
|
|
|
|
static int
|
2002-03-19 19:00:04 +00:00
|
|
|
|
compare_minimal_symbols (const void *fn1p, const void *fn2p)
|
1999-04-16 01:35:26 +00: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 16:32:14 +00:00
|
|
|
|
const struct minimal_symbol *fn1;
|
|
|
|
|
const struct minimal_symbol *fn2;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
fn1 = (const struct minimal_symbol *) fn1p;
|
|
|
|
|
fn2 = (const struct minimal_symbol *) fn2p;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (fn1) < SYMBOL_VALUE_ADDRESS (fn2))
|
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
|
return (-1); /* addr 1 is less than addr 2 */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
else if (SYMBOL_VALUE_ADDRESS (fn1) > SYMBOL_VALUE_ADDRESS (fn2))
|
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
|
return (1); /* addr 1 is greater than addr 2 */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
|
else
|
|
|
|
|
/* addrs are equal: sort by name */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2003-03-10 20:40:45 +00:00
|
|
|
|
char *name1 = SYMBOL_LINKAGE_NAME (fn1);
|
|
|
|
|
char *name2 = SYMBOL_LINKAGE_NAME (fn2);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
if (name1 && name2) /* both have names */
|
|
|
|
|
return strcmp (name1, name2);
|
|
|
|
|
else if (name2)
|
1999-07-07 20:19:36 +00: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 01:35:26 +00:00
|
|
|
|
return -1;
|
|
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
|
return (0); /* neither has a name, so they're equal. */
|
1999-04-16 01:35:26 +00: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
|
|
|
|
|
it. Is it worth the extra trouble though? */
|
|
|
|
|
|
2000-05-16 04:07:39 +00:00
|
|
|
|
static void
|
|
|
|
|
do_discard_minimal_symbols_cleanup (void *arg)
|
1999-04-16 01:35:26 +00: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 16:32:14 +00:00
|
|
|
|
struct msym_bunch *next;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
while (msym_bunch != NULL)
|
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
|
next = msym_bunch->next;
|
2000-12-15 01:01:51 +00:00
|
|
|
|
xfree (msym_bunch);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
msym_bunch = next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-05-16 04:07:39 +00:00
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_discard_minimal_symbols (void)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_discard_minimal_symbols_cleanup, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-03-07 04:33:52 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00: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-07 23:13:47 +00:00
|
|
|
|
on the objfile_obstack, and will get automatically freed when the symbol
|
1999-04-16 01:35:26 +00: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 01:48:28 +00:00
|
|
|
|
compact_minimal_symbols (struct minimal_symbol *msymbol, int mcount,
|
|
|
|
|
struct objfile *objfile)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *copyfrom;
|
|
|
|
|
struct minimal_symbol *copyto;
|
|
|
|
|
|
|
|
|
|
if (mcount > 0)
|
|
|
|
|
{
|
|
|
|
|
copyfrom = copyto = msymbol;
|
|
|
|
|
while (copyfrom < msymbol + mcount - 1)
|
|
|
|
|
{
|
2003-11-08 00:13:03 +00: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 01:35:26 +00:00
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
|
if (MSYMBOL_TYPE ((copyfrom + 1)) == mst_unknown)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
MSYMBOL_TYPE ((copyfrom + 1)) = MSYMBOL_TYPE (copyfrom);
|
|
|
|
|
}
|
|
|
|
|
copyfrom++;
|
|
|
|
|
}
|
|
|
|
|
else
|
2000-08-04 18:41:05 +00:00
|
|
|
|
*copyto++ = *copyfrom++;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
*copyto++ = *copyfrom++;
|
|
|
|
|
mcount = copyto - msymbol;
|
|
|
|
|
}
|
|
|
|
|
return (mcount);
|
|
|
|
|
}
|
|
|
|
|
|
2000-08-04 18:41:05 +00:00
|
|
|
|
/* Build (or rebuild) the minimal symbol hash tables. This is necessary
|
|
|
|
|
after compacting or sorting the table since the entries move around
|
|
|
|
|
thus causing the internal minimal_symbol pointers to become jumbled. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
build_minimal_symbol_hash_tables (struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct minimal_symbol *msym;
|
|
|
|
|
|
|
|
|
|
/* Clear the hash tables. */
|
|
|
|
|
for (i = 0; i < MINIMAL_SYMBOL_HASH_SIZE; i++)
|
|
|
|
|
{
|
|
|
|
|
objfile->msymbol_hash[i] = 0;
|
|
|
|
|
objfile->msymbol_demangled_hash[i] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now, (re)insert the actual entries. */
|
|
|
|
|
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 09:51:34 +00:00
|
|
|
|
if (SYMBOL_SEARCH_NAME (msym) != SYMBOL_LINKAGE_NAME (msym))
|
2000-08-04 18:41:05 +00:00
|
|
|
|
add_minsym_to_demangled_hash_table (msym,
|
|
|
|
|
objfile->msymbol_demangled_hash);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 01:35:26 +00: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
|
|
|
|
|
attempts to demangle them if we later add more minimal symbols. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
install_minimal_symbols (struct objfile *objfile)
|
1999-04-16 01:35:26 +00: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 16:32:14 +00:00
|
|
|
|
int bindex;
|
|
|
|
|
int mcount;
|
|
|
|
|
struct msym_bunch *bunch;
|
|
|
|
|
struct minimal_symbol *msymbols;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
int alloc_count;
|
|
|
|
|
|
|
|
|
|
if (msym_count > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Allocate enough space in the obstack, into which we will gather the
|
1999-07-07 20:19:36 +00: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 01:35:26 +00: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-07 23:13:47 +00:00
|
|
|
|
obstack_blank (&objfile->objfile_obstack,
|
1999-04-16 01:35:26 +00: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-07 23:13:47 +00:00
|
|
|
|
obstack_base (&objfile->objfile_obstack);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
/* Copy in the existing minimal symbols, if there are any. */
|
|
|
|
|
|
|
|
|
|
if (objfile->minimal_symbol_count)
|
1999-07-07 20:19:36 +00:00
|
|
|
|
memcpy ((char *) msymbols, (char *) objfile->msymbols,
|
|
|
|
|
objfile->minimal_symbol_count * sizeof (struct minimal_symbol));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
/* Walk through the list of minimal symbol bunches, adding each symbol
|
1999-07-07 20:19:36 +00: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
|
|
|
|
|
each bunch is full. */
|
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
mcount = objfile->minimal_symbol_count;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
|
|
|
|
for (bunch = msym_bunch; bunch != NULL; bunch = bunch->next)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
for (bindex = 0; bindex < msym_bunch_index; bindex++, mcount++)
|
2004-03-29 11:26:04 +00:00
|
|
|
|
msymbols[mcount] = bunch->contents[bindex];
|
1999-04-16 01:35:26 +00:00
|
|
|
|
msym_bunch_index = BUNCH_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort the minimal symbols by address. */
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
qsort (msymbols, mcount, sizeof (struct minimal_symbol),
|
|
|
|
|
compare_minimal_symbols);
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
/* Compact out any duplicates, and free up whatever space we are
|
1999-07-07 20:19:36 +00:00
|
|
|
|
no longer using. */
|
|
|
|
|
|
2000-03-07 04:33:52 +00:00
|
|
|
|
mcount = compact_minimal_symbols (msymbols, mcount, objfile);
|
1999-04-16 01:35:26 +00: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-07 23:13:47 +00:00
|
|
|
|
obstack_blank (&objfile->objfile_obstack,
|
1999-07-07 20:19:36 +00:00
|
|
|
|
(mcount + 1 - alloc_count) * sizeof (struct minimal_symbol));
|
1999-04-16 01:35:26 +00: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-07 23:13:47 +00:00
|
|
|
|
obstack_finish (&objfile->objfile_obstack);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
/* We also terminate the minimal symbol table with a "null symbol",
|
1999-07-07 20:19:36 +00: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
|
|
|
|
|
is indexed by mcount and not mcount-1. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2003-03-10 20:40:45 +00:00
|
|
|
|
SYMBOL_LINKAGE_NAME (&msymbols[mcount]) = NULL;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
SYMBOL_VALUE_ADDRESS (&msymbols[mcount]) = 0;
|
2008-10-01 16:41:27 +00:00
|
|
|
|
MSYMBOL_TARGET_FLAG_1 (&msymbols[mcount]) = 0;
|
|
|
|
|
MSYMBOL_TARGET_FLAG_2 (&msymbols[mcount]) = 0;
|
2003-11-11 20:04:52 +00:00
|
|
|
|
MSYMBOL_SIZE (&msymbols[mcount]) = 0;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
MSYMBOL_TYPE (&msymbols[mcount]) = mst_unknown;
|
|
|
|
|
SYMBOL_INIT_LANGUAGE_SPECIFIC (&msymbols[mcount], language_unknown);
|
|
|
|
|
|
|
|
|
|
/* 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-07 23:13:47 +00:00
|
|
|
|
The strings themselves are also located in the objfile_obstack
|
1999-07-07 20:19:36 +00:00
|
|
|
|
of this objfile. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
|
objfile->minimal_symbol_count = mcount;
|
|
|
|
|
objfile->msymbols = msymbols;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
2001-05-22 21:02:41 +00: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 15:25:23 +00: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 20:40:45 +00:00
|
|
|
|
const char *name = SYMBOL_LINKAGE_NAME (&objfile->msymbols[i]);
|
2003-04-13 15:25:23 +00:00
|
|
|
|
if (name[0] == '_' && name[1] == 'Z'
|
|
|
|
|
&& SYMBOL_DEMANGLED_NAME (&objfile->msymbols[i]) != NULL)
|
2001-05-22 21:02:41 +00: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 18:01:46 +00:00
|
|
|
|
set_cp_abi_as_auto_default ("gnu-v3");
|
2001-05-22 21:02:41 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-08-04 18:41:05 +00: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
|
|
|
|
|
pointers to other msymbols need to be adjusted.) */
|
|
|
|
|
build_minimal_symbol_hash_tables (objfile);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort all the minimal symbols in OBJFILE. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
msymbols_sort (struct objfile *objfile)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
|
|
|
|
qsort (objfile->msymbols, objfile->minimal_symbol_count,
|
|
|
|
|
sizeof (struct minimal_symbol), compare_minimal_symbols);
|
2000-08-04 18:41:05 +00:00
|
|
|
|
build_minimal_symbol_hash_tables (objfile);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if PC is in a shared library trampoline code stub.
|
|
|
|
|
Return minimal symbol for the trampoline entry or NULL if PC is not
|
|
|
|
|
in a trampoline code stub. */
|
|
|
|
|
|
|
|
|
|
struct minimal_symbol *
|
2000-07-30 01:48:28 +00:00
|
|
|
|
lookup_solib_trampoline_symbol_by_pc (CORE_ADDR pc)
|
1999-04-16 01:35:26 +00:00
|
|
|
|
{
|
2008-05-14 18:14:34 +00: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 11:37:18 +00:00
|
|
|
|
msymbol = lookup_minimal_symbol_by_pc_section_1 (pc, section, 1);
|
1999-04-16 01:35:26 +00: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
|
|
|
|
|
is considered bad programming style. We could return 0 if we find
|
|
|
|
|
a duplicate function in case this matters someday. */
|
|
|
|
|
|
|
|
|
|
CORE_ADDR
|
2007-06-15 22:39:52 +00:00
|
|
|
|
find_solib_trampoline_target (struct frame_info *frame, CORE_ADDR pc)
|
1999-04-16 01:35:26 +00: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 20:19:36 +00:00
|
|
|
|
{
|
|
|
|
|
if (MSYMBOL_TYPE (msymbol) == mst_text
|
2003-11-08 00:13:03 +00:00
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (msymbol),
|
|
|
|
|
SYMBOL_LINKAGE_NAME (tsymbol)) == 0)
|
1999-07-07 20:19:36 +00:00
|
|
|
|
return SYMBOL_VALUE_ADDRESS (msymbol);
|
2008-05-16 12:51:21 +00: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;
|
|
|
|
|
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 20:19:36 +00:00
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|