1999-04-16 09:35:26 +08:00
|
|
|
|
/* Support routines for building symbol tables in GDB's internal format.
|
2001-03-06 16:22:02 +08:00
|
|
|
|
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
|
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* stabsread.h (process_later, resolve_cfront_continuation):
Obsolete.
Update copyright years.
* buildsym.c (start_subfile): Obsolete comment pertinent to Cfront.
Update copyright year.
* dbxread.c(struct cont_elem): Obsolete.
(process_later, process_now): Obsolete functions.
(read_dbx_symtab, read_ofile_symtab): Obsolete cfront support.
Update copyright year.
* gdbtypes.c (INIT_EXTRA, ADD_EXTRA): Obsolete macros.
(add_name, add_mangled_type, cfront_mangle_name): Obsolete functions.
* mdebugread.c (parse_type): Obsolete comment pertinent to Cfront.
(parse_partial_symbols): Obsolete cfront support.
* stabsread.c
(CFRONT_VISIBILITY_PRIVATE,CFRONT_VISIBILITY_PUBLIC): Obsolete
macros.
(get_substring, get_cfront_method_physname, msg_unknown_complaint,
read_cfront_baseclasses, read_cfront_member_functions,
resolve_cfront_continuation,read_cfront_static_fields,
copy_cfront_struct_fields): Obsolete functions.
(define_symbol, read_one_struct_field): Obsolete cfront support.
* xcoffread.c (scan_xcoff_symtab): Obsolete CFront support.
Update Copyright year.
2003-01-14 08:15:05 +08:00
|
|
|
|
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
|
|
|
Free Software Foundation, Inc.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08: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
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08: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 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* This module provides subroutines used for creating and adding to
|
|
|
|
|
the symbol table. These routines are called from various symbol-
|
|
|
|
|
file-reading routines.
|
|
|
|
|
|
|
|
|
|
Routines to support specific debugging information formats (stabs,
|
|
|
|
|
DWARF, etc) belong somewhere else. */
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "bfd.h"
|
2002-07-29 Andrew Cagney <ac131313@redhat.com>
* gdb_obstack.h: New file.
* symtab.h: Include "gdb_obstack.h" instead of "obstack.h".
(obstack_chunk_alloc, obstack_chunk_free): Delete macros.
* objfiles.h: Include "gdb_obstack.h".
* Makefile.in (gdb_obstack_h): Define.
(symtab_h): Add $(gdb_obstack_h).
(objfiles_h): Add $(gdb_obstack_h).
* objfiles.c: Include "gdb_obstack.h" instead of "obstack.h".
* macrotab.c, cp-valprint.c, dbxread.c: Ditto.
* ch-typeprint.c, ch-valprint.c, dstread.c: Ditto.
* macroexp.c, p-typeprint.c, stabsread.c: Ditto.
* symtab.c, f-typeprint.c, mdebugread.c: Ditto.
* p-valprint.c, symmisc.c, typeprint.c: Ditto.
* symfile.c, coffread.c, c-typeprint.c: Ditto.
* buildsym.c, bcache.c, ada-typeprint.c: Ditto.
* Makefile.in (bcache.o): Update dependencies.
(buildsym.o, c-typeprint.o, ch-typeprint.o): Ditto.
(ch-valprint.o, coffread.o, cp-valprint.o): Ditto.
(dbxread.o, dstread.o, f-typeprint.o): Ditto.
(objfiles.o, p-typeprint.o, p-valprint.o): Ditto.
(stabsread.o, symfile.o, symmisc.o): Ditto.
(symtab.o, typeprint.o, macroexp.o): Ditto.
(macrotab.o, mdebugread.o): Ditto.
(f_lang_h, coff_sym_h, coff_symconst_h): Define.
(coff_ecoff_h, aout_aout64_h): Define.
(aout_stabs_gnu_h, libaout_h): Define.
2002-07-30 06:55:26 +08:00
|
|
|
|
#include "gdb_obstack.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "symtab.h"
|
2002-10-26 06:25:55 +08:00
|
|
|
|
#include "symfile.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "gdbtypes.h"
|
2002-11-19 03:14:10 +08:00
|
|
|
|
#include "gdb_assert.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "complaints.h"
|
|
|
|
|
#include "gdb_string.h"
|
2000-02-21 11:04:19 +08:00
|
|
|
|
#include "expression.h" /* For "enum exp_opcode" used by... */
|
2002-05-12 12:20:06 +08:00
|
|
|
|
#include "language.h" /* For "local_hex_string" */
|
2000-06-06 04:49:53 +08:00
|
|
|
|
#include "bcache.h"
|
2001-04-30 18:30:27 +08:00
|
|
|
|
#include "filenames.h" /* For DOSish file names */
|
2002-05-16 05:19:21 +08:00
|
|
|
|
#include "macrotab.h"
|
2002-07-12 04:46:19 +08:00
|
|
|
|
#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */
|
2003-02-19 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add block.c.
(block_h): New.
(COMMON_OBS): Add block.o.
(block.o): New.
(x86-64-tdep.o): Add $(block_h).
(values.o, valops.o, tracepoint.o, symtab.o, symmisc.o, symfile.o)
(stack.o, printcmd.o, p-exp.tab.o, parse.o, objfiles.o)
(objc-exp.tab.o, objc-lang.o, nlmread.o, mips-tdep.o, mdebugread.o)
(m2-exp.tab.o, linespec.o, jv-lang.o, jv-exp.tab.o, infcmd.o)
(f-valprint.o, findvar.o, f-exp.tab.o, expprint.o, coffread.o)
(c-exp.tab.o, buildsym.o, breakpoint.o, blockframe.o, ax-gdb.o)
(alpha-tdep.o, ada-lang.o, ada-exp.tab.o, mi-cmd-stack.o): Ditto.
* value.h: Add opaque declaration for struct block.
* parser-defs.h, objc-lang.h, buildsym.h, breakpoint.h: Ditto.
* ada-lang.h: Ditto.
* x86-64-tdep.c: #include "block.h"
* values.c, valops.c, tracepoint.c, symtab.c, symmisc.c: Ditto.
* symfile.c, stack.c, printcmd.c, p-exp.y, parse.c: Ditto.
* objfiles.c, objc-exp.y, objc-lang.c, nlmread.c: Ditto.
* mips-tdep.c, mdebugread.c, m2-exp.y, linespec.c: Ditto.
* jv-lang.c, jv-exp.y, infcmd.c, f-valprint.c: Ditto.
* findvar.c, f-exp.y, expprint.c, coffread.c, c-exp.y: Ditto.
* buildsym.c, breakpoint.c, blockframe.c, ax-gdb.c: Ditto.
* alpha-tdep.c, ada-lang.c, ada-exp.y: Ditto.
* blockframe.c (blockvector_for_pc_sect): Move to "block.c".
(blockvector_for_pc, block_for_pc_sect, block_for_pc): Ditto.
* symtab.c (block_function): Ditto.
(contained_in): Ditto.
* frame.h: Move block_for_pc and block_for_pc_sect declarations to
block.h. Add opaque declaration for struct block.
* symtab.h: Move block_function and contained_in declarations to
block.h. Add opaque declarations for struct block, struct
blockvector.
(struct block): Move to block.h.
(struct blockvector): Ditto.
(BLOCK_START, BLOCK_END, BLOCK_FUNCTION, BLOCK_SUPERBLOCK)
(BLOCK_GCC_COMPILED, BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM)
(BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE)
(ALL_BLOCK_SYMBOLS, BLOCK_SHOULD_SORT, BLOCKVECTOR_NBLOCKS)
(BLOCKVECTOR_BLOCK, GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK):
Ditto.
* block.c: New file.
* block.h: New file.
2003-02-19 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: #include "block.h"
2003-02-20 08:01:07 +08:00
|
|
|
|
#include "block.h"
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
#include "cp-support.h"
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
#include "dictionary.h"
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Ask buildsym.h to define the vars it normally declares `extern'. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
#define EXTERN
|
|
|
|
|
/**/
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "buildsym.h" /* Our own declarations */
|
|
|
|
|
#undef EXTERN
|
|
|
|
|
|
|
|
|
|
/* For cleanup_undefined_types and finish_global_stabs (somewhat
|
|
|
|
|
questionable--see comment where we call them). */
|
|
|
|
|
|
|
|
|
|
#include "stabsread.h"
|
|
|
|
|
|
|
|
|
|
/* List of free `struct pending' structures for reuse. */
|
|
|
|
|
|
|
|
|
|
static struct pending *free_pendings;
|
|
|
|
|
|
|
|
|
|
/* Non-zero if symtab has line number info. This prevents an
|
|
|
|
|
otherwise empty symtab from being tossed. */
|
|
|
|
|
|
|
|
|
|
static int have_line_numbers;
|
|
|
|
|
|
|
|
|
|
static int compare_line_numbers (const void *ln1p, const void *ln2p);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Initial sizes of data structures. These are realloc'd larger if
|
|
|
|
|
needed, and realloc'd down to the size actually used, when
|
|
|
|
|
completed. */
|
|
|
|
|
|
|
|
|
|
#define INITIAL_CONTEXT_STACK_SIZE 10
|
|
|
|
|
#define INITIAL_LINE_VECTOR_LENGTH 1000
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* maintain the lists of symbols and blocks */
|
|
|
|
|
|
2000-02-19 06:15:46 +08:00
|
|
|
|
/* Add a pending list to free_pendings. */
|
|
|
|
|
void
|
|
|
|
|
add_free_pendings (struct pending *list)
|
|
|
|
|
{
|
|
|
|
|
register struct pending *link = list;
|
|
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
|
{
|
|
|
|
|
while (link->next) link = link->next;
|
|
|
|
|
link->next = free_pendings;
|
|
|
|
|
free_pendings = list;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
/* Add a symbol to one of the lists of symbols. While we're at it, if
|
|
|
|
|
we're in the C++ case and don't have full namespace debugging info,
|
|
|
|
|
check to see if it references an anonymous namespace; if so, add an
|
|
|
|
|
appropriate using directive. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
|
|
|
|
|
{
|
|
|
|
|
register struct pending *link;
|
|
|
|
|
|
|
|
|
|
/* If this is an alias for another symbol, don't add it. */
|
|
|
|
|
if (symbol->ginfo.name && symbol->ginfo.name[0] == '#')
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* We keep PENDINGSIZE symbols in each link of the list. If we
|
|
|
|
|
don't have a link with room in it, add a new link. */
|
|
|
|
|
if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE)
|
|
|
|
|
{
|
|
|
|
|
if (free_pendings)
|
|
|
|
|
{
|
|
|
|
|
link = free_pendings;
|
|
|
|
|
free_pendings = link->next;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
link = (struct pending *) xmalloc (sizeof (struct pending));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
link->next = *listhead;
|
|
|
|
|
*listhead = link;
|
|
|
|
|
link->nsyms = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(*listhead)->symbol[(*listhead)->nsyms++] = symbol;
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
|
|
|
|
|
/* Check to see if we might need to look for a mention of anonymous
|
|
|
|
|
namespaces. */
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_LANGUAGE (symbol) == language_cplus)
|
|
|
|
|
cp_scan_for_anonymous_namespaces (symbol);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a symbol named NAME on a LIST. NAME need not be
|
|
|
|
|
'\0'-terminated; LENGTH is the length of the name. */
|
|
|
|
|
|
|
|
|
|
struct symbol *
|
|
|
|
|
find_symbol_in_list (struct pending *list, char *name, int length)
|
|
|
|
|
{
|
|
|
|
|
int j;
|
|
|
|
|
char *pp;
|
|
|
|
|
|
|
|
|
|
while (list != NULL)
|
|
|
|
|
{
|
|
|
|
|
for (j = list->nsyms; --j >= 0;)
|
|
|
|
|
{
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-26 05:36:23 +08:00
|
|
|
|
pp = DEPRECATED_SYMBOL_NAME (list->symbol[j]);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (*pp == *name && strncmp (pp, name, length) == 0 &&
|
|
|
|
|
pp[length] == '\0')
|
|
|
|
|
{
|
|
|
|
|
return (list->symbol[j]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
list = list->next;
|
|
|
|
|
}
|
|
|
|
|
return (NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* At end of reading syms, or in case of quit, really free as many
|
|
|
|
|
`struct pending's as we can easily find. */
|
|
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
void
|
2003-01-10 02:30:32 +08:00
|
|
|
|
really_free_pendings (void *dummy)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
struct pending *next, *next1;
|
|
|
|
|
|
|
|
|
|
for (next = free_pendings; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) next);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
free_pendings = NULL;
|
|
|
|
|
|
|
|
|
|
free_pending_blocks ();
|
|
|
|
|
|
|
|
|
|
for (next = file_symbols; next != NULL; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) next);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
|
|
|
|
|
for (next = global_symbols; next != NULL; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) next);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
global_symbols = NULL;
|
2002-05-16 05:19:21 +08:00
|
|
|
|
|
|
|
|
|
if (pending_macros)
|
|
|
|
|
free_macro_table (pending_macros);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is called to discard any pending blocks. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
free_pending_blocks (void)
|
|
|
|
|
{
|
|
|
|
|
#if 0 /* Now we make the links in the
|
|
|
|
|
symbol_obstack, so don't free
|
|
|
|
|
them. */
|
|
|
|
|
struct pending_block *bnext, *bnext1;
|
|
|
|
|
|
|
|
|
|
for (bnext = pending_blocks; bnext; bnext = bnext1)
|
|
|
|
|
{
|
|
|
|
|
bnext1 = bnext->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) bnext);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
pending_blocks = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Take one of the lists of symbols and make a block from it. Keep
|
|
|
|
|
the order the symbols have in the list (reversed from the input
|
|
|
|
|
file). Put the block on the list of pending blocks. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
finish_block (struct symbol *symbol, struct pending **listhead,
|
|
|
|
|
struct pending_block *old_blocks,
|
|
|
|
|
CORE_ADDR start, CORE_ADDR end,
|
|
|
|
|
struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
register struct pending *next, *next1;
|
|
|
|
|
register struct block *block;
|
|
|
|
|
register struct pending_block *pblock;
|
|
|
|
|
struct pending_block *opblock;
|
|
|
|
|
|
2003-09-12 07:43:56 +08:00
|
|
|
|
block = allocate_block (&objfile->symbol_obstack);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-12 04:46:19 +08:00
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
BLOCK_DICT (block) = dict_create_linear (&objfile->symbol_obstack,
|
|
|
|
|
*listhead);
|
2002-07-12 04:46:19 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
BLOCK_DICT (block) = dict_create_hashed (&objfile->symbol_obstack,
|
|
|
|
|
*listhead);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLOCK_START (block) = start;
|
|
|
|
|
BLOCK_END (block) = end;
|
|
|
|
|
/* Superblock filled in when containing block is made */
|
|
|
|
|
BLOCK_SUPERBLOCK (block) = NULL;
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
BLOCK_NAMESPACE (block) = NULL;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
BLOCK_GCC_COMPILED (block) = processing_gcc_compilation;
|
|
|
|
|
|
|
|
|
|
/* Put the block in as the value of the symbol that names it. */
|
|
|
|
|
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
|
|
|
|
struct type *ftype = SYMBOL_TYPE (symbol);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
struct dict_iterator iter;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
SYMBOL_BLOCK_VALUE (symbol) = block;
|
|
|
|
|
BLOCK_FUNCTION (block) = symbol;
|
|
|
|
|
|
|
|
|
|
if (TYPE_NFIELDS (ftype) <= 0)
|
|
|
|
|
{
|
|
|
|
|
/* No parameter type information is recorded with the
|
|
|
|
|
function's type. Set that from the type of the
|
|
|
|
|
parameter symbols. */
|
|
|
|
|
int nparams = 0, iparams;
|
|
|
|
|
struct symbol *sym;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
|
|
|
|
case LOC_BASEREG_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 23:24:18 +08:00
|
|
|
|
case LOC_COMPUTED_ARG:
|
1999-04-16 09:35:26 +08:00
|
|
|
|
nparams++;
|
|
|
|
|
break;
|
|
|
|
|
case LOC_UNDEF:
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_INDIRECT:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
case LOC_LABEL:
|
|
|
|
|
case LOC_BLOCK:
|
|
|
|
|
case LOC_CONST_BYTES:
|
|
|
|
|
case LOC_BASEREG:
|
|
|
|
|
case LOC_UNRESOLVED:
|
|
|
|
|
case LOC_OPTIMIZED_OUT:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 23:24:18 +08:00
|
|
|
|
case LOC_COMPUTED:
|
1999-04-16 09:35:26 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nparams > 0)
|
|
|
|
|
{
|
|
|
|
|
TYPE_NFIELDS (ftype) = nparams;
|
|
|
|
|
TYPE_FIELDS (ftype) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (ftype, nparams * sizeof (struct field));
|
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
iparams = 0;
|
|
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
if (iparams == nparams)
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
|
|
|
|
case LOC_BASEREG_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 23:24:18 +08:00
|
|
|
|
case LOC_COMPUTED_ARG:
|
1999-04-16 09:35:26 +08:00
|
|
|
|
TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
|
2002-01-21 03:12:23 +08:00
|
|
|
|
TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
iparams++;
|
|
|
|
|
break;
|
|
|
|
|
case LOC_UNDEF:
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_INDIRECT:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
case LOC_LABEL:
|
|
|
|
|
case LOC_BLOCK:
|
|
|
|
|
case LOC_CONST_BYTES:
|
|
|
|
|
case LOC_BASEREG:
|
|
|
|
|
case LOC_UNRESOLVED:
|
|
|
|
|
case LOC_OPTIMIZED_OUT:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 23:24:18 +08:00
|
|
|
|
case LOC_COMPUTED:
|
1999-04-16 09:35:26 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
|
|
|
|
|
/* If we're in the C++ case, set the block's scope. */
|
|
|
|
|
if (SYMBOL_LANGUAGE (symbol) == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
cp_set_block_scope (symbol, block, &objfile->symbol_obstack);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
BLOCK_FUNCTION (block) = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now "free" the links of the list, and empty the list. */
|
|
|
|
|
|
|
|
|
|
for (next = *listhead; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
|
|
|
|
next->next = free_pendings;
|
|
|
|
|
free_pendings = next;
|
|
|
|
|
}
|
|
|
|
|
*listhead = NULL;
|
|
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
|
/* Check to be sure that the blocks have an end address that is
|
|
|
|
|
greater than starting address */
|
|
|
|
|
|
|
|
|
|
if (BLOCK_END (block) < BLOCK_START (block))
|
|
|
|
|
{
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"block end address less than block start address in %s (patched it)",
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-21 01:17:25 +08:00
|
|
|
|
SYMBOL_PRINT_NAME (symbol));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"block end address 0x%s less than block start address 0x%s (patched it)",
|
|
|
|
|
paddr_nz (BLOCK_END (block)), paddr_nz (BLOCK_START (block)));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
/* Better than nothing */
|
|
|
|
|
BLOCK_END (block) = BLOCK_START (block);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Install this block as the superblock of all blocks made since the
|
|
|
|
|
start of this scope that don't have superblocks yet. */
|
|
|
|
|
|
|
|
|
|
opblock = NULL;
|
2002-09-11 07:45:26 +08:00
|
|
|
|
for (pblock = pending_blocks;
|
|
|
|
|
pblock && pblock != old_blocks;
|
|
|
|
|
pblock = pblock->next)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
|
|
|
|
|
{
|
|
|
|
|
#if 1
|
|
|
|
|
/* Check to be sure the blocks are nested as we receive
|
|
|
|
|
them. If the compiler/assembler/linker work, this just
|
|
|
|
|
burns a small amount of time. */
|
|
|
|
|
if (BLOCK_START (pblock->block) < BLOCK_START (block) ||
|
|
|
|
|
BLOCK_END (pblock->block) > BLOCK_END (block))
|
|
|
|
|
{
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"inner block not inside outer block in %s",
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-21 01:17:25 +08:00
|
|
|
|
SYMBOL_PRINT_NAME (symbol));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"inner block (0x%s-0x%s) not inside outer block (0x%s-0x%s)",
|
|
|
|
|
paddr_nz (BLOCK_START (pblock->block)),
|
|
|
|
|
paddr_nz (BLOCK_END (pblock->block)),
|
|
|
|
|
paddr_nz (BLOCK_START (block)),
|
|
|
|
|
paddr_nz (BLOCK_END (block)));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
if (BLOCK_START (pblock->block) < BLOCK_START (block))
|
|
|
|
|
BLOCK_START (pblock->block) = BLOCK_START (block);
|
|
|
|
|
if (BLOCK_END (pblock->block) > BLOCK_END (block))
|
|
|
|
|
BLOCK_END (pblock->block) = BLOCK_END (block);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
BLOCK_SUPERBLOCK (pblock->block) = block;
|
|
|
|
|
}
|
|
|
|
|
opblock = pblock;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
record_pending_block (objfile, block, opblock);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Record BLOCK on the list of all blocks in the file. Put it after
|
|
|
|
|
OPBLOCK, or at the beginning if opblock is NULL. This puts the
|
|
|
|
|
block in the list after all its subblocks.
|
|
|
|
|
|
|
|
|
|
Allocate the pending block struct in the symbol_obstack to save
|
|
|
|
|
time. This wastes a little space. FIXME: Is it worth it? */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_pending_block (struct objfile *objfile, struct block *block,
|
|
|
|
|
struct pending_block *opblock)
|
|
|
|
|
{
|
|
|
|
|
register struct pending_block *pblock;
|
|
|
|
|
|
|
|
|
|
pblock = (struct pending_block *)
|
|
|
|
|
obstack_alloc (&objfile->symbol_obstack, sizeof (struct pending_block));
|
|
|
|
|
pblock->block = block;
|
|
|
|
|
if (opblock)
|
|
|
|
|
{
|
|
|
|
|
pblock->next = opblock->next;
|
|
|
|
|
opblock->next = pblock;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pblock->next = pending_blocks;
|
|
|
|
|
pending_blocks = pblock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-21 08:57:44 +08:00
|
|
|
|
static struct blockvector *
|
1999-04-16 09:35:26 +08:00
|
|
|
|
make_blockvector (struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
register struct pending_block *next;
|
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
|
|
/* Count the length of the list of blocks. */
|
|
|
|
|
|
|
|
|
|
for (next = pending_blocks, i = 0; next; next = next->next, i++)
|
|
|
|
|
{;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
blockvector = (struct blockvector *)
|
|
|
|
|
obstack_alloc (&objfile->symbol_obstack,
|
|
|
|
|
(sizeof (struct blockvector)
|
|
|
|
|
+ (i - 1) * sizeof (struct block *)));
|
|
|
|
|
|
|
|
|
|
/* Copy the blocks into the blockvector. This is done in reverse
|
|
|
|
|
order, which happens to put the blocks into the proper order
|
|
|
|
|
(ascending starting address). finish_block has hair to insert
|
|
|
|
|
each block into the list after its subblocks in order to make
|
|
|
|
|
sure this is true. */
|
|
|
|
|
|
|
|
|
|
BLOCKVECTOR_NBLOCKS (blockvector) = i;
|
|
|
|
|
for (next = pending_blocks; next; next = next->next)
|
|
|
|
|
{
|
|
|
|
|
BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0 /* Now we make the links in the
|
|
|
|
|
obstack, so don't free them. */
|
|
|
|
|
/* Now free the links of the list, and empty the list. */
|
|
|
|
|
|
|
|
|
|
for (next = pending_blocks; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (next);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
pending_blocks = NULL;
|
|
|
|
|
|
|
|
|
|
#if 1 /* FIXME, shut this off after a while
|
|
|
|
|
to speed up symbol reading. */
|
|
|
|
|
/* Some compilers output blocks in the wrong order, but we depend on
|
|
|
|
|
their being in the right order so we can binary search. Check the
|
|
|
|
|
order and moan about it. FIXME. */
|
|
|
|
|
if (BLOCKVECTOR_NBLOCKS (blockvector) > 1)
|
|
|
|
|
{
|
|
|
|
|
for (i = 1; i < BLOCKVECTOR_NBLOCKS (blockvector); i++)
|
|
|
|
|
{
|
|
|
|
|
if (BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i - 1))
|
|
|
|
|
> BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i)))
|
|
|
|
|
{
|
2000-02-19 06:15:46 +08:00
|
|
|
|
CORE_ADDR start
|
|
|
|
|
= BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints, "block at %s out of order",
|
|
|
|
|
local_hex_string ((LONGEST) start));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return (blockvector);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start recording information about source code that came from an
|
|
|
|
|
included (or otherwise merged-in) source file with a different
|
|
|
|
|
name. NAME is the name of the file (cannot be NULL), DIRNAME is
|
|
|
|
|
the directory in which it resides (or NULL if not known). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
start_subfile (char *name, char *dirname)
|
|
|
|
|
{
|
|
|
|
|
register struct subfile *subfile;
|
|
|
|
|
|
|
|
|
|
/* See if this subfile is already known as a subfile of the current
|
|
|
|
|
main source file. */
|
|
|
|
|
|
|
|
|
|
for (subfile = subfiles; subfile; subfile = subfile->next)
|
|
|
|
|
{
|
2001-04-30 18:30:27 +08:00
|
|
|
|
if (FILENAME_CMP (subfile->name, name) == 0)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
current_subfile = subfile;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This subfile is not known. Add an entry for it. Make an entry
|
|
|
|
|
for this subfile in the list of all subfiles of the current main
|
|
|
|
|
source file. */
|
|
|
|
|
|
|
|
|
|
subfile = (struct subfile *) xmalloc (sizeof (struct subfile));
|
2000-02-19 06:15:46 +08:00
|
|
|
|
memset ((char *) subfile, 0, sizeof (struct subfile));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
subfile->next = subfiles;
|
|
|
|
|
subfiles = subfile;
|
|
|
|
|
current_subfile = subfile;
|
|
|
|
|
|
|
|
|
|
/* Save its name and compilation directory name */
|
|
|
|
|
subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name));
|
|
|
|
|
subfile->dirname =
|
|
|
|
|
(dirname == NULL) ? NULL : savestring (dirname, strlen (dirname));
|
|
|
|
|
|
|
|
|
|
/* Initialize line-number recording for this subfile. */
|
|
|
|
|
subfile->line_vector = NULL;
|
|
|
|
|
|
|
|
|
|
/* Default the source language to whatever can be deduced from the
|
|
|
|
|
filename. If nothing can be deduced (such as for a C/C++ include
|
|
|
|
|
file with a ".h" extension), then inherit whatever language the
|
|
|
|
|
previous subfile had. This kludgery is necessary because there
|
|
|
|
|
is no standard way in some object formats to record the source
|
|
|
|
|
language. Also, when symtabs are allocated we try to deduce a
|
|
|
|
|
language then as well, but it is too late for us to use that
|
|
|
|
|
information while reading symbols, since symtabs aren't allocated
|
|
|
|
|
until after all the symbols have been processed for a given
|
|
|
|
|
source file. */
|
|
|
|
|
|
|
|
|
|
subfile->language = deduce_language_from_filename (subfile->name);
|
|
|
|
|
if (subfile->language == language_unknown &&
|
|
|
|
|
subfile->next != NULL)
|
|
|
|
|
{
|
|
|
|
|
subfile->language = subfile->next->language;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize the debug format string to NULL. We may supply it
|
|
|
|
|
later via a call to record_debugformat. */
|
|
|
|
|
subfile->debugformat = NULL;
|
|
|
|
|
|
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* stabsread.h (process_later, resolve_cfront_continuation):
Obsolete.
Update copyright years.
* buildsym.c (start_subfile): Obsolete comment pertinent to Cfront.
Update copyright year.
* dbxread.c(struct cont_elem): Obsolete.
(process_later, process_now): Obsolete functions.
(read_dbx_symtab, read_ofile_symtab): Obsolete cfront support.
Update copyright year.
* gdbtypes.c (INIT_EXTRA, ADD_EXTRA): Obsolete macros.
(add_name, add_mangled_type, cfront_mangle_name): Obsolete functions.
* mdebugread.c (parse_type): Obsolete comment pertinent to Cfront.
(parse_partial_symbols): Obsolete cfront support.
* stabsread.c
(CFRONT_VISIBILITY_PRIVATE,CFRONT_VISIBILITY_PUBLIC): Obsolete
macros.
(get_substring, get_cfront_method_physname, msg_unknown_complaint,
read_cfront_baseclasses, read_cfront_member_functions,
resolve_cfront_continuation,read_cfront_static_fields,
copy_cfront_struct_fields): Obsolete functions.
(define_symbol, read_one_struct_field): Obsolete cfront support.
* xcoffread.c (scan_xcoff_symtab): Obsolete CFront support.
Update Copyright year.
2003-01-14 08:15:05 +08:00
|
|
|
|
#if 0 /* OBSOLETE CFront */
|
|
|
|
|
// OBSOLETE /* cfront output is a C program, so in most ways it looks like a C
|
|
|
|
|
// OBSOLETE program. But to demangle we need to set the language to C++. We
|
|
|
|
|
// OBSOLETE can distinguish cfront code by the fact that it has #line
|
|
|
|
|
// OBSOLETE directives which specify a file name ending in .C. */
|
|
|
|
|
#endif /* OBSOLETE CFront */
|
|
|
|
|
|
|
|
|
|
/* If the filename of this subfile ends in .C, then change the
|
1999-04-16 09:35:26 +08:00
|
|
|
|
language of any pending subfiles from C to C++. We also accept
|
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* stabsread.h (process_later, resolve_cfront_continuation):
Obsolete.
Update copyright years.
* buildsym.c (start_subfile): Obsolete comment pertinent to Cfront.
Update copyright year.
* dbxread.c(struct cont_elem): Obsolete.
(process_later, process_now): Obsolete functions.
(read_dbx_symtab, read_ofile_symtab): Obsolete cfront support.
Update copyright year.
* gdbtypes.c (INIT_EXTRA, ADD_EXTRA): Obsolete macros.
(add_name, add_mangled_type, cfront_mangle_name): Obsolete functions.
* mdebugread.c (parse_type): Obsolete comment pertinent to Cfront.
(parse_partial_symbols): Obsolete cfront support.
* stabsread.c
(CFRONT_VISIBILITY_PRIVATE,CFRONT_VISIBILITY_PUBLIC): Obsolete
macros.
(get_substring, get_cfront_method_physname, msg_unknown_complaint,
read_cfront_baseclasses, read_cfront_member_functions,
resolve_cfront_continuation,read_cfront_static_fields,
copy_cfront_struct_fields): Obsolete functions.
(define_symbol, read_one_struct_field): Obsolete cfront support.
* xcoffread.c (scan_xcoff_symtab): Obsolete CFront support.
Update Copyright year.
2003-01-14 08:15:05 +08:00
|
|
|
|
any other C++ suffixes accepted by deduce_language_from_filename. */
|
|
|
|
|
/* OBSOLETE (in particular, some people use .cxx with cfront). */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Likewise for f2c. */
|
|
|
|
|
|
|
|
|
|
if (subfile->name)
|
|
|
|
|
{
|
|
|
|
|
struct subfile *s;
|
|
|
|
|
enum language sublang = deduce_language_from_filename (subfile->name);
|
|
|
|
|
|
|
|
|
|
if (sublang == language_cplus || sublang == language_fortran)
|
|
|
|
|
for (s = subfiles; s != NULL; s = s->next)
|
|
|
|
|
if (s->language == language_c)
|
|
|
|
|
s->language = sublang;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* And patch up this file if necessary. */
|
|
|
|
|
if (subfile->language == language_c
|
|
|
|
|
&& subfile->next != NULL
|
|
|
|
|
&& (subfile->next->language == language_cplus
|
|
|
|
|
|| subfile->next->language == language_fortran))
|
|
|
|
|
{
|
|
|
|
|
subfile->language = subfile->next->language;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For stabs readers, the first N_SO symbol is assumed to be the
|
|
|
|
|
source file name, and the subfile struct is initialized using that
|
|
|
|
|
assumption. If another N_SO symbol is later seen, immediately
|
|
|
|
|
following the first one, then the first one is assumed to be the
|
|
|
|
|
directory name and the second one is really the source file name.
|
|
|
|
|
|
|
|
|
|
So we have to patch up the subfile struct by moving the old name
|
|
|
|
|
value to dirname and remembering the new name. Some sanity
|
|
|
|
|
checking is performed to ensure that the state of the subfile
|
|
|
|
|
struct is reasonable and that the old name we are assuming to be a
|
|
|
|
|
directory name actually is (by checking for a trailing '/'). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
patch_subfile_names (struct subfile *subfile, char *name)
|
|
|
|
|
{
|
|
|
|
|
if (subfile != NULL && subfile->dirname == NULL && subfile->name != NULL
|
|
|
|
|
&& subfile->name[strlen (subfile->name) - 1] == '/')
|
|
|
|
|
{
|
|
|
|
|
subfile->dirname = subfile->name;
|
|
|
|
|
subfile->name = savestring (name, strlen (name));
|
|
|
|
|
last_source_file = name;
|
|
|
|
|
|
|
|
|
|
/* Default the source language to whatever can be deduced from
|
|
|
|
|
the filename. If nothing can be deduced (such as for a C/C++
|
|
|
|
|
include file with a ".h" extension), then inherit whatever
|
|
|
|
|
language the previous subfile had. This kludgery is
|
|
|
|
|
necessary because there is no standard way in some object
|
|
|
|
|
formats to record the source language. Also, when symtabs
|
|
|
|
|
are allocated we try to deduce a language then as well, but
|
|
|
|
|
it is too late for us to use that information while reading
|
|
|
|
|
symbols, since symtabs aren't allocated until after all the
|
|
|
|
|
symbols have been processed for a given source file. */
|
|
|
|
|
|
|
|
|
|
subfile->language = deduce_language_from_filename (subfile->name);
|
|
|
|
|
if (subfile->language == language_unknown &&
|
|
|
|
|
subfile->next != NULL)
|
|
|
|
|
{
|
|
|
|
|
subfile->language = subfile->next->language;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the N_BINCL and N_EINCL symbol types that act like N_SOL for
|
|
|
|
|
switching source files (different subfiles, as we call them) within
|
|
|
|
|
one object file, but using a stack rather than in an arbitrary
|
|
|
|
|
order. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
push_subfile (void)
|
|
|
|
|
{
|
|
|
|
|
register struct subfile_stack *tem
|
|
|
|
|
= (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack));
|
|
|
|
|
|
|
|
|
|
tem->next = subfile_stack;
|
|
|
|
|
subfile_stack = tem;
|
|
|
|
|
if (current_subfile == NULL || current_subfile->name == NULL)
|
|
|
|
|
{
|
2001-02-25 12:45:12 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, "failed internal consistency check");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
tem->name = current_subfile->name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
pop_subfile (void)
|
|
|
|
|
{
|
|
|
|
|
register char *name;
|
|
|
|
|
register struct subfile_stack *link = subfile_stack;
|
|
|
|
|
|
|
|
|
|
if (link == NULL)
|
|
|
|
|
{
|
2001-02-25 12:45:12 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, "failed internal consistency check");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
name = link->name;
|
|
|
|
|
subfile_stack = link->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) link);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return (name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a linetable entry for line number LINE and address PC to the
|
|
|
|
|
line vector for SUBFILE. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_line (register struct subfile *subfile, int line, CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
struct linetable_entry *e;
|
|
|
|
|
/* Ignore the dummy line number in libg.o */
|
|
|
|
|
|
|
|
|
|
if (line == 0xffff)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make sure line vector exists and is big enough. */
|
|
|
|
|
if (!subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
subfile->line_vector_length = INITIAL_LINE_VECTOR_LENGTH;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
|
|
|
|
xmalloc (sizeof (struct linetable)
|
1999-07-08 04:19:36 +08:00
|
|
|
|
+ subfile->line_vector_length * sizeof (struct linetable_entry));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
subfile->line_vector->nitems = 0;
|
|
|
|
|
have_line_numbers = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
|
|
|
|
|
{
|
|
|
|
|
subfile->line_vector_length *= 2;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
|
|
|
|
xrealloc ((char *) subfile->line_vector,
|
|
|
|
|
(sizeof (struct linetable)
|
|
|
|
|
+ (subfile->line_vector_length
|
|
|
|
|
* sizeof (struct linetable_entry))));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e = subfile->line_vector->item + subfile->line_vector->nitems++;
|
|
|
|
|
e->line = line;
|
2001-04-06 21:14:55 +08:00
|
|
|
|
e->pc = ADDR_BITS_REMOVE(pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
compare_line_numbers (const void *ln1p, const void *ln2p)
|
|
|
|
|
{
|
|
|
|
|
struct linetable_entry *ln1 = (struct linetable_entry *) ln1p;
|
|
|
|
|
struct linetable_entry *ln2 = (struct linetable_entry *) ln2p;
|
|
|
|
|
|
|
|
|
|
/* Note: this code does not assume that CORE_ADDRs can fit in ints.
|
|
|
|
|
Please keep it that way. */
|
|
|
|
|
if (ln1->pc < ln2->pc)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (ln1->pc > ln2->pc)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* If pc equal, sort by line. I'm not sure whether this is optimum
|
|
|
|
|
behavior (see comment at struct linetable in symtab.h). */
|
|
|
|
|
return ln1->line - ln2->line;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start a new symtab for a new source file. Called, for example,
|
|
|
|
|
when a stabs symbol of type N_SO is seen, or when a DWARF
|
|
|
|
|
TAG_compile_unit DIE is seen. It indicates the start of data for
|
|
|
|
|
one original source file. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
start_symtab (char *name, char *dirname, CORE_ADDR start_addr)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
last_source_file = name;
|
|
|
|
|
last_source_start_addr = start_addr;
|
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
|
|
|
|
within_function = 0;
|
|
|
|
|
have_line_numbers = 0;
|
|
|
|
|
|
|
|
|
|
/* Context stack is initially empty. Allocate first one with room
|
|
|
|
|
for 10 levels; reuse it forever afterward. */
|
|
|
|
|
if (context_stack == NULL)
|
|
|
|
|
{
|
|
|
|
|
context_stack_size = INITIAL_CONTEXT_STACK_SIZE;
|
|
|
|
|
context_stack = (struct context_stack *)
|
|
|
|
|
xmalloc (context_stack_size * sizeof (struct context_stack));
|
|
|
|
|
}
|
|
|
|
|
context_stack_depth = 0;
|
|
|
|
|
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
/* Set up support for C++ namespace support, in case we need it. */
|
|
|
|
|
|
|
|
|
|
cp_initialize_namespace ();
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Initialize the list of sub source files with one entry for this
|
|
|
|
|
file (the top-level source file). */
|
|
|
|
|
|
|
|
|
|
subfiles = NULL;
|
|
|
|
|
current_subfile = NULL;
|
|
|
|
|
start_subfile (name, dirname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finish the symbol definitions for one main source file, close off
|
|
|
|
|
all the lexical contexts for that file (creating struct block's for
|
|
|
|
|
them), then make the struct symtab for that file and put it in the
|
|
|
|
|
list of all such.
|
|
|
|
|
|
|
|
|
|
END_ADDR is the address of the end of the file's text. SECTION is
|
|
|
|
|
the section number (in objfile->section_offsets) of the blockvector
|
|
|
|
|
and linetable.
|
|
|
|
|
|
|
|
|
|
Note that it is possible for end_symtab() to return NULL. In
|
|
|
|
|
particular, for the DWARF case at least, it will return NULL when
|
|
|
|
|
it finds a compilation unit that has exactly one DIE, a
|
|
|
|
|
TAG_compile_unit DIE. This can happen when we link in an object
|
|
|
|
|
file that was compiled from an empty source file. Returning NULL
|
|
|
|
|
is probably not the correct thing to do, because then gdb will
|
|
|
|
|
never know about this empty file (FIXME). */
|
|
|
|
|
|
|
|
|
|
struct symtab *
|
|
|
|
|
end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
|
|
|
|
|
{
|
|
|
|
|
register struct symtab *symtab = NULL;
|
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register struct subfile *subfile;
|
|
|
|
|
register struct context_stack *cstk;
|
|
|
|
|
struct subfile *nextsub;
|
|
|
|
|
|
|
|
|
|
/* Finish the lexical context of the last function in the file; pop
|
|
|
|
|
the context stack. */
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth > 0)
|
|
|
|
|
{
|
|
|
|
|
cstk = pop_context ();
|
|
|
|
|
/* Make a block for the local symbols within. */
|
|
|
|
|
finish_block (cstk->name, &local_symbols, cstk->old_blocks,
|
|
|
|
|
cstk->start_addr, end_addr, objfile);
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth > 0)
|
|
|
|
|
{
|
|
|
|
|
/* This is said to happen with SCO. The old coffread.c
|
|
|
|
|
code simply emptied the context stack, so we do the
|
|
|
|
|
same. FIXME: Find out why it is happening. This is not
|
|
|
|
|
believed to happen in most cases (even for coffread.c);
|
|
|
|
|
it used to be an abort(). */
|
2002-12-17 08:39:08 +08:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"Context stack not empty in end_symtab");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
context_stack_depth = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reordered executables may have out of order pending blocks; if
|
|
|
|
|
OBJF_REORDERED is true, then sort the pending blocks. */
|
|
|
|
|
if ((objfile->flags & OBJF_REORDERED) && pending_blocks)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME! Remove this horrid bubble sort and use merge sort!!! */
|
|
|
|
|
int swapped;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
struct pending_block *pb, *pbnext;
|
|
|
|
|
|
|
|
|
|
pb = pending_blocks;
|
|
|
|
|
pbnext = pb->next;
|
|
|
|
|
swapped = 0;
|
|
|
|
|
|
|
|
|
|
while (pbnext)
|
|
|
|
|
{
|
|
|
|
|
/* swap blocks if unordered! */
|
|
|
|
|
|
|
|
|
|
if (BLOCK_START (pb->block) < BLOCK_START (pbnext->block))
|
|
|
|
|
{
|
|
|
|
|
struct block *tmp = pb->block;
|
|
|
|
|
pb->block = pbnext->block;
|
|
|
|
|
pbnext->block = tmp;
|
|
|
|
|
swapped = 1;
|
|
|
|
|
}
|
|
|
|
|
pb = pbnext;
|
|
|
|
|
pbnext = pbnext->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (swapped);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Cleanup any undefined types that have been left hanging around
|
|
|
|
|
(this needs to be done before the finish_blocks so that
|
|
|
|
|
file_symbols is still good).
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
Both cleanup_undefined_types and finish_global_stabs are stabs
|
|
|
|
|
specific, but harmless for other symbol readers, since on gdb
|
|
|
|
|
startup or when finished reading stabs, the state is set so these
|
|
|
|
|
are no-ops. FIXME: Is this handled right in case of QUIT? Can
|
|
|
|
|
we make this cleaner? */
|
|
|
|
|
|
|
|
|
|
cleanup_undefined_types ();
|
|
|
|
|
finish_global_stabs (objfile);
|
|
|
|
|
|
|
|
|
|
if (pending_blocks == NULL
|
|
|
|
|
&& file_symbols == NULL
|
|
|
|
|
&& global_symbols == NULL
|
2002-05-16 05:19:21 +08:00
|
|
|
|
&& have_line_numbers == 0
|
|
|
|
|
&& pending_macros == NULL)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* Ignore symtabs that have no functions with real debugging
|
|
|
|
|
info. */
|
|
|
|
|
blockvector = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Define the STATIC_BLOCK & GLOBAL_BLOCK, and build the
|
|
|
|
|
blockvector. */
|
|
|
|
|
finish_block (0, &file_symbols, 0, last_source_start_addr, end_addr,
|
|
|
|
|
objfile);
|
|
|
|
|
finish_block (0, &global_symbols, 0, last_source_start_addr, end_addr,
|
|
|
|
|
objfile);
|
|
|
|
|
blockvector = make_blockvector (objfile);
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 07:07:11 +08:00
|
|
|
|
cp_finalize_namespace (BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK),
|
|
|
|
|
&objfile->symbol_obstack);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef PROCESS_LINENUMBER_HOOK
|
|
|
|
|
#define PROCESS_LINENUMBER_HOOK()
|
|
|
|
|
#endif
|
|
|
|
|
PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */
|
|
|
|
|
|
|
|
|
|
/* Now create the symtab objects proper, one for each subfile. */
|
|
|
|
|
/* (The main file is the last one on the chain.) */
|
|
|
|
|
|
|
|
|
|
for (subfile = subfiles; subfile; subfile = nextsub)
|
|
|
|
|
{
|
|
|
|
|
int linetablesize = 0;
|
|
|
|
|
symtab = NULL;
|
|
|
|
|
|
|
|
|
|
/* If we have blocks of symbols, make a symtab. Otherwise, just
|
|
|
|
|
ignore this file and any line number info in it. */
|
|
|
|
|
if (blockvector)
|
|
|
|
|
{
|
|
|
|
|
if (subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
linetablesize = sizeof (struct linetable) +
|
|
|
|
|
subfile->line_vector->nitems * sizeof (struct linetable_entry);
|
|
|
|
|
#if 0
|
|
|
|
|
/* I think this is artifact from before it went on the
|
|
|
|
|
obstack. I doubt we'll need the memory between now
|
|
|
|
|
and when we free it later in this function. */
|
|
|
|
|
/* First, shrink the linetable to make more memory. */
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
|
|
|
|
xrealloc ((char *) subfile->line_vector, linetablesize);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Like the pending blocks, the line table may be
|
|
|
|
|
scrambled in reordered executables. Sort it if
|
|
|
|
|
OBJF_REORDERED is true. */
|
|
|
|
|
if (objfile->flags & OBJF_REORDERED)
|
|
|
|
|
qsort (subfile->line_vector->item,
|
|
|
|
|
subfile->line_vector->nitems,
|
1999-07-08 04:19:36 +08:00
|
|
|
|
sizeof (struct linetable_entry), compare_line_numbers);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now, allocate a symbol table. */
|
|
|
|
|
symtab = allocate_symtab (subfile->name, objfile);
|
|
|
|
|
|
|
|
|
|
/* Fill in its components. */
|
|
|
|
|
symtab->blockvector = blockvector;
|
2002-05-16 05:19:21 +08:00
|
|
|
|
symtab->macro_table = pending_macros;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
/* Reallocate the line table on the symbol obstack */
|
|
|
|
|
symtab->linetable = (struct linetable *)
|
|
|
|
|
obstack_alloc (&objfile->symbol_obstack, linetablesize);
|
|
|
|
|
memcpy (symtab->linetable, subfile->line_vector, linetablesize);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
symtab->linetable = NULL;
|
|
|
|
|
}
|
|
|
|
|
symtab->block_line_section = section;
|
|
|
|
|
if (subfile->dirname)
|
|
|
|
|
{
|
|
|
|
|
/* Reallocate the dirname on the symbol obstack */
|
|
|
|
|
symtab->dirname = (char *)
|
|
|
|
|
obstack_alloc (&objfile->symbol_obstack,
|
|
|
|
|
strlen (subfile->dirname) + 1);
|
|
|
|
|
strcpy (symtab->dirname, subfile->dirname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
symtab->dirname = NULL;
|
|
|
|
|
}
|
|
|
|
|
symtab->free_code = free_linetable;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 07:29:49 +08:00
|
|
|
|
symtab->free_func = NULL;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Use whatever language we have been using for this
|
|
|
|
|
subfile, not the one that was deduced in allocate_symtab
|
|
|
|
|
from the filename. We already did our own deducing when
|
|
|
|
|
we created the subfile, and we may have altered our
|
|
|
|
|
opinion of what language it is from things we found in
|
|
|
|
|
the symbols. */
|
|
|
|
|
symtab->language = subfile->language;
|
|
|
|
|
|
|
|
|
|
/* Save the debug format string (if any) in the symtab */
|
|
|
|
|
if (subfile->debugformat != NULL)
|
|
|
|
|
{
|
|
|
|
|
symtab->debugformat = obsavestring (subfile->debugformat,
|
1999-07-08 04:19:36 +08:00
|
|
|
|
strlen (subfile->debugformat),
|
|
|
|
|
&objfile->symbol_obstack);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All symtabs for the main file and the subfiles share a
|
|
|
|
|
blockvector, so we need to clear primary for everything
|
|
|
|
|
but the main file. */
|
|
|
|
|
|
|
|
|
|
symtab->primary = 0;
|
|
|
|
|
}
|
|
|
|
|
if (subfile->name != NULL)
|
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) subfile->name);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
if (subfile->dirname != NULL)
|
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) subfile->dirname);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
if (subfile->line_vector != NULL)
|
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) subfile->line_vector);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
if (subfile->debugformat != NULL)
|
|
|
|
|
{
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) subfile->debugformat);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nextsub = subfile->next;
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree ((void *) subfile);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set this for the main source file. */
|
|
|
|
|
if (symtab)
|
|
|
|
|
{
|
|
|
|
|
symtab->primary = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
last_source_file = NULL;
|
|
|
|
|
current_subfile = NULL;
|
2002-05-16 05:19:21 +08:00
|
|
|
|
pending_macros = NULL;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
return symtab;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Push a context block. Args are an identifying nesting level
|
|
|
|
|
(checkable when you pop it), and the starting PC address of this
|
|
|
|
|
context. */
|
|
|
|
|
|
|
|
|
|
struct context_stack *
|
|
|
|
|
push_context (int desc, CORE_ADDR valu)
|
|
|
|
|
{
|
|
|
|
|
register struct context_stack *new;
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth == context_stack_size)
|
|
|
|
|
{
|
|
|
|
|
context_stack_size *= 2;
|
|
|
|
|
context_stack = (struct context_stack *)
|
|
|
|
|
xrealloc ((char *) context_stack,
|
1999-07-08 04:19:36 +08:00
|
|
|
|
(context_stack_size * sizeof (struct context_stack)));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new = &context_stack[context_stack_depth++];
|
|
|
|
|
new->depth = desc;
|
|
|
|
|
new->locals = local_symbols;
|
|
|
|
|
new->params = param_symbols;
|
|
|
|
|
new->old_blocks = pending_blocks;
|
|
|
|
|
new->start_addr = valu;
|
|
|
|
|
new->name = NULL;
|
|
|
|
|
|
|
|
|
|
local_symbols = NULL;
|
|
|
|
|
param_symbols = NULL;
|
|
|
|
|
|
|
|
|
|
return new;
|
|
|
|
|
}
|
2002-11-19 03:14:10 +08:00
|
|
|
|
|
2002-11-19 04:57:55 +08:00
|
|
|
|
/* Pop a context block. Returns the address of the context block just
|
|
|
|
|
popped. */
|
|
|
|
|
|
2002-11-19 03:14:10 +08:00
|
|
|
|
struct context_stack *
|
|
|
|
|
pop_context (void)
|
|
|
|
|
{
|
|
|
|
|
gdb_assert (context_stack_depth > 0);
|
|
|
|
|
return (&context_stack[--context_stack_depth]);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-06-06 04:49:53 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Compute a small integer hash code for the given name. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
hashname (char *name)
|
|
|
|
|
{
|
2000-06-06 04:49:53 +08:00
|
|
|
|
return (hash(name,strlen(name)) % HASHSIZE);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_debugformat (char *format)
|
|
|
|
|
{
|
|
|
|
|
current_subfile->debugformat = savestring (format, strlen (format));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Merge the first symbol list SRCLIST into the second symbol list
|
|
|
|
|
TARGETLIST by repeated calls to add_symbol_to_list(). This
|
|
|
|
|
procedure "frees" each link of SRCLIST by adding it to the
|
|
|
|
|
free_pendings list. Caller must set SRCLIST to a null list after
|
|
|
|
|
calling this function.
|
|
|
|
|
|
|
|
|
|
Void return. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
merge_symbol_lists (struct pending **srclist, struct pending **targetlist)
|
|
|
|
|
{
|
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
|
|
if (!srclist || !*srclist)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Merge in elements from current link. */
|
|
|
|
|
for (i = 0; i < (*srclist)->nsyms; i++)
|
|
|
|
|
add_symbol_to_list ((*srclist)->symbol[i], targetlist);
|
|
|
|
|
|
|
|
|
|
/* Recurse on next. */
|
|
|
|
|
merge_symbol_lists (&(*srclist)->next, targetlist);
|
|
|
|
|
|
|
|
|
|
/* "Free" the current link. */
|
|
|
|
|
(*srclist)->next = free_pendings;
|
|
|
|
|
free_pendings = (*srclist);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize anything that needs initializing when starting to read a
|
|
|
|
|
fresh piece of a symbol file, e.g. reading in the stuff
|
|
|
|
|
corresponding to a psymtab. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
buildsym_init (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
free_pendings = NULL;
|
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
|
|
|
|
pending_blocks = NULL;
|
2002-05-16 05:19:21 +08:00
|
|
|
|
pending_macros = NULL;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize anything that needs initializing when a completely new
|
|
|
|
|
symbol file is specified (not just adding some symbols from another
|
|
|
|
|
file, e.g. a shared library). */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
buildsym_new_init (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
buildsym_init ();
|
|
|
|
|
}
|