1999-04-16 03:35:26 +02:00
|
|
|
|
/* DWARF 2 debugging format support for GDB.
|
2004-01-09 16:33:15 +01:00
|
|
|
|
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
|
|
|
|
|
2004
|
2001-02-08 07:03:54 +01:00
|
|
|
|
Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
|
|
|
|
|
Inc. with support from Florida State University (under contract
|
|
|
|
|
with the Ada Joint Program Office), and Silicon Graphics, Inc.
|
|
|
|
|
Initial contribution by Brent Benson, Harris Computer Systems, Inc.,
|
|
|
|
|
based on Fred Fish's (Cygnus Support) implementation of DWARF 1
|
|
|
|
|
support in dwarfread.c
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
|
your option) any later version.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
General Public License for more details.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
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 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "elf/dwarf2.h"
|
|
|
|
|
#include "buildsym.h"
|
|
|
|
|
#include "demangle.h"
|
|
|
|
|
#include "expression.h"
|
2001-04-30 12:30:27 +02:00
|
|
|
|
#include "filenames.h" /* for DOSish file names */
|
2002-05-16 23:00:14 +02:00
|
|
|
|
#include "macrotab.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "complaints.h"
|
2000-06-05 22:49:53 +02:00
|
|
|
|
#include "bcache.h"
|
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 16:24:18 +01:00
|
|
|
|
#include "dwarf2expr.h"
|
|
|
|
|
#include "dwarf2loc.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 01:07:11 +02:00
|
|
|
|
#include "cp-support.h"
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
#include "hashtab.h"
|
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 16:24:18 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include "gdb_string.h"
|
2001-11-17 01:08:10 +01:00
|
|
|
|
#include "gdb_assert.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* A note on memory usage for this file.
|
|
|
|
|
|
|
|
|
|
At the present time, this code reads the debug info sections into
|
|
|
|
|
the objfile's objfile_obstack. A definite improvement for startup
|
|
|
|
|
time, on platforms which do not emit relocations for debug
|
|
|
|
|
sections, would be to use mmap instead. The object's complete
|
|
|
|
|
debug information is loaded into memory, partly to simplify
|
|
|
|
|
absolute DIE references.
|
|
|
|
|
|
|
|
|
|
Whether using obstacks or mmap, the sections should remain loaded
|
|
|
|
|
until the objfile is released, and pointers into the section data
|
|
|
|
|
can be used for any other data associated to the objfile (symbol
|
|
|
|
|
names, type names, location expressions to name a few). */
|
|
|
|
|
|
2000-12-08 21:12:36 +01:00
|
|
|
|
#ifndef DWARF2_REG_TO_REGNUM
|
|
|
|
|
#define DWARF2_REG_TO_REGNUM(REG) (REG)
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
#if 0
|
2000-06-05 22:49:53 +02:00
|
|
|
|
/* .debug_info header for a compilation unit
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Because of alignment constraints, this structure has padding and cannot
|
|
|
|
|
be mapped directly onto the beginning of the .debug_info section. */
|
|
|
|
|
typedef struct comp_unit_header
|
|
|
|
|
{
|
|
|
|
|
unsigned int length; /* length of the .debug_info
|
|
|
|
|
contribution */
|
|
|
|
|
unsigned short version; /* version number -- 2 for DWARF
|
|
|
|
|
version 2 */
|
|
|
|
|
unsigned int abbrev_offset; /* offset into .debug_abbrev section */
|
|
|
|
|
unsigned char addr_size; /* byte size of an address -- 4 */
|
|
|
|
|
}
|
|
|
|
|
_COMP_UNIT_HEADER;
|
|
|
|
|
#define _ACTUAL_COMP_UNIT_HEADER_SIZE 11
|
2000-07-24 03:26:10 +02:00
|
|
|
|
#endif
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* .debug_pubnames header
|
|
|
|
|
Because of alignment constraints, this structure has padding and cannot
|
|
|
|
|
be mapped directly onto the beginning of the .debug_info section. */
|
|
|
|
|
typedef struct pubnames_header
|
|
|
|
|
{
|
|
|
|
|
unsigned int length; /* length of the .debug_pubnames
|
|
|
|
|
contribution */
|
|
|
|
|
unsigned char version; /* version number -- 2 for DWARF
|
|
|
|
|
version 2 */
|
|
|
|
|
unsigned int info_offset; /* offset into .debug_info section */
|
|
|
|
|
unsigned int info_size; /* byte size of .debug_info section
|
|
|
|
|
portion */
|
|
|
|
|
}
|
|
|
|
|
_PUBNAMES_HEADER;
|
|
|
|
|
#define _ACTUAL_PUBNAMES_HEADER_SIZE 13
|
|
|
|
|
|
|
|
|
|
/* .debug_pubnames header
|
|
|
|
|
Because of alignment constraints, this structure has padding and cannot
|
|
|
|
|
be mapped directly onto the beginning of the .debug_info section. */
|
|
|
|
|
typedef struct aranges_header
|
|
|
|
|
{
|
|
|
|
|
unsigned int length; /* byte len of the .debug_aranges
|
|
|
|
|
contribution */
|
|
|
|
|
unsigned short version; /* version number -- 2 for DWARF
|
|
|
|
|
version 2 */
|
|
|
|
|
unsigned int info_offset; /* offset into .debug_info section */
|
|
|
|
|
unsigned char addr_size; /* byte size of an address */
|
|
|
|
|
unsigned char seg_size; /* byte size of segment descriptor */
|
|
|
|
|
}
|
|
|
|
|
_ARANGES_HEADER;
|
|
|
|
|
#define _ACTUAL_ARANGES_HEADER_SIZE 12
|
|
|
|
|
|
|
|
|
|
/* .debug_line statement program prologue
|
|
|
|
|
Because of alignment constraints, this structure has padding and cannot
|
|
|
|
|
be mapped directly onto the beginning of the .debug_info section. */
|
|
|
|
|
typedef struct statement_prologue
|
|
|
|
|
{
|
|
|
|
|
unsigned int total_length; /* byte length of the statement
|
|
|
|
|
information */
|
|
|
|
|
unsigned short version; /* version number -- 2 for DWARF
|
|
|
|
|
version 2 */
|
|
|
|
|
unsigned int prologue_length; /* # bytes between prologue &
|
|
|
|
|
stmt program */
|
|
|
|
|
unsigned char minimum_instruction_length; /* byte size of
|
|
|
|
|
smallest instr */
|
|
|
|
|
unsigned char default_is_stmt; /* initial value of is_stmt
|
|
|
|
|
register */
|
|
|
|
|
char line_base;
|
|
|
|
|
unsigned char line_range;
|
|
|
|
|
unsigned char opcode_base; /* number assigned to first special
|
|
|
|
|
opcode */
|
|
|
|
|
unsigned char *standard_opcode_lengths;
|
|
|
|
|
}
|
|
|
|
|
_STATEMENT_PROLOGUE;
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
static const struct objfile_data *dwarf2_objfile_data_key;
|
|
|
|
|
|
|
|
|
|
struct dwarf2_per_objfile
|
|
|
|
|
{
|
|
|
|
|
/* Sizes of debugging sections. */
|
|
|
|
|
unsigned int info_size;
|
|
|
|
|
unsigned int abbrev_size;
|
|
|
|
|
unsigned int line_size;
|
|
|
|
|
unsigned int pubnames_size;
|
|
|
|
|
unsigned int aranges_size;
|
|
|
|
|
unsigned int loc_size;
|
|
|
|
|
unsigned int macinfo_size;
|
|
|
|
|
unsigned int str_size;
|
|
|
|
|
unsigned int ranges_size;
|
|
|
|
|
unsigned int frame_size;
|
|
|
|
|
unsigned int eh_frame_size;
|
|
|
|
|
|
|
|
|
|
/* Loaded data from the sections. */
|
|
|
|
|
char *info_buffer;
|
|
|
|
|
char *abbrev_buffer;
|
|
|
|
|
char *line_buffer;
|
|
|
|
|
char *str_buffer;
|
|
|
|
|
char *macinfo_buffer;
|
|
|
|
|
char *ranges_buffer;
|
|
|
|
|
char *loc_buffer;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct dwarf2_per_objfile *dwarf2_per_objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-01-31 20:22:18 +01:00
|
|
|
|
static asection *dwarf_info_section;
|
|
|
|
|
static asection *dwarf_abbrev_section;
|
|
|
|
|
static asection *dwarf_line_section;
|
|
|
|
|
static asection *dwarf_pubnames_section;
|
|
|
|
|
static asection *dwarf_aranges_section;
|
|
|
|
|
static asection *dwarf_loc_section;
|
|
|
|
|
static asection *dwarf_macinfo_section;
|
|
|
|
|
static asection *dwarf_str_section;
|
|
|
|
|
static asection *dwarf_ranges_section;
|
|
|
|
|
asection *dwarf_frame_section;
|
|
|
|
|
asection *dwarf_eh_frame_section;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* names of the debugging sections */
|
|
|
|
|
|
|
|
|
|
#define INFO_SECTION ".debug_info"
|
|
|
|
|
#define ABBREV_SECTION ".debug_abbrev"
|
|
|
|
|
#define LINE_SECTION ".debug_line"
|
|
|
|
|
#define PUBNAMES_SECTION ".debug_pubnames"
|
|
|
|
|
#define ARANGES_SECTION ".debug_aranges"
|
|
|
|
|
#define LOC_SECTION ".debug_loc"
|
|
|
|
|
#define MACINFO_SECTION ".debug_macinfo"
|
|
|
|
|
#define STR_SECTION ".debug_str"
|
2003-01-30 02:51:48 +01:00
|
|
|
|
#define RANGES_SECTION ".debug_ranges"
|
2001-12-07 13:10:15 +01:00
|
|
|
|
#define FRAME_SECTION ".debug_frame"
|
|
|
|
|
#define EH_FRAME_SECTION ".eh_frame"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* local data types */
|
|
|
|
|
|
2002-10-09 06:43:49 +02:00
|
|
|
|
/* We hold several abbreviation tables in memory at the same time. */
|
|
|
|
|
#ifndef ABBREV_HASH_SIZE
|
|
|
|
|
#define ABBREV_HASH_SIZE 121
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
/* The data in a compilation unit header, after target2host
|
|
|
|
|
translation, looks like this. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct comp_unit_head
|
|
|
|
|
{
|
2000-08-04 18:25:30 +02:00
|
|
|
|
unsigned long length;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
short version;
|
|
|
|
|
unsigned int abbrev_offset;
|
|
|
|
|
unsigned char addr_size;
|
2000-07-24 03:26:10 +02:00
|
|
|
|
unsigned char signed_addr_p;
|
2000-08-04 18:25:30 +02:00
|
|
|
|
unsigned int offset_size; /* size of file offsets; either 4 or 8 */
|
|
|
|
|
unsigned int initial_length_size; /* size of the length field; either
|
|
|
|
|
4 or 12 */
|
2002-10-09 06:43:49 +02:00
|
|
|
|
|
|
|
|
|
/* Offset to the first byte of this compilation unit header in the
|
|
|
|
|
* .debug_info section, for resolving relative reference dies. */
|
|
|
|
|
|
|
|
|
|
unsigned int offset;
|
|
|
|
|
|
|
|
|
|
/* Pointer to this compilation unit header in the .debug_info
|
|
|
|
|
* section */
|
|
|
|
|
|
|
|
|
|
char *cu_head_ptr;
|
|
|
|
|
|
|
|
|
|
/* Pointer to the first die of this compilatio unit. This will
|
|
|
|
|
* be the first byte following the compilation unit header. */
|
|
|
|
|
|
|
|
|
|
char *first_die_ptr;
|
|
|
|
|
|
|
|
|
|
/* Pointer to the next compilation unit header in the program. */
|
|
|
|
|
|
|
|
|
|
struct comp_unit_head *next;
|
|
|
|
|
|
2003-04-13 17:43:35 +02:00
|
|
|
|
/* Base address of this compilation unit. */
|
2003-01-30 02:51:48 +01:00
|
|
|
|
|
2003-04-13 17:43:35 +02:00
|
|
|
|
CORE_ADDR base_address;
|
|
|
|
|
|
|
|
|
|
/* Non-zero if base_address has been set. */
|
|
|
|
|
|
|
|
|
|
int base_known;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
/* Internal state when decoding a particular compilation unit. */
|
|
|
|
|
struct dwarf2_cu
|
|
|
|
|
{
|
|
|
|
|
/* The objfile containing this compilation unit. */
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
|
|
|
|
|
/* The header of the compilation unit.
|
|
|
|
|
|
|
|
|
|
FIXME drow/2003-11-10: Some of the things from the comp_unit_head
|
2004-03-09 17:57:44 +01:00
|
|
|
|
should logically be moved to the dwarf2_cu structure. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head header;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
|
|
|
|
|
struct function_range *first_fn, *last_fn, *cached_fn;
|
|
|
|
|
|
|
|
|
|
/* The language we are debugging. */
|
|
|
|
|
enum language language;
|
|
|
|
|
const struct language_defn *language_defn;
|
|
|
|
|
|
2004-07-30 14:22:27 +02:00
|
|
|
|
const char *producer;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
/* The generic symbol table building routines have separate lists for
|
|
|
|
|
file scope symbols and all all other scopes (local scopes). So
|
|
|
|
|
we need to select the right one to pass to add_symbol_to_list().
|
|
|
|
|
We do it by keeping a pointer to the correct list in list_in_scope.
|
|
|
|
|
|
|
|
|
|
FIXME: The original dwarf code just treated the file scope as the
|
|
|
|
|
first local scope, and all other local scopes as nested local
|
|
|
|
|
scopes, and worked fine. Check to see if we really need to
|
|
|
|
|
distinguish these in buildsym.c. */
|
|
|
|
|
struct pending **list_in_scope;
|
|
|
|
|
|
|
|
|
|
/* Maintain an array of referenced fundamental types for the current
|
|
|
|
|
compilation unit being read. For DWARF version 1, we have to construct
|
|
|
|
|
the fundamental types on the fly, since no information about the
|
|
|
|
|
fundamental types is supplied. Each such fundamental type is created by
|
|
|
|
|
calling a language dependent routine to create the type, and then a
|
|
|
|
|
pointer to that type is then placed in the array at the index specified
|
|
|
|
|
by it's FT_<TYPENAME> value. The array has a fixed size set by the
|
|
|
|
|
FT_NUM_MEMBERS compile time constant, which is the number of predefined
|
|
|
|
|
fundamental types gdb knows how to construct. */
|
|
|
|
|
struct type *ftypes[FT_NUM_MEMBERS]; /* Fundamental types */
|
2004-03-09 17:57:44 +01:00
|
|
|
|
|
|
|
|
|
/* DWARF abbreviation table associated with this compilation unit. */
|
|
|
|
|
struct abbrev_info **dwarf2_abbrevs;
|
|
|
|
|
|
|
|
|
|
/* Storage for the abbrev table. */
|
|
|
|
|
struct obstack abbrev_obstack;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
/* Hash table holding all the loaded partial DIEs. */
|
|
|
|
|
htab_t partial_dies;
|
|
|
|
|
|
|
|
|
|
/* Storage for things with the same lifetime as this read-in compilation
|
|
|
|
|
unit, including partial DIEs. */
|
|
|
|
|
struct obstack comp_unit_obstack;
|
|
|
|
|
|
|
|
|
|
/* This flag will be set if this compilation unit includes any
|
|
|
|
|
DW_TAG_namespace DIEs. If we know that there are explicit
|
|
|
|
|
DIEs for namespaces, we don't need to try to infer them
|
|
|
|
|
from mangled names. */
|
|
|
|
|
unsigned int has_namespace_info : 1;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
};
|
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
/* The line number information for a compilation unit (found in the
|
|
|
|
|
.debug_line section) begins with a "statement program header",
|
|
|
|
|
which contains the following information. */
|
|
|
|
|
struct line_header
|
|
|
|
|
{
|
|
|
|
|
unsigned int total_length;
|
|
|
|
|
unsigned short version;
|
|
|
|
|
unsigned int header_length;
|
|
|
|
|
unsigned char minimum_instruction_length;
|
|
|
|
|
unsigned char default_is_stmt;
|
|
|
|
|
int line_base;
|
|
|
|
|
unsigned char line_range;
|
|
|
|
|
unsigned char opcode_base;
|
|
|
|
|
|
|
|
|
|
/* standard_opcode_lengths[i] is the number of operands for the
|
|
|
|
|
standard opcode whose value is i. This means that
|
|
|
|
|
standard_opcode_lengths[0] is unused, and the last meaningful
|
|
|
|
|
element is standard_opcode_lengths[opcode_base - 1]. */
|
|
|
|
|
unsigned char *standard_opcode_lengths;
|
|
|
|
|
|
|
|
|
|
/* The include_directories table. NOTE! These strings are not
|
|
|
|
|
allocated with xmalloc; instead, they are pointers into
|
|
|
|
|
debug_line_buffer. If you try to free them, `free' will get
|
|
|
|
|
indigestion. */
|
|
|
|
|
unsigned int num_include_dirs, include_dirs_size;
|
|
|
|
|
char **include_dirs;
|
|
|
|
|
|
|
|
|
|
/* The file_names table. NOTE! These strings are not allocated
|
|
|
|
|
with xmalloc; instead, they are pointers into debug_line_buffer.
|
|
|
|
|
Don't try to free them directly. */
|
|
|
|
|
unsigned int num_file_names, file_names_size;
|
|
|
|
|
struct file_entry
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
char *name;
|
|
|
|
|
unsigned int dir_index;
|
|
|
|
|
unsigned int mod_time;
|
|
|
|
|
unsigned int length;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
int included_p; /* Non-zero if referenced by the Line Number Program. */
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
} *file_names;
|
|
|
|
|
|
|
|
|
|
/* The start and end of the statement program following this
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
header. These point into dwarf2_per_objfile->line_buffer. */
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
char *statement_program_start, *statement_program_end;
|
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* When we construct a partial symbol table entry we only
|
|
|
|
|
need this much information. */
|
|
|
|
|
struct partial_die_info
|
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Offset of this DIE. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
unsigned int offset;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
/* DWARF-2 tag for this DIE. */
|
|
|
|
|
ENUM_BITFIELD(dwarf_tag) tag : 16;
|
|
|
|
|
|
|
|
|
|
/* Language code associated with this DIE. This is only used
|
|
|
|
|
for the compilation unit DIE. */
|
|
|
|
|
unsigned int language : 8;
|
|
|
|
|
|
|
|
|
|
/* Assorted flags describing the data found in this DIE. */
|
|
|
|
|
unsigned int has_children : 1;
|
|
|
|
|
unsigned int is_external : 1;
|
|
|
|
|
unsigned int is_declaration : 1;
|
|
|
|
|
unsigned int has_type : 1;
|
|
|
|
|
unsigned int has_specification : 1;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
unsigned int has_stmt_list : 1;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
unsigned int has_pc_info : 1;
|
|
|
|
|
|
|
|
|
|
/* Flag set if the SCOPE field of this structure has been
|
|
|
|
|
computed. */
|
|
|
|
|
unsigned int scope_set : 1;
|
|
|
|
|
|
|
|
|
|
/* The name of this DIE. Normally the value of DW_AT_name, but
|
|
|
|
|
sometimes DW_TAG_MIPS_linkage_name or a string computed in some
|
|
|
|
|
other fashion. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char *name;
|
2004-06-10 22:05:45 +02:00
|
|
|
|
char *dirname;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
/* The scope to prepend to our children. This is generally
|
|
|
|
|
allocated on the comp_unit_obstack, so will disappear
|
|
|
|
|
when this compilation unit leaves the cache. */
|
|
|
|
|
char *scope;
|
|
|
|
|
|
|
|
|
|
/* The location description associated with this DIE, if any. */
|
|
|
|
|
struct dwarf_block *locdesc;
|
|
|
|
|
|
|
|
|
|
/* If HAS_PC_INFO, the PC range associated with this DIE. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR lowpc;
|
|
|
|
|
CORE_ADDR highpc;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
/* Pointer into the info_buffer pointing at the target of
|
|
|
|
|
DW_AT_sibling, if any. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char *sibling;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
/* If HAS_SPECIFICATION, the offset of the DIE referred to by
|
|
|
|
|
DW_AT_specification (or DW_AT_abstract_origin or
|
|
|
|
|
DW_AT_extension). */
|
|
|
|
|
unsigned int spec_offset;
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
/* If HAS_STMT_LIST, the offset of the Line Number Information data. */
|
|
|
|
|
unsigned int line_offset;
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Pointers to this DIE's parent, first child, and next sibling,
|
|
|
|
|
if any. */
|
|
|
|
|
struct partial_die_info *die_parent, *die_child, *die_sibling;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This data structure holds the information of an abbrev. */
|
|
|
|
|
struct abbrev_info
|
|
|
|
|
{
|
|
|
|
|
unsigned int number; /* number identifying abbrev */
|
|
|
|
|
enum dwarf_tag tag; /* dwarf tag */
|
2004-03-09 17:57:44 +01:00
|
|
|
|
unsigned short has_children; /* boolean */
|
|
|
|
|
unsigned short num_attrs; /* number of attributes */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct attr_abbrev *attrs; /* an array of attribute descriptions */
|
|
|
|
|
struct abbrev_info *next; /* next in chain */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct attr_abbrev
|
|
|
|
|
{
|
|
|
|
|
enum dwarf_attribute name;
|
|
|
|
|
enum dwarf_form form;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This data structure holds a complete die structure. */
|
|
|
|
|
struct die_info
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
enum dwarf_tag tag; /* Tag indicating type of die */
|
|
|
|
|
unsigned int abbrev; /* Abbrev number */
|
|
|
|
|
unsigned int offset; /* Offset in .debug_info section */
|
|
|
|
|
unsigned int num_attrs; /* Number of attributes */
|
|
|
|
|
struct attribute *attrs; /* An array of attributes */
|
|
|
|
|
struct die_info *next_ref; /* Next die in ref hash table */
|
2003-10-02 19:13:16 +02:00
|
|
|
|
|
|
|
|
|
/* The dies in a compilation unit form an n-ary tree. PARENT
|
|
|
|
|
points to this die's parent; CHILD points to the first child of
|
|
|
|
|
this node; and all the children of a given node are chained
|
|
|
|
|
together via their SIBLING fields, terminated by a die whose
|
|
|
|
|
tag is zero. */
|
2003-10-01 00:29:28 +02:00
|
|
|
|
struct die_info *child; /* Its first child, if any. */
|
|
|
|
|
struct die_info *sibling; /* Its next sibling, if any. */
|
|
|
|
|
struct die_info *parent; /* Its parent, if any. */
|
2003-10-02 19:13:16 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct type *type; /* Cached type information */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Attributes have a name and a value */
|
|
|
|
|
struct attribute
|
|
|
|
|
{
|
|
|
|
|
enum dwarf_attribute name;
|
|
|
|
|
enum dwarf_form form;
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
char *str;
|
|
|
|
|
struct dwarf_block *blk;
|
2000-06-15 01:29:06 +02:00
|
|
|
|
unsigned long unsnd;
|
|
|
|
|
long int snd;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
}
|
|
|
|
|
u;
|
|
|
|
|
};
|
|
|
|
|
|
2002-04-05 00:26:43 +02:00
|
|
|
|
struct function_range
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
CORE_ADDR lowpc, highpc;
|
|
|
|
|
int seen_line;
|
|
|
|
|
struct function_range *next;
|
|
|
|
|
};
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Get at parts of an attribute structure */
|
|
|
|
|
|
|
|
|
|
#define DW_STRING(attr) ((attr)->u.str)
|
|
|
|
|
#define DW_UNSND(attr) ((attr)->u.unsnd)
|
|
|
|
|
#define DW_BLOCK(attr) ((attr)->u.blk)
|
|
|
|
|
#define DW_SND(attr) ((attr)->u.snd)
|
|
|
|
|
#define DW_ADDR(attr) ((attr)->u.addr)
|
|
|
|
|
|
|
|
|
|
/* Blocks are a bunch of untyped bytes. */
|
|
|
|
|
struct dwarf_block
|
|
|
|
|
{
|
|
|
|
|
unsigned int size;
|
|
|
|
|
char *data;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#ifndef ATTR_ALLOC_CHUNK
|
|
|
|
|
#define ATTR_ALLOC_CHUNK 4
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* A hash table of die offsets for following references. */
|
|
|
|
|
#ifndef REF_HASH_SIZE
|
|
|
|
|
#define REF_HASH_SIZE 1021
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static struct die_info *die_ref_table[REF_HASH_SIZE];
|
|
|
|
|
|
|
|
|
|
/* Allocate fields for structs, unions and enums in this size. */
|
|
|
|
|
#ifndef DW_FIELD_ALLOC_CHUNK
|
|
|
|
|
#define DW_FIELD_ALLOC_CHUNK 4
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* A zeroed version of a partial die for initialization purposes. */
|
|
|
|
|
static struct partial_die_info zeroed_partial_die;
|
|
|
|
|
|
1999-04-26 20:34:20 +02:00
|
|
|
|
/* FIXME: decode_locdesc sets these variables to describe the location
|
|
|
|
|
to the caller. These ought to be a structure or something. If
|
|
|
|
|
none of the flags are set, the object lives at the address returned
|
|
|
|
|
by decode_locdesc. */
|
|
|
|
|
|
|
|
|
|
static int isreg; /* Object lives in register.
|
|
|
|
|
decode_locdesc's return value is
|
|
|
|
|
the register number. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* We put a pointer to this structure in the read_symtab_private field
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
of the psymtab. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct dwarf2_pinfo
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
/* Offset in .debug_info for this compilation unit. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
unsigned long dwarf_info_offset;
|
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#define PST_PRIVATE(p) ((struct dwarf2_pinfo *)(p)->read_symtab_private)
|
|
|
|
|
#define DWARF_INFO_OFFSET(p) (PST_PRIVATE(p)->dwarf_info_offset)
|
|
|
|
|
|
|
|
|
|
/* FIXME: We might want to set this from BFD via bfd_arch_bits_per_byte,
|
|
|
|
|
but this would require a corresponding change in unpack_field_as_long
|
|
|
|
|
and friends. */
|
|
|
|
|
static int bits_per_byte = 8;
|
|
|
|
|
|
|
|
|
|
/* The routines that read and process dies for a C struct or C++ class
|
|
|
|
|
pass lists of data member fields and lists of member function fields
|
|
|
|
|
in an instance of a field_info structure, as defined below. */
|
|
|
|
|
struct field_info
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
/* List of data member and baseclasses fields. */
|
|
|
|
|
struct nextfield
|
|
|
|
|
{
|
|
|
|
|
struct nextfield *next;
|
|
|
|
|
int accessibility;
|
|
|
|
|
int virtuality;
|
|
|
|
|
struct field field;
|
|
|
|
|
}
|
|
|
|
|
*fields;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Number of fields. */
|
|
|
|
|
int nfields;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Number of baseclasses. */
|
|
|
|
|
int nbaseclasses;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Set if the accesibility of one of the fields is not public. */
|
|
|
|
|
int non_public_fields;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Member function fields array, entries are allocated in the order they
|
|
|
|
|
are encountered in the object file. */
|
|
|
|
|
struct nextfnfield
|
|
|
|
|
{
|
|
|
|
|
struct nextfnfield *next;
|
|
|
|
|
struct fn_field fnfield;
|
|
|
|
|
}
|
|
|
|
|
*fnfields;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Member function fieldlist array, contains name of possibly overloaded
|
|
|
|
|
member function, number of overloaded member functions and a pointer
|
|
|
|
|
to the head of the member function field chain. */
|
|
|
|
|
struct fnfieldlist
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
int length;
|
|
|
|
|
struct nextfnfield *head;
|
|
|
|
|
}
|
|
|
|
|
*fnfieldlists;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Number of entries in the fnfieldlists array. */
|
|
|
|
|
int nfnfields;
|
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Various complaints about symbol reading that don't abort the process */
|
|
|
|
|
|
2002-12-11 21:55:37 +01:00
|
|
|
|
static void
|
|
|
|
|
dwarf2_statement_list_fits_in_line_number_section_complaint (void)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"statement list doesn't fit in .debug_line section");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_complex_location_expr_complaint (void)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "location expression too complex");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_const_value_length_mismatch_complaint (const char *arg1, int arg2,
|
|
|
|
|
int arg3)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"const value length mismatch for '%s', got %d, expected %d", arg1,
|
|
|
|
|
arg2, arg3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_macros_too_long_complaint (void)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"macro info runs off end of `.debug_macinfo' section");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_macro_malformed_definition_complaint (const char *arg1)
|
2002-07-12 21:55:10 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"macro debug info contains a malformed macro definition:\n`%s'",
|
|
|
|
|
arg1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_invalid_attrib_class_complaint (const char *arg1, const char *arg2)
|
2002-10-16 22:50:22 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"invalid attribute class or form for '%s' in '%s'", arg1, arg2);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
|
|
2003-01-18 Andrew Cagney <ac131313@redhat.com>
* ada-valprint.c: Eliminate PTR.
* breakpoint.c, corelow.c, cris-tdep.c, dbxread.c: Ditto.
* defs.h, dve3900-rom.c, dwarf2read.c, dwarfread.c: Ditto.
* exec.c, hppa-tdep.c, hpread.c, infcmd.c, mdebugread.c: Ditto.
* objfiles.c, objfiles.h, ocd.c, remote-es.c: Ditto.
* remote-mips.c, remote-sds.c, remote-vx.c: Ditto.
* solib-svr4.c, solib.c, stack.c, symfile.c, symfile.h: Ditto.
* symmisc.c, v850ice.c, xcoffread.c, cli/cli-script.c: Ditto.
2003-01-18 16:55:53 +01:00
|
|
|
|
static void dwarf2_locate_sections (bfd *, asection *, void *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#if 0
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_build_psymtabs_easy (struct objfile *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
static void dwarf2_create_include_psymtab (char *, struct partial_symtab *,
|
|
|
|
|
struct objfile *);
|
|
|
|
|
|
|
|
|
|
static void dwarf2_build_include_psymtabs (struct dwarf2_cu *,
|
|
|
|
|
struct partial_die_info *,
|
|
|
|
|
struct partial_symtab *);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_build_psymtabs_hard (struct objfile *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void scan_partial_symbols (struct partial_die_info *,
|
|
|
|
|
CORE_ADDR *, CORE_ADDR *,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void add_partial_symbol (struct partial_die_info *,
|
|
|
|
|
struct dwarf2_cu *);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static int pdi_needs_namespace (enum dwarf_tag tag);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void add_partial_namespace (struct partial_die_info *pdi,
|
|
|
|
|
CORE_ADDR *lowpc, CORE_ADDR *highpc,
|
|
|
|
|
struct dwarf2_cu *cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void add_partial_enumeration (struct partial_die_info *enum_pdi,
|
|
|
|
|
struct dwarf2_cu *cu);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
|
|
|
|
static char *locate_pdi_sibling (struct partial_die_info *orig_pdi,
|
|
|
|
|
char *info_ptr,
|
|
|
|
|
bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_psymtab_to_symtab (struct partial_symtab *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void psymtab_to_symtab_1 (struct partial_symtab *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
char *dwarf2_read_section (struct objfile *, asection *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void dwarf2_read_abbrevs (bfd *abfd, struct dwarf2_cu *cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
static void dwarf2_free_abbrev_table (void *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static struct abbrev_info *peek_die_abbrev (char *, int *, struct dwarf2_cu *);
|
|
|
|
|
|
2002-10-09 06:43:49 +02:00
|
|
|
|
static struct abbrev_info *dwarf2_lookup_abbrev (unsigned int,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static struct partial_die_info *load_partial_dies (bfd *, char *, int,
|
|
|
|
|
struct dwarf2_cu *);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *read_partial_die (struct partial_die_info *,
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct abbrev_info *abbrev, unsigned int,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *, char *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static struct partial_die_info *find_partial_die (unsigned long,
|
|
|
|
|
struct dwarf2_cu *,
|
|
|
|
|
struct dwarf2_cu **);
|
|
|
|
|
|
|
|
|
|
static void fixup_partial_die (struct partial_die_info *,
|
|
|
|
|
struct dwarf2_cu *);
|
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
static char *read_full_die (struct die_info **, bfd *, char *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *, int *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *read_attribute (struct attribute *, struct attr_abbrev *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *, char *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-11-29 14:19:06 +01:00
|
|
|
|
static char *read_attribute_value (struct attribute *, unsigned,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *, char *, struct dwarf2_cu *);
|
2001-11-29 14:19:06 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static unsigned int read_1_byte (bfd *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int read_1_signed_byte (bfd *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static unsigned int read_2_bytes (bfd *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static unsigned int read_4_bytes (bfd *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static unsigned long read_8_bytes (bfd *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static CORE_ADDR read_address (bfd *, char *ptr, struct dwarf2_cu *,
|
2000-07-24 03:26:10 +02:00
|
|
|
|
int *bytes_read);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-08-04 18:25:30 +02:00
|
|
|
|
static LONGEST read_initial_length (bfd *, char *,
|
|
|
|
|
struct comp_unit_head *, int *bytes_read);
|
|
|
|
|
|
|
|
|
|
static LONGEST read_offset (bfd *, char *, const struct comp_unit_head *,
|
|
|
|
|
int *bytes_read);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *read_n_bytes (bfd *, char *, unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *read_string (bfd *, char *, unsigned int *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-11-17 01:08:10 +01:00
|
|
|
|
static char *read_indirect_string (bfd *, char *, const struct comp_unit_head *,
|
|
|
|
|
unsigned int *);
|
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static unsigned long read_unsigned_leb128 (bfd *, char *, unsigned int *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static long read_signed_leb128 (bfd *, char *, unsigned int *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
static char *skip_leb128 (bfd *, char *);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static void set_cu_language (unsigned int, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static struct attribute *dwarf2_attr (struct die_info *, unsigned int,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-04-19 20:12:00 +02:00
|
|
|
|
static int dwarf2_flag_true_p (struct die_info *die, unsigned name,
|
|
|
|
|
struct dwarf2_cu *cu);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static int die_is_declaration (struct die_info *, struct dwarf2_cu *cu);
|
2000-02-14 05:37:06 +01:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static struct die_info *die_specification (struct die_info *die,
|
|
|
|
|
struct dwarf2_cu *);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
static void free_line_header (struct line_header *lh);
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
static void add_file_name (struct line_header *, char *, unsigned int,
|
|
|
|
|
unsigned int, unsigned int);
|
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
static struct line_header *(dwarf_decode_line_header
|
|
|
|
|
(unsigned int offset,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *abfd, struct dwarf2_cu *cu));
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
static void dwarf_decode_lines (struct line_header *, char *, bfd *,
|
2004-05-03 18:21:51 +02:00
|
|
|
|
struct dwarf2_cu *, struct partial_symtab *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_start_subfile (char *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct symbol *new_symbol (struct die_info *, struct type *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_const_value (struct attribute *, struct symbol *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
static void dwarf2_const_value_data (struct attribute *attr,
|
|
|
|
|
struct symbol *sym,
|
|
|
|
|
int bits);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static struct type *die_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static struct type *die_containing_type (struct die_info *,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#if 0
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *type_at_offset (unsigned int, struct objfile *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static struct type *tag_type_to_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_type_die (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-28 05:02:52 +01:00
|
|
|
|
static char *determine_prefix (struct die_info *die, struct dwarf2_cu *);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
static char *typename_concat (const char *prefix, const char *suffix);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_typedef (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_base_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-17 06:35:47 +01:00
|
|
|
|
static void read_subrange_type (struct die_info *die, struct dwarf2_cu *cu);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_file_scope (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_func_scope (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_lexical_block_scope (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int dwarf2_get_pc_bounds (struct die_info *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
CORE_ADDR *, CORE_ADDR *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-22 20:56:54 +01:00
|
|
|
|
static void get_scope_pc_bounds (struct die_info *,
|
|
|
|
|
CORE_ADDR *, CORE_ADDR *,
|
|
|
|
|
struct dwarf2_cu *);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_add_field (struct field_info *, struct die_info *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_attach_fields_to_type (struct field_info *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct type *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_add_member_fn (struct field_info *,
|
2002-09-03 19:32:11 +02:00
|
|
|
|
struct die_info *, struct type *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void dwarf2_attach_fn_fields_to_type (struct field_info *,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct type *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
static void read_structure_type (struct die_info *, struct dwarf2_cu *);
|
|
|
|
|
|
|
|
|
|
static void process_structure_scope (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-15 23:33:52 +01:00
|
|
|
|
static char *determine_class_name (struct die_info *die, struct dwarf2_cu *cu);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_common_block (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_namespace (struct die_info *die, struct dwarf2_cu *);
|
2002-10-23 18:40:55 +02:00
|
|
|
|
|
2004-01-09 23:22:07 +01:00
|
|
|
|
static const char *namespace_name (struct die_info *die,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
int *is_anonymous, struct dwarf2_cu *);
|
2004-01-09 23:22:07 +01:00
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
static void read_enumeration_type (struct die_info *, struct dwarf2_cu *);
|
|
|
|
|
|
|
|
|
|
static void process_enumeration_scope (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static struct type *dwarf_base_type (int, int, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static CORE_ADDR decode_locdesc (struct dwarf_block *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_array_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_pointer_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_ptr_to_member_type (struct die_info *,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_reference_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_const_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_volatile_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_tag_string_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void read_subroutine_type (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static struct die_info *read_comp_unit (char *, bfd *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
static struct die_info *read_die_and_children (char *info_ptr, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
char **new_info_ptr,
|
|
|
|
|
struct die_info *parent);
|
|
|
|
|
|
|
|
|
|
static struct die_info *read_die_and_siblings (char *info_ptr, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
char **new_info_ptr,
|
|
|
|
|
struct die_info *parent);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void free_die_list (struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-22 11:02:23 +02:00
|
|
|
|
static struct cleanup *make_cleanup_free_die_list (struct die_info *);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
static void process_die (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static char *dwarf2_linkage_name (struct die_info *, struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static char *dwarf2_name (struct die_info *die, struct dwarf2_cu *);
|
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 01:07:11 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static struct die_info *dwarf2_extension (struct die_info *die,
|
|
|
|
|
struct dwarf2_cu *);
|
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 01:07:11 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_tag_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_attr_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_form_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_stack_op_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_bool_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_type_encoding_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#if 0
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *dwarf_cfi_name (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
struct die_info *copy_die (struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static struct die_info *sibling_die (struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void dump_die (struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void dump_die_list (struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void store_in_ref_table (unsigned int, struct die_info *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-07-18 09:47:02 +02:00
|
|
|
|
static void dwarf2_empty_hash_tables (void);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static unsigned int dwarf2_get_ref_die_offset (struct attribute *,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-17 06:35:47 +01:00
|
|
|
|
static int dwarf2_get_attr_constant_value (struct attribute *, int);
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static struct die_info *follow_die_ref (unsigned int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static struct type *dwarf2_fundamental_type (struct objfile *, int,
|
|
|
|
|
struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* memory allocation interface */
|
|
|
|
|
|
2004-04-19 20:20:50 +02:00
|
|
|
|
static struct dwarf_block *dwarf_alloc_block (struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
static struct abbrev_info *dwarf_alloc_abbrev (struct dwarf2_cu *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct die_info *dwarf_alloc_die (void);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static void initialize_cu_func_list (struct dwarf2_cu *);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
static void add_to_cu_func_list (const char *, CORE_ADDR, CORE_ADDR,
|
|
|
|
|
struct dwarf2_cu *);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
2002-05-16 23:00:14 +02:00
|
|
|
|
static void dwarf_decode_macros (struct line_header *, unsigned int,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
char *, bfd *, struct dwarf2_cu *);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
2002-07-12 21:55:10 +02:00
|
|
|
|
static int attr_form_is_block (struct attribute *);
|
|
|
|
|
|
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 16:24:18 +01:00
|
|
|
|
static void
|
|
|
|
|
dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu);
|
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 16:24:18 +01:00
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
static char *skip_one_die (char *info_ptr, struct abbrev_info *abbrev,
|
|
|
|
|
struct dwarf2_cu *cu);
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void free_stack_comp_unit (void *);
|
|
|
|
|
|
|
|
|
|
static void *hashtab_obstack_allocate (void *data, size_t size, size_t count);
|
|
|
|
|
|
|
|
|
|
static void dummy_obstack_deallocate (void *object, void *data);
|
|
|
|
|
|
|
|
|
|
static hashval_t partial_die_hash (const void *item);
|
|
|
|
|
|
|
|
|
|
static int partial_die_eq (const void *item_lhs, const void *item_rhs);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Try to locate the sections we need for DWARF 2 debugging
|
|
|
|
|
information and return true if we have enough to do something. */
|
|
|
|
|
|
|
|
|
|
int
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_has_info (struct objfile *objfile)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
struct dwarf2_per_objfile *data;
|
|
|
|
|
|
|
|
|
|
/* Initialize per-objfile state. */
|
|
|
|
|
data = obstack_alloc (&objfile->objfile_obstack, sizeof (*data));
|
|
|
|
|
memset (data, 0, sizeof (*data));
|
|
|
|
|
set_objfile_data (objfile, dwarf2_objfile_data_key, data);
|
|
|
|
|
dwarf2_per_objfile = data;
|
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
dwarf_info_section = 0;
|
|
|
|
|
dwarf_abbrev_section = 0;
|
|
|
|
|
dwarf_line_section = 0;
|
|
|
|
|
dwarf_str_section = 0;
|
|
|
|
|
dwarf_macinfo_section = 0;
|
|
|
|
|
dwarf_frame_section = 0;
|
|
|
|
|
dwarf_eh_frame_section = 0;
|
|
|
|
|
dwarf_ranges_section = 0;
|
|
|
|
|
dwarf_loc_section = 0;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL);
|
2003-12-02 17:41:39 +01:00
|
|
|
|
return (dwarf_info_section != NULL && dwarf_abbrev_section != NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is mapped across the sections and remembers the
|
|
|
|
|
offset and size of each of the debugging sections we are interested
|
|
|
|
|
in. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-01-18 Andrew Cagney <ac131313@redhat.com>
* ada-valprint.c: Eliminate PTR.
* breakpoint.c, corelow.c, cris-tdep.c, dbxread.c: Ditto.
* defs.h, dve3900-rom.c, dwarf2read.c, dwarfread.c: Ditto.
* exec.c, hppa-tdep.c, hpread.c, infcmd.c, mdebugread.c: Ditto.
* objfiles.c, objfiles.h, ocd.c, remote-es.c: Ditto.
* remote-mips.c, remote-sds.c, remote-vx.c: Ditto.
* solib-svr4.c, solib.c, stack.c, symfile.c, symfile.h: Ditto.
* symmisc.c, v850ice.c, xcoffread.c, cli/cli-script.c: Ditto.
2003-01-18 16:55:53 +01:00
|
|
|
|
dwarf2_locate_sections (bfd *ignore_abfd, asection *sectp, void *ignore_ptr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-11-08 01:13:03 +01:00
|
|
|
|
if (strcmp (sectp->name, INFO_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->info_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_info_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, ABBREV_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->abbrev_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_abbrev_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, LINE_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->line_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_line_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, PUBNAMES_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->pubnames_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_pubnames_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, ARANGES_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->aranges_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_aranges_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, LOC_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->loc_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_loc_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, MACINFO_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->macinfo_size = bfd_get_section_size (sectp);
|
2003-02-04 21:17:02 +01:00
|
|
|
|
dwarf_macinfo_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, STR_SECTION) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->str_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_str_section = sectp;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, FRAME_SECTION) == 0)
|
2001-12-07 13:10:15 +01:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->frame_size = bfd_get_section_size (sectp);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_frame_section = sectp;
|
2001-12-07 13:10:15 +01:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, EH_FRAME_SECTION) == 0)
|
2001-12-07 13:10:15 +01:00
|
|
|
|
{
|
2003-06-26 23:20:39 +02:00
|
|
|
|
flagword aflag = bfd_get_section_flags (ignore_abfd, sectp);
|
|
|
|
|
if (aflag & SEC_HAS_CONTENTS)
|
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->eh_frame_size = bfd_get_section_size (sectp);
|
2003-06-26 23:20:39 +02:00
|
|
|
|
dwarf_eh_frame_section = sectp;
|
|
|
|
|
}
|
2001-12-07 13:10:15 +01:00
|
|
|
|
}
|
2003-11-08 01:13:03 +01:00
|
|
|
|
else if (strcmp (sectp->name, RANGES_SECTION) == 0)
|
2003-01-30 02:51:48 +01:00
|
|
|
|
{
|
2004-06-15 03:04:20 +02:00
|
|
|
|
dwarf2_per_objfile->ranges_size = bfd_get_section_size (sectp);
|
2003-02-01 02:11:22 +01:00
|
|
|
|
dwarf_ranges_section = sectp;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Build a partial symbol table. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* We definitely need the .debug_info and .debug_abbrev sections */
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->info_buffer = dwarf2_read_section (objfile, dwarf_info_section);
|
|
|
|
|
dwarf2_per_objfile->abbrev_buffer = dwarf2_read_section (objfile, dwarf_abbrev_section);
|
2003-12-02 17:41:39 +01:00
|
|
|
|
|
|
|
|
|
if (dwarf_line_section)
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->line_buffer = dwarf2_read_section (objfile, dwarf_line_section);
|
2002-08-20 20:45:30 +02:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->line_buffer = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
if (dwarf_str_section)
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->str_buffer = dwarf2_read_section (objfile, dwarf_str_section);
|
2001-11-17 01:08:10 +01:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->str_buffer = NULL;
|
2001-11-17 01:08:10 +01:00
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
if (dwarf_macinfo_section)
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->macinfo_buffer = dwarf2_read_section (objfile,
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_macinfo_section);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->macinfo_buffer = NULL;
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
if (dwarf_ranges_section)
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->ranges_buffer = dwarf2_read_section (objfile, dwarf_ranges_section);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->ranges_buffer = NULL;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
if (dwarf_loc_section)
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->loc_buffer = dwarf2_read_section (objfile, dwarf_loc_section);
|
2003-04-13 17:43:35 +02:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile->loc_buffer = NULL;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
|
2001-09-05 04:13:11 +02:00
|
|
|
|
if (mainline
|
|
|
|
|
|| (objfile->global_psymbols.size == 0
|
|
|
|
|
&& objfile->static_psymbols.size == 0))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
init_psymbol_list (objfile, 1024);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
if (dwarf_aranges_offset && dwarf_pubnames_offset)
|
|
|
|
|
{
|
1999-09-09 02:02:17 +02:00
|
|
|
|
/* Things are significantly easier if we have .debug_aranges and
|
1999-04-16 03:35:26 +02:00
|
|
|
|
.debug_pubnames sections */
|
|
|
|
|
|
1999-09-09 02:02:17 +02:00
|
|
|
|
dwarf2_build_psymtabs_easy (objfile, mainline);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
/* only test this case for now */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* In this case we have to work a bit harder */
|
1999-09-09 02:02:17 +02:00
|
|
|
|
dwarf2_build_psymtabs_hard (objfile, mainline);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
/* Build the partial symbol table from the information in the
|
|
|
|
|
.debug_pubnames and .debug_aranges sections. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_build_psymtabs_easy (struct objfile *objfile, int mainline)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
|
|
|
|
char *aranges_buffer, *pubnames_buffer;
|
|
|
|
|
char *aranges_ptr, *pubnames_ptr;
|
|
|
|
|
unsigned int entry_length, version, info_offset, info_size;
|
|
|
|
|
|
|
|
|
|
pubnames_buffer = dwarf2_read_section (objfile,
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_pubnames_section);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
pubnames_ptr = pubnames_buffer;
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
while ((pubnames_ptr - pubnames_buffer) < dwarf2_per_objfile->pubnames_size)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-08-04 18:25:30 +02:00
|
|
|
|
struct comp_unit_head cu_header;
|
|
|
|
|
int bytes_read;
|
|
|
|
|
|
|
|
|
|
entry_length = read_initial_length (abfd, pubnames_ptr, &cu_header,
|
|
|
|
|
&bytes_read);
|
|
|
|
|
pubnames_ptr += bytes_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
version = read_1_byte (abfd, pubnames_ptr);
|
|
|
|
|
pubnames_ptr += 1;
|
|
|
|
|
info_offset = read_4_bytes (abfd, pubnames_ptr);
|
|
|
|
|
pubnames_ptr += 4;
|
|
|
|
|
info_size = read_4_bytes (abfd, pubnames_ptr);
|
|
|
|
|
pubnames_ptr += 4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
aranges_buffer = dwarf2_read_section (objfile,
|
2003-01-31 20:22:18 +01:00
|
|
|
|
dwarf_aranges_section);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
/* Read in the comp unit header information from the debug_info at
|
|
|
|
|
info_ptr. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
read_comp_unit_head (struct comp_unit_head *cu_header,
|
|
|
|
|
char *info_ptr, bfd *abfd)
|
|
|
|
|
{
|
|
|
|
|
int signed_addr;
|
2000-08-04 18:25:30 +02:00
|
|
|
|
int bytes_read;
|
|
|
|
|
cu_header->length = read_initial_length (abfd, info_ptr, cu_header,
|
|
|
|
|
&bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
2000-07-24 03:26:10 +02:00
|
|
|
|
cu_header->version = read_2_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 2;
|
2000-08-04 18:25:30 +02:00
|
|
|
|
cu_header->abbrev_offset = read_offset (abfd, info_ptr, cu_header,
|
|
|
|
|
&bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
2000-07-24 03:26:10 +02:00
|
|
|
|
cu_header->addr_size = read_1_byte (abfd, info_ptr);
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
signed_addr = bfd_get_sign_extend_vma (abfd);
|
|
|
|
|
if (signed_addr < 0)
|
2001-02-08 07:03:54 +01:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
"read_comp_unit_head: dwarf from non elf file");
|
2000-07-24 03:26:10 +02:00
|
|
|
|
cu_header->signed_addr_p = signed_addr;
|
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static char *
|
|
|
|
|
partial_read_comp_unit_head (struct comp_unit_head *header, char *info_ptr,
|
|
|
|
|
bfd *abfd)
|
|
|
|
|
{
|
|
|
|
|
char *beg_of_comp_unit = info_ptr;
|
|
|
|
|
|
|
|
|
|
info_ptr = read_comp_unit_head (header, info_ptr, abfd);
|
|
|
|
|
|
|
|
|
|
if (header->version != 2)
|
|
|
|
|
error ("Dwarf Error: wrong version in compilation unit header "
|
|
|
|
|
"(is %d, should be %d) [in module %s]", header->version,
|
|
|
|
|
2, bfd_get_filename (abfd));
|
|
|
|
|
|
|
|
|
|
if (header->abbrev_offset >= dwarf2_per_objfile->abbrev_size)
|
|
|
|
|
error ("Dwarf Error: bad offset (0x%lx) in compilation unit header "
|
|
|
|
|
"(offset 0x%lx + 6) [in module %s]",
|
|
|
|
|
(long) header->abbrev_offset,
|
|
|
|
|
(long) (beg_of_comp_unit - dwarf2_per_objfile->info_buffer),
|
|
|
|
|
bfd_get_filename (abfd));
|
|
|
|
|
|
|
|
|
|
if (beg_of_comp_unit + header->length + header->initial_length_size
|
|
|
|
|
> dwarf2_per_objfile->info_buffer + dwarf2_per_objfile->info_size)
|
|
|
|
|
error ("Dwarf Error: bad length (0x%lx) in compilation unit header "
|
|
|
|
|
"(offset 0x%lx + 0) [in module %s]",
|
|
|
|
|
(long) header->length,
|
|
|
|
|
(long) (beg_of_comp_unit - dwarf2_per_objfile->info_buffer),
|
|
|
|
|
bfd_get_filename (abfd));
|
|
|
|
|
|
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
/* Allocate a new partial symtab for file named NAME and mark this new
|
|
|
|
|
partial symtab as being an include of PST. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_create_include_psymtab (char *name, struct partial_symtab *pst,
|
|
|
|
|
struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
struct partial_symtab *subpst = allocate_psymtab (name, objfile);
|
|
|
|
|
|
|
|
|
|
subpst->section_offsets = pst->section_offsets;
|
|
|
|
|
subpst->textlow = 0;
|
|
|
|
|
subpst->texthigh = 0;
|
|
|
|
|
|
|
|
|
|
subpst->dependencies = (struct partial_symtab **)
|
|
|
|
|
obstack_alloc (&objfile->objfile_obstack,
|
|
|
|
|
sizeof (struct partial_symtab *));
|
|
|
|
|
subpst->dependencies[0] = pst;
|
|
|
|
|
subpst->number_of_dependencies = 1;
|
|
|
|
|
|
|
|
|
|
subpst->globals_offset = 0;
|
|
|
|
|
subpst->n_global_syms = 0;
|
|
|
|
|
subpst->statics_offset = 0;
|
|
|
|
|
subpst->n_static_syms = 0;
|
|
|
|
|
subpst->symtab = NULL;
|
|
|
|
|
subpst->read_symtab = pst->read_symtab;
|
|
|
|
|
subpst->readin = 0;
|
|
|
|
|
|
|
|
|
|
/* No private part is necessary for include psymtabs. This property
|
|
|
|
|
can be used to differentiate between such include psymtabs and
|
|
|
|
|
the regular ones. If it ever happens that a regular psymtab can
|
2004-05-04 02:11:25 +02:00
|
|
|
|
legitimally have a NULL private part, then we'll have to add a
|
2004-05-03 18:21:51 +02:00
|
|
|
|
dedicated field for that in the dwarf2_pinfo structure. */
|
2004-05-04 02:11:25 +02:00
|
|
|
|
subpst->read_symtab_private = NULL;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the Line Number Program data and extract the list of files
|
|
|
|
|
included by the source file represented by PST. Build an include
|
|
|
|
|
partial symtab for each of these included files.
|
|
|
|
|
|
|
|
|
|
This procedure assumes that there *is* a Line Number Program in
|
|
|
|
|
the given CU. Callers should check that PDI->HAS_STMT_LIST is set
|
|
|
|
|
before calling this procedure. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
|
|
|
|
|
struct partial_die_info *pdi,
|
|
|
|
|
struct partial_symtab *pst)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
|
|
|
|
struct line_header *lh;
|
|
|
|
|
|
|
|
|
|
lh = dwarf_decode_line_header (pdi->line_offset, abfd, cu);
|
|
|
|
|
if (lh == NULL)
|
|
|
|
|
return; /* No linetable, so no includes. */
|
|
|
|
|
|
|
|
|
|
dwarf_decode_lines (lh, NULL, abfd, cu, pst);
|
|
|
|
|
|
|
|
|
|
free_line_header (lh);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Build the partial symbol table by doing a quick pass through the
|
|
|
|
|
.debug_info and .debug_abbrev sections. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_build_psymtabs_hard (struct objfile *objfile, int mainline)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* Instead of reading this into a big buffer, we should probably use
|
|
|
|
|
mmap() on architectures that support it. (FIXME) */
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
char *info_ptr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char *beg_of_comp_unit;
|
|
|
|
|
struct partial_die_info comp_unit_die;
|
|
|
|
|
struct partial_symtab *pst;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR lowpc, highpc, baseaddr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
info_ptr = dwarf2_per_objfile->info_buffer;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
/* Since the objects we're extracting from .debug_info vary in
|
2001-07-05 18:45:48 +02:00
|
|
|
|
length, only the individual functions to extract them (like
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
read_comp_unit_head and load_partial_die) can really know whether
|
2001-07-05 18:45:48 +02:00
|
|
|
|
the buffer is large enough to hold another complete object.
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
At the moment, they don't actually check that. If .debug_info
|
|
|
|
|
holds just one extra byte after the last compilation unit's dies,
|
|
|
|
|
then read_comp_unit_head will happily read off the end of the
|
|
|
|
|
buffer. read_partial_die is similarly casual. Those functions
|
|
|
|
|
should be fixed.
|
2001-07-05 18:45:48 +02:00
|
|
|
|
|
|
|
|
|
For this loop condition, simply checking whether there's any data
|
|
|
|
|
left at all should be sufficient. */
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
while (info_ptr < (dwarf2_per_objfile->info_buffer
|
|
|
|
|
+ dwarf2_per_objfile->info_size))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-03-09 17:57:44 +01:00
|
|
|
|
struct cleanup *back_to_inner;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu cu;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
struct dwarf2_per_cu_data *this_cu;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
beg_of_comp_unit = info_ptr;
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
memset (&cu, 0, sizeof (cu));
|
|
|
|
|
|
|
|
|
|
obstack_init (&cu.comp_unit_obstack);
|
|
|
|
|
|
|
|
|
|
back_to_inner = make_cleanup (free_stack_comp_unit, &cu);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.objfile = objfile;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
info_ptr = partial_read_comp_unit_head (&cu.header, info_ptr, abfd);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
|
2002-10-09 06:43:49 +02:00
|
|
|
|
/* Complete the cu_header */
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
cu.header.offset = beg_of_comp_unit - dwarf2_per_objfile->info_buffer;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.header.first_die_ptr = info_ptr;
|
|
|
|
|
cu.header.cu_head_ptr = beg_of_comp_unit;
|
2002-10-09 06:43:49 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu.list_in_scope = &file_symbols;
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
cu.partial_dies = NULL;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read the abbrevs for this compilation unit into a table */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_read_abbrevs (abfd, &cu);
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
make_cleanup (dwarf2_free_abbrev_table, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Read the compilation unit die */
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
abbrev = peek_die_abbrev (info_ptr, &bytes_read, &cu);
|
|
|
|
|
info_ptr = read_partial_die (&comp_unit_die, abbrev, bytes_read,
|
|
|
|
|
abfd, info_ptr, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Set the language we're debugging */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
set_cu_language (comp_unit_die.language, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Allocate a new partial symbol table structure */
|
1999-09-09 02:02:17 +02:00
|
|
|
|
pst = start_psymtab_common (objfile, objfile->section_offsets,
|
1999-08-09 23:36:23 +02:00
|
|
|
|
comp_unit_die.name ? comp_unit_die.name : "",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
comp_unit_die.lowpc,
|
|
|
|
|
objfile->global_psymbols.next,
|
|
|
|
|
objfile->static_psymbols.next);
|
|
|
|
|
|
2004-06-10 22:05:45 +02:00
|
|
|
|
if (comp_unit_die.dirname)
|
|
|
|
|
pst->dirname = xstrdup (comp_unit_die.dirname);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
pst->read_symtab_private = (char *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* dbxread.c (dbx_symfile_init, start_psymtab, end_psymtab,
coffstab_build_psymtabs, elfstab_build_psymtabs)
(stabsect_build_psymtabs): Replace psymbol_obstack with
objfile_obstack.
* dwarf2-frame.c (decode_frame_entry_1): Ditto.
* dwarf2read.c (dwarf2_build_psymtabs_hard, dwarf2_read_section):
Ditto.
* dwarfread.c (scan_compilation_units): Ditto.
* elfread.c (elfstab_offset_sections): Ditto.
* hppa-tdep.c (read_unwind_info): Ditto.
* hpread.c (hpread_build_psymtabs, hpread_start_psymtab)
(hpread_end_psymtab): Ditto.
* mdebugread.c (mdebug_build_psymtabs, add_pending)
(parse_partial_symbols, new_psymtab, elfmdebug_build_psymtabs):
Ditto.
* mips-tdep.c (non_heuristic_proc_desc): Ditto.
* objfiles.c (add_to_objfile_sections)
(build_objfile_section_table): Ditto.
(allocate_objfile): Remove init of psymbol_obstack.
(free_objfile): Remove freeing of psymbol_obstack.
* objfiles.h (struct objfile): Remove field
psymbol_obstack. Update comments.
* pa64solib.c (pa64_solib_add_solib_objfile): Replace
psymbol_obstack with objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
psymbol_obstack.
* somread.c (som_symfile_offsets, init_import_symbols)
(init_export_symbols): Replace psymbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add_solib_objfile): Ditto.
* symfile.c (default_symfile_offsets, syms_from_objfile)
(reread_symbols): Remove freeing and init of psymbol_obstack.
(cashier_psymtab): Update comment.
* symmisc.c (print_objfile_statistics): Don't report stats for
psymbol obstack.
* symtab.h (struct general_symbol_info, struct partial_symtab):
Update comments.
* xcoffread.c (xcoff_start_psymtab, xcoff_end_psymtab, swap_sym)
(xcoff_symfile_offsets): Replace psymbol_obstack with
objfile_obstack.
2004-02-07 19:29:54 +01:00
|
|
|
|
obstack_alloc (&objfile->objfile_obstack, sizeof (struct dwarf2_pinfo));
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
DWARF_INFO_OFFSET (pst) = beg_of_comp_unit - dwarf2_per_objfile->info_buffer;
|
2000-08-04 18:25:30 +02:00
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Store the function that reads in the rest of the symbol table */
|
|
|
|
|
pst->read_symtab = dwarf2_psymtab_to_symtab;
|
|
|
|
|
|
|
|
|
|
/* Check if comp unit has_children.
|
|
|
|
|
If so, read the rest of the partial symbols from this comp unit.
|
|
|
|
|
If not, there's no more debug_info for this comp unit. */
|
|
|
|
|
if (comp_unit_die.has_children)
|
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct partial_die_info *first_die;
|
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
lowpc = ((CORE_ADDR) -1);
|
|
|
|
|
highpc = ((CORE_ADDR) 0);
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
first_die = load_partial_dies (abfd, info_ptr, 1, &cu);
|
|
|
|
|
|
|
|
|
|
scan_partial_symbols (first_die, &lowpc, &highpc, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
/* If we didn't find a lowpc, set it to highpc to avoid
|
|
|
|
|
complaints from `maint check'. */
|
|
|
|
|
if (lowpc == ((CORE_ADDR) -1))
|
|
|
|
|
lowpc = highpc;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* If the compilation unit didn't have an explicit address range,
|
|
|
|
|
then use the information extracted from its child dies. */
|
2001-07-04 18:08:20 +02:00
|
|
|
|
if (! comp_unit_die.has_pc_info)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
comp_unit_die.lowpc = lowpc;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
comp_unit_die.highpc = highpc;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
pst->textlow = comp_unit_die.lowpc + baseaddr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
pst->texthigh = comp_unit_die.highpc + baseaddr;
|
|
|
|
|
|
|
|
|
|
pst->n_global_syms = objfile->global_psymbols.next -
|
|
|
|
|
(objfile->global_psymbols.list + pst->globals_offset);
|
|
|
|
|
pst->n_static_syms = objfile->static_psymbols.next -
|
|
|
|
|
(objfile->static_psymbols.list + pst->statics_offset);
|
|
|
|
|
sort_pst_symbols (pst);
|
|
|
|
|
|
|
|
|
|
/* If there is already a psymtab or symtab for a file of this
|
|
|
|
|
name, remove it. (If there is a symtab, more drastic things
|
|
|
|
|
also happen.) This happens in VxWorks. */
|
|
|
|
|
free_named_symtabs (pst->filename);
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (comp_unit_die.has_stmt_list)
|
|
|
|
|
{
|
|
|
|
|
/* Get the list of files included in the current compilation unit,
|
|
|
|
|
and build a psymtab for each of them. */
|
|
|
|
|
dwarf2_build_include_psymtabs (&cu, &comp_unit_die, pst);
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
info_ptr = beg_of_comp_unit + cu.header.length
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
+ cu.header.initial_length_size;
|
2004-03-09 17:57:44 +01:00
|
|
|
|
|
|
|
|
|
do_cleanups (back_to_inner);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Process all loaded DIEs for compilation unit CU, starting at FIRST_DIE.
|
|
|
|
|
Also set *LOWPC and *HIGHPC to the lowest and highest PC values found
|
|
|
|
|
in CU. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void
|
|
|
|
|
scan_partial_symbols (struct partial_die_info *first_die, CORE_ADDR *lowpc,
|
|
|
|
|
CORE_ADDR *highpc, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
bfd *abfd = objfile->obfd;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct partial_die_info *pdi;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
/* Now, march along the PDI's, descending into ones which have
|
|
|
|
|
interesting children but skipping the children of the other ones,
|
|
|
|
|
until we reach the end of the compilation unit. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
pdi = first_die;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
while (pdi != NULL)
|
|
|
|
|
{
|
|
|
|
|
fixup_partial_die (pdi, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
/* Anonymous namespaces have no name but have interesting
|
|
|
|
|
children, so we need to look at them. Ditto for anonymous
|
|
|
|
|
enums. */
|
2002-11-25 23:01:39 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (pdi->name != NULL || pdi->tag == DW_TAG_namespace
|
|
|
|
|
|| pdi->tag == DW_TAG_enumeration_type)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
switch (pdi->tag)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
case DW_TAG_subprogram:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (pdi->has_pc_info)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (pdi->lowpc < *lowpc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
*lowpc = pdi->lowpc;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (pdi->highpc > *highpc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
*highpc = pdi->highpc;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (!pdi->is_declaration)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_variable:
|
|
|
|
|
case DW_TAG_typedef:
|
2003-09-10 01:23:05 +02:00
|
|
|
|
case DW_TAG_union_type:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (!pdi->is_declaration)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (!pdi->is_declaration)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
case DW_TAG_enumeration_type:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (!pdi->is_declaration)
|
|
|
|
|
add_partial_enumeration (pdi, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_base_type:
|
2004-01-17 06:35:47 +01:00
|
|
|
|
case DW_TAG_subrange_type:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* File scope base type definitions are added to the partial
|
1999-07-07 22:19:36 +02:00
|
|
|
|
symbol table. */
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2002-10-23 18:40:55 +02:00
|
|
|
|
case DW_TAG_namespace:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_namespace (pdi, lowpc, highpc, cu);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* If the die has a sibling, skip to the sibling. */
|
|
|
|
|
|
|
|
|
|
pdi = pdi->die_sibling;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Functions used to compute the fully scoped name of a partial DIE.
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
Normally, this is simple. For C++, the parent DIE's fully scoped
|
|
|
|
|
name is concatenated with "::" and the partial DIE's name.
|
|
|
|
|
Enumerators are an exception; they use the scope of their parent
|
|
|
|
|
enumeration type, i.e. the name of the enumeration type is not
|
|
|
|
|
prepended to the enumerator.
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
There are two complexities. One is DW_AT_specification; in this
|
|
|
|
|
case "parent" means the parent of the target of the specification,
|
|
|
|
|
instead of the direct parent of the DIE. The other is compilers
|
|
|
|
|
which do not emit DW_TAG_namespace; in this case we try to guess
|
|
|
|
|
the fully qualified name of structure types from their members'
|
|
|
|
|
linkage names. This must be done using the DIE's children rather
|
|
|
|
|
than the children of any DW_AT_specification target. We only need
|
|
|
|
|
to do this for structures at the top level, i.e. if the target of
|
|
|
|
|
any DW_AT_specification (if any; otherwise the DIE itself) does not
|
|
|
|
|
have a parent. */
|
|
|
|
|
|
|
|
|
|
/* Compute the scope prefix associated with PDI's parent, in
|
|
|
|
|
compilation unit CU. The result will be allocated on CU's
|
|
|
|
|
comp_unit_obstack, or a copy of the already allocated PDI->NAME
|
|
|
|
|
field. NULL is returned if no prefix is necessary. */
|
|
|
|
|
static char *
|
|
|
|
|
partial_die_parent_scope (struct partial_die_info *pdi,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
char *grandparent_scope;
|
|
|
|
|
struct partial_die_info *parent, *real_pdi;
|
|
|
|
|
struct dwarf2_cu *spec_cu;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* We need to look at our parent DIE; if we have a DW_AT_specification,
|
|
|
|
|
then this means the parent of the specification DIE. */
|
|
|
|
|
|
|
|
|
|
real_pdi = pdi;
|
|
|
|
|
spec_cu = cu;
|
|
|
|
|
while (real_pdi->has_specification)
|
|
|
|
|
real_pdi = find_partial_die (real_pdi->spec_offset, spec_cu, &spec_cu);
|
|
|
|
|
|
|
|
|
|
parent = real_pdi->die_parent;
|
|
|
|
|
if (parent == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (parent->scope_set)
|
|
|
|
|
return parent->scope;
|
|
|
|
|
|
|
|
|
|
fixup_partial_die (parent, cu);
|
|
|
|
|
|
|
|
|
|
grandparent_scope = partial_die_parent_scope (parent, spec_cu);
|
|
|
|
|
|
|
|
|
|
if (parent->tag == DW_TAG_namespace
|
|
|
|
|
|| parent->tag == DW_TAG_structure_type
|
|
|
|
|
|| parent->tag == DW_TAG_class_type
|
|
|
|
|
|| parent->tag == DW_TAG_union_type)
|
|
|
|
|
{
|
|
|
|
|
if (grandparent_scope == NULL)
|
|
|
|
|
parent->scope = parent->name;
|
|
|
|
|
else
|
|
|
|
|
parent->scope = obconcat (&cu->comp_unit_obstack, grandparent_scope,
|
|
|
|
|
"::", parent->name);
|
|
|
|
|
}
|
|
|
|
|
else if (parent->tag == DW_TAG_enumeration_type)
|
|
|
|
|
/* Enumerators should not get the name of the enumeration as a prefix. */
|
|
|
|
|
parent->scope = grandparent_scope;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* FIXME drow/2004-04-01: What should we be doing with
|
|
|
|
|
function-local names? For partial symbols, we should probably be
|
|
|
|
|
ignoring them. */
|
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"unhandled containing DIE tag %d for DIE at %d",
|
|
|
|
|
parent->tag, pdi->offset);
|
|
|
|
|
parent->scope = grandparent_scope;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
parent->scope_set = 1;
|
|
|
|
|
return parent->scope;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the fully scoped name associated with PDI, from compilation unit
|
|
|
|
|
CU. The result will be allocated with malloc. */
|
|
|
|
|
static char *
|
|
|
|
|
partial_die_full_name (struct partial_die_info *pdi,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
char *parent_scope;
|
|
|
|
|
|
|
|
|
|
parent_scope = partial_die_parent_scope (pdi, cu);
|
|
|
|
|
if (parent_scope == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
return concat (parent_scope, "::", pdi->name, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR addr = 0;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
char *actual_name;
|
|
|
|
|
const char *my_prefix;
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
const struct partial_symbol *psym = NULL;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
int built_actual_name = 0;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
|
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
actual_name = NULL;
|
|
|
|
|
|
|
|
|
|
if (pdi_needs_namespace (pdi->tag))
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
actual_name = partial_die_full_name (pdi, cu);
|
|
|
|
|
if (actual_name)
|
|
|
|
|
built_actual_name = 1;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (actual_name == NULL)
|
|
|
|
|
actual_name = pdi->name;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
switch (pdi->tag)
|
|
|
|
|
{
|
|
|
|
|
case DW_TAG_subprogram:
|
|
|
|
|
if (pdi->is_external)
|
|
|
|
|
{
|
2004-01-09 23:22:07 +01:00
|
|
|
|
/*prim_record_minimal_symbol (actual_name, pdi->lowpc + baseaddr,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
mst_text, objfile); */
|
2004-01-09 23:22:07 +01:00
|
|
|
|
psym = add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_BLOCK,
|
|
|
|
|
&objfile->global_psymbols,
|
|
|
|
|
0, pdi->lowpc + baseaddr,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-01-09 23:22:07 +01:00
|
|
|
|
/*prim_record_minimal_symbol (actual_name, pdi->lowpc + baseaddr,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
mst_file_text, objfile); */
|
2004-01-09 23:22:07 +01:00
|
|
|
|
psym = add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_BLOCK,
|
|
|
|
|
&objfile->static_psymbols,
|
|
|
|
|
0, pdi->lowpc + baseaddr,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_variable:
|
|
|
|
|
if (pdi->is_external)
|
|
|
|
|
{
|
|
|
|
|
/* Global Variable.
|
|
|
|
|
Don't enter into the minimal symbol tables as there is
|
|
|
|
|
a minimal symbol table entry from the ELF symbols already.
|
|
|
|
|
Enter into partial symbol table if it has a location
|
|
|
|
|
descriptor or a type.
|
|
|
|
|
If the location descriptor is missing, new_symbol will create
|
|
|
|
|
a LOC_UNRESOLVED symbol, the address of the variable will then
|
|
|
|
|
be determined from the minimal symbol table whenever the variable
|
|
|
|
|
is referenced.
|
|
|
|
|
The address for the partial symbol table entry is not
|
|
|
|
|
used by GDB, but it comes in handy for debugging partial symbol
|
|
|
|
|
table building. */
|
|
|
|
|
|
|
|
|
|
if (pdi->locdesc)
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
addr = decode_locdesc (pdi->locdesc, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (pdi->locdesc || pdi->has_type)
|
2004-01-09 23:22:07 +01:00
|
|
|
|
psym = add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_STATIC,
|
|
|
|
|
&objfile->global_psymbols,
|
|
|
|
|
0, addr + baseaddr,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Static Variable. Skip symbols without location descriptors. */
|
|
|
|
|
if (pdi->locdesc == NULL)
|
|
|
|
|
return;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
addr = decode_locdesc (pdi->locdesc, cu);
|
2004-01-09 23:22:07 +01:00
|
|
|
|
/*prim_record_minimal_symbol (actual_name, addr + baseaddr,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
mst_file_data, objfile); */
|
2004-01-09 23:22:07 +01:00
|
|
|
|
psym = add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_STATIC,
|
|
|
|
|
&objfile->static_psymbols,
|
|
|
|
|
0, addr + baseaddr,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_typedef:
|
|
|
|
|
case DW_TAG_base_type:
|
2004-01-17 06:35:47 +01:00
|
|
|
|
case DW_TAG_subrange_type:
|
2004-01-09 23:22:07 +01:00
|
|
|
|
add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_TYPEDEF,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&objfile->static_psymbols,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
0, (CORE_ADDR) 0, cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
case DW_TAG_namespace:
|
|
|
|
|
add_psymbol_to_list (actual_name, strlen (actual_name),
|
|
|
|
|
VAR_DOMAIN, LOC_TYPEDEF,
|
|
|
|
|
&objfile->global_psymbols,
|
|
|
|
|
0, (CORE_ADDR) 0, cu->language, objfile);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
|
case DW_TAG_enumeration_type:
|
|
|
|
|
/* Skip aggregate types without children, these are external
|
1999-07-07 22:19:36 +02:00
|
|
|
|
references. */
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
/* NOTE: carlton/2003-10-07: See comment in new_symbol about
|
|
|
|
|
static vs. global. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (pdi->has_children == 0)
|
|
|
|
|
return;
|
2004-01-09 23:22:07 +01:00
|
|
|
|
add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
STRUCT_DOMAIN, LOC_TYPEDEF,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language == language_cplus
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
? &objfile->global_psymbols
|
|
|
|
|
: &objfile->static_psymbols,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
0, (CORE_ADDR) 0, cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* For C++, these implicitly act as typedefs as well. */
|
2004-01-09 23:22:07 +01:00
|
|
|
|
add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_TYPEDEF,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
&objfile->global_psymbols,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
0, (CORE_ADDR) 0, cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_enumerator:
|
2004-01-09 23:22:07 +01:00
|
|
|
|
add_psymbol_to_list (actual_name, strlen (actual_name),
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
VAR_DOMAIN, LOC_CONST,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language == language_cplus
|
2004-02-21 03:13:35 +01:00
|
|
|
|
? &objfile->global_psymbols
|
|
|
|
|
: &objfile->static_psymbols,
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
0, (CORE_ADDR) 0, cu->language, objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
|
|
|
|
|
/* Check to see if we should scan the name for possible namespace
|
|
|
|
|
info. Only do this if this is C++, if we don't have namespace
|
|
|
|
|
debugging info in the file, if the psym is of an appropriate type
|
|
|
|
|
(otherwise we'll have psym == NULL), and if we actually had a
|
|
|
|
|
mangled name to begin with. */
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* FIXME drow/2004-02-22: Why don't we do this for classes, i.e. the
|
|
|
|
|
cases which do not set PSYM above? */
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
&& cu->has_namespace_info == 0
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
&& psym != NULL
|
|
|
|
|
&& SYMBOL_CPLUS_DEMANGLED_NAME (psym) != NULL)
|
|
|
|
|
cp_check_possible_namespace_symbols (SYMBOL_CPLUS_DEMANGLED_NAME (psym),
|
|
|
|
|
objfile);
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
if (built_actual_name)
|
|
|
|
|
xfree (actual_name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Determine whether a die of type TAG living in a C++ class or
|
|
|
|
|
namespace needs to have the name of the scope prepended to the
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
name listed in the die. */
|
|
|
|
|
|
|
|
|
|
static int
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
pdi_needs_namespace (enum dwarf_tag tag)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
|
|
|
|
switch (tag)
|
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
case DW_TAG_namespace:
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
case DW_TAG_typedef:
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
|
case DW_TAG_enumeration_type:
|
|
|
|
|
case DW_TAG_enumerator:
|
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
/* Read a partial die corresponding to a namespace; also, add a symbol
|
|
|
|
|
corresponding to that namespace to the symbol table. NAMESPACE is
|
|
|
|
|
the name of the enclosing namespace. */
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void
|
|
|
|
|
add_partial_namespace (struct partial_die_info *pdi,
|
2003-09-10 01:23:05 +02:00
|
|
|
|
CORE_ADDR *lowpc, CORE_ADDR *highpc,
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct dwarf2_cu *cu)
|
2003-09-10 01:23:05 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Add a symbol for the namespace. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
|
|
|
|
|
/* Now scan partial symbols in that namespace. */
|
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
if (pdi->has_children)
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
scan_partial_symbols (pdi->die_child, lowpc, highpc, cu);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* See if we can figure out if the class lives in a namespace. We do
|
|
|
|
|
this by looking for a member function; its demangled name will
|
|
|
|
|
contain namespace info, if there is any. */
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void
|
|
|
|
|
guess_structure_name (struct partial_die_info *struct_pdi,
|
|
|
|
|
struct dwarf2_cu *cu)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
&& cu->has_namespace_info == 0
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
&& struct_pdi->has_children)
|
|
|
|
|
{
|
|
|
|
|
/* NOTE: carlton/2003-10-07: Getting the info this way changes
|
|
|
|
|
what template types look like, because the demangler
|
|
|
|
|
frequently doesn't give the same name as the debug info. We
|
|
|
|
|
could fix this by only using the demangled name to get the
|
2004-03-14 22:08:24 +01:00
|
|
|
|
prefix (but see comment in read_structure_type). */
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct partial_die_info *child_pdi = struct_pdi->die_child;
|
|
|
|
|
struct partial_die_info *real_pdi;
|
|
|
|
|
struct dwarf2_cu *spec_cu;
|
2004-01-28 19:43:06 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* If this DIE (this DIE's specification, if any) has a parent, then
|
|
|
|
|
we should not do this. We'll prepend the parent's fully qualified
|
|
|
|
|
name when we create the partial symbol. */
|
2004-01-28 19:43:06 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
real_pdi = struct_pdi;
|
|
|
|
|
spec_cu = cu;
|
|
|
|
|
while (real_pdi->has_specification)
|
|
|
|
|
real_pdi = find_partial_die (real_pdi->spec_offset, spec_cu, &spec_cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (real_pdi->die_parent != NULL)
|
|
|
|
|
return;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
while (child_pdi != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (child_pdi->tag == DW_TAG_subprogram)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
char *actual_class_name
|
2004-07-06 21:29:31 +02:00
|
|
|
|
= language_class_name_from_physname (cu->language_defn,
|
|
|
|
|
child_pdi->name);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
if (actual_class_name != NULL)
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
{
|
|
|
|
|
struct_pdi->name
|
|
|
|
|
= obsavestring (actual_class_name,
|
|
|
|
|
strlen (actual_class_name),
|
|
|
|
|
&cu->comp_unit_obstack);
|
|
|
|
|
xfree (actual_class_name);
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
child_pdi = child_pdi->die_sibling;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
/* Read a partial die corresponding to an enumeration type. */
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
static void
|
|
|
|
|
add_partial_enumeration (struct partial_die_info *enum_pdi,
|
|
|
|
|
struct dwarf2_cu *cu)
|
2003-09-10 01:23:05 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
bfd *abfd = objfile->obfd;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
struct partial_die_info *pdi;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
|
|
|
|
if (enum_pdi->name != NULL)
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (enum_pdi, cu);
|
|
|
|
|
|
|
|
|
|
pdi = enum_pdi->die_child;
|
|
|
|
|
while (pdi)
|
2003-09-10 01:23:05 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (pdi->tag != DW_TAG_enumerator || pdi->name == NULL)
|
2003-09-10 01:23:05 +02:00
|
|
|
|
complaint (&symfile_complaints, "malformed enumerator DIE ignored");
|
|
|
|
|
else
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
add_partial_symbol (pdi, cu);
|
|
|
|
|
pdi = pdi->die_sibling;
|
2003-09-10 01:23:05 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
/* Read the initial uleb128 in the die at INFO_PTR in compilation unit CU.
|
|
|
|
|
Return the corresponding abbrev, or NULL if the number is zero (indicating
|
|
|
|
|
an empty DIE). In either case *BYTES_READ will be set to the length of
|
|
|
|
|
the initial number. */
|
|
|
|
|
|
|
|
|
|
static struct abbrev_info *
|
|
|
|
|
peek_die_abbrev (char *info_ptr, int *bytes_read, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
bfd *abfd = cu->objfile->obfd;
|
|
|
|
|
unsigned int abbrev_number;
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
|
|
|
|
|
abbrev_number = read_unsigned_leb128 (abfd, info_ptr, bytes_read);
|
|
|
|
|
|
|
|
|
|
if (abbrev_number == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
abbrev = dwarf2_lookup_abbrev (abbrev_number, cu);
|
|
|
|
|
if (!abbrev)
|
|
|
|
|
{
|
|
|
|
|
error ("Dwarf Error: Could not find abbrev number %d [in module %s]", abbrev_number,
|
|
|
|
|
bfd_get_filename (abfd));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return abbrev;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Scan the debug information for CU starting at INFO_PTR. Returns a
|
|
|
|
|
pointer to the end of a series of DIEs, terminated by an empty
|
|
|
|
|
DIE. Any children of the skipped DIEs will also be skipped. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
skip_children (char *info_ptr, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
abbrev = peek_die_abbrev (info_ptr, &bytes_read, cu);
|
|
|
|
|
if (abbrev == NULL)
|
|
|
|
|
return info_ptr + bytes_read;
|
|
|
|
|
else
|
|
|
|
|
info_ptr = skip_one_die (info_ptr + bytes_read, abbrev, cu);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Scan the debug information for CU starting at INFO_PTR. INFO_PTR
|
|
|
|
|
should point just after the initial uleb128 of a DIE, and the
|
|
|
|
|
abbrev corresponding to that skipped uleb128 should be passed in
|
|
|
|
|
ABBREV. Returns a pointer to this DIE's sibling, skipping any
|
|
|
|
|
children. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
skip_one_die (char *info_ptr, struct abbrev_info *abbrev,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
struct attribute attr;
|
|
|
|
|
bfd *abfd = cu->objfile->obfd;
|
|
|
|
|
unsigned int form, i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < abbrev->num_attrs; i++)
|
|
|
|
|
{
|
|
|
|
|
/* The only abbrev we care about is DW_AT_sibling. */
|
|
|
|
|
if (abbrev->attrs[i].name == DW_AT_sibling)
|
|
|
|
|
{
|
|
|
|
|
read_attribute (&attr, &abbrev->attrs[i],
|
|
|
|
|
abfd, info_ptr, cu);
|
|
|
|
|
if (attr.form == DW_FORM_ref_addr)
|
|
|
|
|
complaint (&symfile_complaints, "ignoring absolute DW_AT_sibling");
|
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
return dwarf2_per_objfile->info_buffer
|
|
|
|
|
+ dwarf2_get_ref_die_offset (&attr, cu);
|
2004-03-09 20:38:11 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If it isn't DW_AT_sibling, skip this attribute. */
|
|
|
|
|
form = abbrev->attrs[i].form;
|
|
|
|
|
skip_attribute:
|
|
|
|
|
switch (form)
|
|
|
|
|
{
|
|
|
|
|
case DW_FORM_addr:
|
|
|
|
|
case DW_FORM_ref_addr:
|
|
|
|
|
info_ptr += cu->header.addr_size;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
|
case DW_FORM_ref1:
|
|
|
|
|
case DW_FORM_flag:
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data2:
|
|
|
|
|
case DW_FORM_ref2:
|
|
|
|
|
info_ptr += 2;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data4:
|
|
|
|
|
case DW_FORM_ref4:
|
|
|
|
|
info_ptr += 4;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data8:
|
|
|
|
|
case DW_FORM_ref8:
|
|
|
|
|
info_ptr += 8;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_string:
|
|
|
|
|
read_string (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_strp:
|
|
|
|
|
info_ptr += cu->header.offset_size;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block:
|
|
|
|
|
info_ptr += read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block1:
|
|
|
|
|
info_ptr += 1 + read_1_byte (abfd, info_ptr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block2:
|
|
|
|
|
info_ptr += 2 + read_2_bytes (abfd, info_ptr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block4:
|
|
|
|
|
info_ptr += 4 + read_4_bytes (abfd, info_ptr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_sdata:
|
|
|
|
|
case DW_FORM_udata:
|
|
|
|
|
case DW_FORM_ref_udata:
|
|
|
|
|
info_ptr = skip_leb128 (abfd, info_ptr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_indirect:
|
|
|
|
|
form = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
/* We need to continue parsing from here, so just go back to
|
|
|
|
|
the top. */
|
|
|
|
|
goto skip_attribute;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
error ("Dwarf Error: Cannot handle %s in DWARF reader [in module %s]",
|
|
|
|
|
dwarf_form_name (form),
|
|
|
|
|
bfd_get_filename (abfd));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (abbrev->has_children)
|
|
|
|
|
return skip_children (info_ptr, cu);
|
|
|
|
|
else
|
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Locate ORIG_PDI's sibling; INFO_PTR should point to the start of
|
|
|
|
|
the next DIE after ORIG_PDI. */
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
locate_pdi_sibling (struct partial_die_info *orig_pdi, char *info_ptr,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *abfd, struct dwarf2_cu *cu)
|
2003-09-10 01:23:05 +02:00
|
|
|
|
{
|
|
|
|
|
/* Do we know the sibling already? */
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
2003-09-10 01:23:05 +02:00
|
|
|
|
if (orig_pdi->sibling)
|
|
|
|
|
return orig_pdi->sibling;
|
|
|
|
|
|
|
|
|
|
/* Are there any children to deal with? */
|
|
|
|
|
|
|
|
|
|
if (!orig_pdi->has_children)
|
|
|
|
|
return info_ptr;
|
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
/* Skip the children the long way. */
|
2003-09-10 01:23:05 +02:00
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
return skip_children (info_ptr, cu);
|
2003-09-10 01:23:05 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Expand this partial symbol table into a full symbol table. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_psymtab_to_symtab (struct partial_symtab *pst)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* FIXME: This is barely more than a stub. */
|
|
|
|
|
if (pst != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (pst->readin)
|
|
|
|
|
{
|
|
|
|
|
warning ("bug: psymtab for %s is already read in.", pst->filename);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (info_verbose)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered ("Reading in symbols for %s...", pst->filename);
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
psymtab_to_symtab_1 (pst);
|
|
|
|
|
|
|
|
|
|
/* Finish up the debug error message. */
|
|
|
|
|
if (info_verbose)
|
|
|
|
|
printf_filtered ("done.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
psymtab_to_symtab_1 (struct partial_symtab *pst)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile = pst->objfile;
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu cu;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct die_info *dies;
|
|
|
|
|
unsigned long offset;
|
|
|
|
|
CORE_ADDR lowpc, highpc;
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
char *info_ptr;
|
|
|
|
|
struct symtab *symtab;
|
|
|
|
|
struct cleanup *back_to;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
struct attribute *attr;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < pst->number_of_dependencies; i++)
|
|
|
|
|
if (!pst->dependencies[i]->readin)
|
|
|
|
|
{
|
|
|
|
|
/* Inform about additional files that need to be read in. */
|
|
|
|
|
if (info_verbose)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (" ", gdb_stdout);
|
|
|
|
|
wrap_here ("");
|
|
|
|
|
fputs_filtered ("and ", gdb_stdout);
|
|
|
|
|
wrap_here ("");
|
|
|
|
|
printf_filtered ("%s...", pst->dependencies[i]->filename);
|
|
|
|
|
wrap_here (""); /* Flush output */
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
psymtab_to_symtab_1 (pst->dependencies[i]);
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-04 02:11:25 +02:00
|
|
|
|
if (pst->read_symtab_private == NULL)
|
2004-05-03 18:21:51 +02:00
|
|
|
|
{
|
|
|
|
|
/* It's an include file, no symbols to read for it.
|
|
|
|
|
Everything is in the parent symtab. */
|
|
|
|
|
pst->readin = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
dwarf2_per_objfile = objfile_data (pst->objfile, dwarf2_objfile_data_key);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Set local variables from the partial symbol table info. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
offset = DWARF_INFO_OFFSET (pst);
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
|
|
|
|
|
info_ptr = dwarf2_per_objfile->info_buffer + offset;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
/* We're in the global namespace. */
|
|
|
|
|
processing_current_prefix = "";
|
|
|
|
|
|
2004-04-19 20:20:50 +02:00
|
|
|
|
obstack_init (&cu.comp_unit_obstack);
|
|
|
|
|
back_to = make_cleanup (free_stack_comp_unit, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
buildsym_init ();
|
1999-08-03 01:48:37 +02:00
|
|
|
|
make_cleanup (really_free_pendings, NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.objfile = objfile;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* read in the comp_unit header */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
info_ptr = read_comp_unit_head (&cu.header, info_ptr, abfd);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Read the abbrevs for this compilation unit */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_read_abbrevs (abfd, &cu);
|
2004-03-09 17:57:44 +01:00
|
|
|
|
make_cleanup (dwarf2_free_abbrev_table, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu.header.offset = offset;
|
|
|
|
|
|
|
|
|
|
cu.list_in_scope = &file_symbols;
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dies = read_comp_unit (info_ptr, abfd, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-22 11:02:23 +02:00
|
|
|
|
make_cleanup_free_die_list (dies);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-04-13 17:43:35 +02:00
|
|
|
|
/* Find the base address of the compilation unit for range lists and
|
|
|
|
|
location lists. It will normally be specified by DW_AT_low_pc.
|
|
|
|
|
In DWARF-3 draft 4, the base address could be overridden by
|
|
|
|
|
DW_AT_entry_pc. It's been removed, but GCC still uses this for
|
|
|
|
|
compilation units with discontinuous ranges. */
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.header.base_known = 0;
|
|
|
|
|
cu.header.base_address = 0;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (dies, DW_AT_entry_pc, &cu);
|
2003-04-13 17:43:35 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.header.base_address = DW_ADDR (attr);
|
|
|
|
|
cu.header.base_known = 1;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (dies, DW_AT_low_pc, &cu);
|
2003-04-13 17:43:35 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu.header.base_address = DW_ADDR (attr);
|
|
|
|
|
cu.header.base_known = 1;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Do line number decoding in read_file_scope () */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (dies, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-22 20:56:54 +01:00
|
|
|
|
/* Some compilers don't define a DW_AT_high_pc attribute for the
|
|
|
|
|
compilation unit. If the DW_AT_high_pc is missing, synthesize
|
|
|
|
|
it, by scanning the DIE's below the compilation unit. */
|
|
|
|
|
get_scope_pc_bounds (dies, &lowpc, &highpc, &cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-08-04 18:25:30 +02:00
|
|
|
|
symtab = end_symtab (highpc + baseaddr, objfile, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Set symtab language to language from DW_AT_language.
|
|
|
|
|
If the compilation is from a C file generated by language preprocessors,
|
|
|
|
|
do not set the language if it was already deduced by start_subfile. */
|
|
|
|
|
if (symtab != NULL
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
&& !(cu.language == language_c && symtab->language != language_c))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
symtab->language = cu.language;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
pst->symtab = symtab;
|
|
|
|
|
pst->readin = 1;
|
|
|
|
|
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Process a die and its children. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (die->tag)
|
|
|
|
|
{
|
|
|
|
|
case DW_TAG_padding:
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_compile_unit:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_file_scope (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_subprogram:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_subroutine_type (die, cu);
|
|
|
|
|
read_func_scope (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_inlined_subroutine:
|
|
|
|
|
/* FIXME: These are ignored for now.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
They could be used to set breakpoints on all inlined instances
|
|
|
|
|
of a function and make GDB `next' properly over inlined functions. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_lexical_block:
|
2003-05-28 22:25:10 +02:00
|
|
|
|
case DW_TAG_try_block:
|
|
|
|
|
case DW_TAG_catch_block:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_lexical_block_scope (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_union_type:
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_structure_type (die, cu);
|
|
|
|
|
process_structure_scope (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_enumeration_type:
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_enumeration_type (die, cu);
|
|
|
|
|
process_enumeration_scope (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2004-03-14 22:08:24 +01:00
|
|
|
|
|
|
|
|
|
/* FIXME drow/2004-03-14: These initialize die->type, but do not create
|
|
|
|
|
a symbol or process any children. Therefore it doesn't do anything
|
|
|
|
|
that won't be done on-demand by read_type_die. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_subroutine_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_subroutine_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_array_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_array_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_pointer_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_pointer_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_ptr_to_member_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_ptr_to_member_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_reference_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_reference_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_string_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_string_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2004-03-14 22:08:24 +01:00
|
|
|
|
/* END FIXME */
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_base_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_base_type (die, cu);
|
2004-03-14 22:08:24 +01:00
|
|
|
|
/* Add a typedef symbol for the type definition, if it has a
|
|
|
|
|
DW_AT_name. */
|
|
|
|
|
new_symbol (die, die->type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2004-01-17 06:35:47 +01:00
|
|
|
|
case DW_TAG_subrange_type:
|
|
|
|
|
read_subrange_type (die, cu);
|
2004-03-14 22:08:24 +01:00
|
|
|
|
/* Add a typedef symbol for the type definition, if it has a
|
|
|
|
|
DW_AT_name. */
|
|
|
|
|
new_symbol (die, die->type, cu);
|
2004-01-17 06:35:47 +01:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_common_block:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_common_block (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_common_inclusion:
|
|
|
|
|
break;
|
2002-10-23 18:40:55 +02:00
|
|
|
|
case DW_TAG_namespace:
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_has_namespace_info = 1;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_namespace (die, cu);
|
2002-10-23 18:40:55 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_imported_declaration:
|
|
|
|
|
case DW_TAG_imported_module:
|
|
|
|
|
/* FIXME: carlton/2002-10-16: Eventually, we should use the
|
|
|
|
|
information contained in these. DW_TAG_imported_declaration
|
|
|
|
|
dies shouldn't have children; DW_TAG_imported_module dies
|
|
|
|
|
shouldn't in the C++ case, but conceivably could in the
|
|
|
|
|
Fortran case, so we'll have to replace this gdb_assert if
|
|
|
|
|
Fortran compilers start generating that info. */
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_has_namespace_info = 1;
|
2003-10-01 00:29:28 +02:00
|
|
|
|
gdb_assert (die->child == NULL);
|
2002-10-23 18:40:55 +02:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
new_symbol (die, NULL, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-05 00:26:43 +02:00
|
|
|
|
static void
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
initialize_cu_func_list (struct dwarf2_cu *cu)
|
2002-04-05 00:26:43 +02:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->first_fn = cu->last_fn = cu->cached_fn = NULL;
|
2002-04-05 00:26:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_file_scope (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
struct cleanup *back_to = make_cleanup (null_cleanup, 0);
|
1999-10-06 01:13:56 +02:00
|
|
|
|
CORE_ADDR lowpc = ((CORE_ADDR) -1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR highpc = ((CORE_ADDR) 0);
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
char *name = "<unknown>";
|
|
|
|
|
char *comp_dir = NULL;
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
struct line_header *line_header = 0;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
|
|
|
|
|
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-22 20:56:54 +01:00
|
|
|
|
get_scope_pc_bounds (die, &lowpc, &highpc, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* If we didn't find a lowpc, set it to highpc to avoid complaints
|
|
|
|
|
from finish_block. */
|
1999-10-06 01:13:56 +02:00
|
|
|
|
if (lowpc == ((CORE_ADDR) -1))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
lowpc = highpc;
|
|
|
|
|
lowpc += baseaddr;
|
|
|
|
|
highpc += baseaddr;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
name = DW_STRING (attr);
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_comp_dir, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
comp_dir = DW_STRING (attr);
|
|
|
|
|
if (comp_dir)
|
|
|
|
|
{
|
|
|
|
|
/* Irix 6.2 native cc prepends <machine>.: to the compilation
|
|
|
|
|
directory, get rid of it. */
|
|
|
|
|
char *cp = strchr (comp_dir, ':');
|
|
|
|
|
|
|
|
|
|
if (cp && cp != comp_dir && cp[-1] == '.' && cp[1] == '/')
|
|
|
|
|
comp_dir = cp + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_language, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
set_cu_language (DW_UNSND (attr), cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-30 14:22:27 +02:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_producer, cu);
|
|
|
|
|
if (attr)
|
|
|
|
|
cu->producer = DW_STRING (attr);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* We assume that we're processing GCC output. */
|
|
|
|
|
processing_gcc_compilation = 2;
|
|
|
|
|
#if 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* FIXME:Do something here. */
|
|
|
|
|
if (dip->at_producer != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
handle_producer (dip->at_producer);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* The compilation unit may be in a different language or objfile,
|
|
|
|
|
zero out all remembered fundamental types. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
memset (cu->ftypes, 0, FT_NUM_MEMBERS * sizeof (struct type *));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
start_symtab (name, comp_dir, lowpc);
|
|
|
|
|
record_debugformat ("DWARF 2");
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
initialize_cu_func_list (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Process all dies in compilation unit. */
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
|
|
|
|
/* Decode line number information if present. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
unsigned int line_offset = DW_UNSND (attr);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
line_header = dwarf_decode_line_header (line_offset, abfd, cu);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
if (line_header)
|
|
|
|
|
{
|
|
|
|
|
make_cleanup ((make_cleanup_ftype *) free_line_header,
|
|
|
|
|
(void *) line_header);
|
2004-05-03 18:21:51 +02:00
|
|
|
|
dwarf_decode_lines (line_header, comp_dir, abfd, cu, NULL);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
}
|
2002-04-05 00:26:43 +02:00
|
|
|
|
}
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
2002-05-16 23:00:14 +02:00
|
|
|
|
/* Decode macro information, if present. Dwarf 2 macro information
|
|
|
|
|
refers to information in the line number info statement program
|
|
|
|
|
header, so we can only read it if we've read the header
|
|
|
|
|
successfully. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_macro_info, cu);
|
2002-08-20 20:45:30 +02:00
|
|
|
|
if (attr && line_header)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int macro_offset = DW_UNSND (attr);
|
|
|
|
|
dwarf_decode_macros (line_header, macro_offset,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
comp_dir, abfd, cu);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
}
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
do_cleanups (back_to);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_to_cu_func_list (const char *name, CORE_ADDR lowpc, CORE_ADDR highpc,
|
|
|
|
|
struct dwarf2_cu *cu)
|
2002-04-05 00:26:43 +02:00
|
|
|
|
{
|
|
|
|
|
struct function_range *thisfn;
|
|
|
|
|
|
|
|
|
|
thisfn = (struct function_range *)
|
2004-04-19 20:20:50 +02:00
|
|
|
|
obstack_alloc (&cu->comp_unit_obstack, sizeof (struct function_range));
|
2002-04-05 00:26:43 +02:00
|
|
|
|
thisfn->name = name;
|
|
|
|
|
thisfn->lowpc = lowpc;
|
|
|
|
|
thisfn->highpc = highpc;
|
|
|
|
|
thisfn->seen_line = 0;
|
|
|
|
|
thisfn->next = NULL;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->last_fn == NULL)
|
|
|
|
|
cu->first_fn = thisfn;
|
2002-04-05 00:26:43 +02:00
|
|
|
|
else
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->last_fn->next = thisfn;
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->last_fn = thisfn;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct context_stack *new;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR lowpc;
|
|
|
|
|
CORE_ADDR highpc;
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
char *name;
|
2004-01-23 23:41:28 +01:00
|
|
|
|
const char *previous_prefix = processing_current_prefix;
|
|
|
|
|
struct cleanup *back_to = NULL;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
|
|
|
|
|
|
|
|
|
name = dwarf2_linkage_name (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Ignore functions with missing or empty names and functions with
|
|
|
|
|
missing or invalid low and high pc attributes. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
if (name == NULL || !dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2004-01-28 05:02:52 +01:00
|
|
|
|
if (cu->language == language_cplus)
|
2004-01-23 23:41:28 +01:00
|
|
|
|
{
|
2004-01-28 05:02:52 +01:00
|
|
|
|
struct die_info *spec_die = die_specification (die, cu);
|
2004-01-23 23:41:28 +01:00
|
|
|
|
|
2004-01-28 05:05:22 +01:00
|
|
|
|
/* NOTE: carlton/2004-01-23: We have to be careful in the
|
|
|
|
|
presence of DW_AT_specification. For example, with GCC 3.4,
|
|
|
|
|
given the code
|
|
|
|
|
|
|
|
|
|
namespace N {
|
|
|
|
|
void foo() {
|
|
|
|
|
// Definition of N::foo.
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
then we'll have a tree of DIEs like this:
|
|
|
|
|
|
|
|
|
|
1: DW_TAG_compile_unit
|
|
|
|
|
2: DW_TAG_namespace // N
|
|
|
|
|
3: DW_TAG_subprogram // declaration of N::foo
|
|
|
|
|
4: DW_TAG_subprogram // definition of N::foo
|
|
|
|
|
DW_AT_specification // refers to die #3
|
|
|
|
|
|
|
|
|
|
Thus, when processing die #4, we have to pretend that we're
|
|
|
|
|
in the context of its DW_AT_specification, namely the contex
|
|
|
|
|
of die #3. */
|
2004-01-23 23:41:28 +01:00
|
|
|
|
|
|
|
|
|
if (spec_die != NULL)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
char *specification_prefix = determine_prefix (spec_die, cu);
|
2004-01-23 23:41:28 +01:00
|
|
|
|
processing_current_prefix = specification_prefix;
|
|
|
|
|
back_to = make_cleanup (xfree, specification_prefix);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
lowpc += baseaddr;
|
|
|
|
|
highpc += baseaddr;
|
|
|
|
|
|
2002-04-05 00:26:43 +02:00
|
|
|
|
/* Record the function range for dwarf_decode_lines. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_to_cu_func_list (name, lowpc, highpc, cu);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
new = push_context (0, lowpc);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
new->name = new_symbol (die, die->type, cu);
|
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 16:24:18 +01:00
|
|
|
|
|
2003-11-19 16:08:01 +01:00
|
|
|
|
/* If there is a location expression for DW_AT_frame_base, record
|
|
|
|
|
it. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_frame_base, cu);
|
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 16:24:18 +01:00
|
|
|
|
if (attr)
|
2004-01-26 20:55:45 +01:00
|
|
|
|
/* FIXME: cagney/2004-01-26: The DW_AT_frame_base's location
|
|
|
|
|
expression is being recorded directly in the function's symbol
|
|
|
|
|
and not in a separate frame-base object. I guess this hack is
|
|
|
|
|
to avoid adding some sort of frame-base adjunct/annex to the
|
|
|
|
|
function's symbol :-(. The problem with doing this is that it
|
|
|
|
|
results in a function symbol with a location expression that
|
|
|
|
|
has nothing to do with the location of the function, ouch! The
|
|
|
|
|
relationship should be: a function's symbol has-a frame base; a
|
|
|
|
|
frame-base has-a location expression. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_symbol_mark_computed (attr, new->name, cu);
|
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 16:24:18 +01:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->list_in_scope = &local_symbols;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new = pop_context ();
|
|
|
|
|
/* Make a block for the local symbols within. */
|
|
|
|
|
finish_block (new->name, &local_symbols, new->old_blocks,
|
|
|
|
|
lowpc, highpc, objfile);
|
2002-11-08 20:33:37 +01:00
|
|
|
|
|
|
|
|
|
/* In C++, we can have functions nested inside functions (e.g., when
|
|
|
|
|
a function declares a class that has methods). This means that
|
|
|
|
|
when we finish processing a function scope, we may need to go
|
|
|
|
|
back to building a containing block's symbol lists. */
|
|
|
|
|
local_symbols = new->locals;
|
|
|
|
|
param_symbols = new->params;
|
|
|
|
|
|
2002-11-08 21:05:10 +01:00
|
|
|
|
/* If we've finished processing a top-level function, subsequent
|
|
|
|
|
symbols go in the file symbol list. */
|
|
|
|
|
if (outermost_context_p ())
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->list_in_scope = &file_symbols;
|
2004-01-23 23:41:28 +01:00
|
|
|
|
|
|
|
|
|
processing_current_prefix = previous_prefix;
|
|
|
|
|
if (back_to != NULL)
|
|
|
|
|
do_cleanups (back_to);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Process all the DIES contained within a lexical block scope. Start
|
|
|
|
|
a new scope, process the dies, and then close the scope. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct context_stack *new;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR lowpc, highpc;
|
|
|
|
|
struct die_info *child_die;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
|
|
|
|
|
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Ignore blocks with missing or invalid low and high pc attributes. */
|
2003-01-30 02:51:48 +01:00
|
|
|
|
/* ??? Perhaps consider discontiguous blocks defined by DW_AT_ranges
|
|
|
|
|
as multiple lexical blocks? Handling children in a sane way would
|
|
|
|
|
be nasty. Might be easier to properly extend generic blocks to
|
|
|
|
|
describe ranges. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
if (!dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
lowpc += baseaddr;
|
|
|
|
|
highpc += baseaddr;
|
|
|
|
|
|
|
|
|
|
push_context (0, lowpc);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
new = pop_context ();
|
|
|
|
|
|
|
|
|
|
if (local_symbols != NULL)
|
|
|
|
|
{
|
|
|
|
|
finish_block (0, &local_symbols, new->old_blocks, new->start_addr,
|
|
|
|
|
highpc, objfile);
|
|
|
|
|
}
|
|
|
|
|
local_symbols = new->locals;
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-30 02:51:48 +01:00
|
|
|
|
/* Get low and high pc attributes from a die. Return 1 if the attributes
|
|
|
|
|
are present and valid, otherwise, return 0. Return -1 if the range is
|
|
|
|
|
discontinuous, i.e. derived from DW_AT_ranges information. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static int
|
2003-01-30 02:51:48 +01:00
|
|
|
|
dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
CORE_ADDR *highpc, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct attribute *attr;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
bfd *obfd = objfile->obfd;
|
|
|
|
|
CORE_ADDR low = 0;
|
|
|
|
|
CORE_ADDR high = 0;
|
|
|
|
|
int ret = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_high_pc, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
2003-01-30 02:51:48 +01:00
|
|
|
|
{
|
|
|
|
|
high = DW_ADDR (attr);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_low_pc, cu);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
if (attr)
|
|
|
|
|
low = DW_ADDR (attr);
|
|
|
|
|
else
|
|
|
|
|
/* Found high w/o low attribute. */
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Found consecutive range of addresses. */
|
|
|
|
|
ret = 1;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2003-01-30 02:51:48 +01:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_ranges, cu);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
if (attr != NULL)
|
|
|
|
|
{
|
|
|
|
|
unsigned int addr_size = cu_header->addr_size;
|
|
|
|
|
CORE_ADDR mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
|
|
|
|
|
/* Value of the DW_AT_ranges attribute is the offset in the
|
2003-09-15 19:19:23 +02:00
|
|
|
|
.debug_ranges section. */
|
2003-01-30 02:51:48 +01:00
|
|
|
|
unsigned int offset = DW_UNSND (attr);
|
|
|
|
|
/* Base address selection entry. */
|
2003-04-13 17:43:35 +02:00
|
|
|
|
CORE_ADDR base;
|
|
|
|
|
int found_base;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
int dummy;
|
|
|
|
|
char *buffer;
|
|
|
|
|
CORE_ADDR marker;
|
|
|
|
|
int low_set;
|
|
|
|
|
|
2003-04-13 17:43:35 +02:00
|
|
|
|
found_base = cu_header->base_known;
|
|
|
|
|
base = cu_header->base_address;
|
2003-09-15 19:19:23 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (offset >= dwarf2_per_objfile->ranges_size)
|
2003-09-15 19:19:23 +02:00
|
|
|
|
{
|
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"Offset %d out of bounds for DW_AT_ranges attribute",
|
|
|
|
|
offset);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
buffer = dwarf2_per_objfile->ranges_buffer + offset;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
|
|
|
|
|
/* Read in the largest possible address. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
marker = read_address (obfd, buffer, cu, &dummy);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
if ((marker & mask) == mask)
|
|
|
|
|
{
|
|
|
|
|
/* If we found the largest possible address, then
|
|
|
|
|
read the base address. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base = read_address (obfd, buffer + addr_size, cu, &dummy);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
buffer += 2 * addr_size;
|
|
|
|
|
offset += 2 * addr_size;
|
|
|
|
|
found_base = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
low_set = 0;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR range_beginning, range_end;
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
range_beginning = read_address (obfd, buffer, cu, &dummy);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
buffer += addr_size;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
range_end = read_address (obfd, buffer, cu, &dummy);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
buffer += addr_size;
|
|
|
|
|
offset += 2 * addr_size;
|
|
|
|
|
|
|
|
|
|
/* An end of list marker is a pair of zero addresses. */
|
|
|
|
|
if (range_beginning == 0 && range_end == 0)
|
|
|
|
|
/* Found the end of list entry. */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Each base address selection entry is a pair of 2 values.
|
|
|
|
|
The first is the largest possible address, the second is
|
|
|
|
|
the base address. Check for a base address here. */
|
|
|
|
|
if ((range_beginning & mask) == mask)
|
|
|
|
|
{
|
|
|
|
|
/* If we found the largest possible address, then
|
|
|
|
|
read the base address. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base = read_address (obfd, buffer + addr_size, cu, &dummy);
|
2003-01-30 02:51:48 +01:00
|
|
|
|
found_base = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!found_base)
|
|
|
|
|
{
|
|
|
|
|
/* We have no valid base address for the ranges
|
|
|
|
|
data. */
|
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"Invalid .debug_ranges data (no base address)");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-14 20:05:52 +01:00
|
|
|
|
range_beginning += base;
|
|
|
|
|
range_end += base;
|
|
|
|
|
|
2003-01-30 02:51:48 +01:00
|
|
|
|
/* FIXME: This is recording everything as a low-high
|
|
|
|
|
segment of consecutive addresses. We should have a
|
|
|
|
|
data structure for discontiguous block ranges
|
|
|
|
|
instead. */
|
|
|
|
|
if (! low_set)
|
|
|
|
|
{
|
|
|
|
|
low = range_beginning;
|
|
|
|
|
high = range_end;
|
|
|
|
|
low_set = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (range_beginning < low)
|
|
|
|
|
low = range_beginning;
|
|
|
|
|
if (range_end > high)
|
|
|
|
|
high = range_end;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! low_set)
|
|
|
|
|
/* If the first entry is an end-of-list marker, the range
|
|
|
|
|
describes an empty scope, i.e. no instructions. */
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
ret = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (high < low)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* When using the GNU linker, .gnu.linkonce. sections are used to
|
|
|
|
|
eliminate duplicate copies of functions and vtables and such.
|
|
|
|
|
The linker will arbitrarily choose one and discard the others.
|
|
|
|
|
The AT_*_pc values for such functions refer to local labels in
|
|
|
|
|
these sections. If the section from that file was discarded, the
|
|
|
|
|
labels are not in the output, so the relocs get a value of 0.
|
|
|
|
|
If this is a discarded function, mark the pc bounds as invalid,
|
|
|
|
|
so that GDB will ignore it. */
|
2003-01-30 02:51:48 +01:00
|
|
|
|
if (low == 0 && (bfd_get_file_flags (obfd) & HAS_RELOC) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*lowpc = low;
|
|
|
|
|
*highpc = high;
|
2003-01-30 02:51:48 +01:00
|
|
|
|
return ret;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-22 20:56:54 +01:00
|
|
|
|
/* Get the low and high pc's represented by the scope DIE, and store
|
|
|
|
|
them in *LOWPC and *HIGHPC. If the correct values can't be
|
|
|
|
|
determined, set *LOWPC to -1 and *HIGHPC to 0. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
get_scope_pc_bounds (struct die_info *die,
|
|
|
|
|
CORE_ADDR *lowpc, CORE_ADDR *highpc,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR best_low = (CORE_ADDR) -1;
|
|
|
|
|
CORE_ADDR best_high = (CORE_ADDR) 0;
|
|
|
|
|
CORE_ADDR current_low, current_high;
|
|
|
|
|
|
|
|
|
|
if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu))
|
|
|
|
|
{
|
|
|
|
|
best_low = current_low;
|
|
|
|
|
best_high = current_high;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct die_info *child = die->child;
|
|
|
|
|
|
|
|
|
|
while (child && child->tag)
|
|
|
|
|
{
|
|
|
|
|
switch (child->tag) {
|
|
|
|
|
case DW_TAG_subprogram:
|
|
|
|
|
if (dwarf2_get_pc_bounds (child, ¤t_low, ¤t_high, cu))
|
|
|
|
|
{
|
|
|
|
|
best_low = min (best_low, current_low);
|
|
|
|
|
best_high = max (best_high, current_high);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_namespace:
|
|
|
|
|
/* FIXME: carlton/2004-01-16: Should we do this for
|
|
|
|
|
DW_TAG_class_type/DW_TAG_structure_type, too? I think
|
|
|
|
|
that current GCC's always emit the DIEs corresponding
|
|
|
|
|
to definitions of methods of classes as children of a
|
|
|
|
|
DW_TAG_compile_unit or DW_TAG_namespace (as opposed to
|
|
|
|
|
the DIEs giving the declarations, which could be
|
|
|
|
|
anywhere). But I don't see any reason why the
|
|
|
|
|
standards says that they have to be there. */
|
|
|
|
|
get_scope_pc_bounds (child, ¤t_low, ¤t_high, cu);
|
|
|
|
|
|
|
|
|
|
if (current_low != ((CORE_ADDR) -1))
|
|
|
|
|
{
|
|
|
|
|
best_low = min (best_low, current_low);
|
|
|
|
|
best_high = max (best_high, current_high);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* Ignore. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
child = sibling_die (child);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*lowpc = best_low;
|
|
|
|
|
*highpc = best_high;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Add an aggregate field to the field list. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-24 03:26:10 +02:00
|
|
|
|
dwarf2_add_field (struct field_info *fip, struct die_info *die,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct nextfield *new_field;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
struct field *fp;
|
|
|
|
|
char *fieldname = "";
|
|
|
|
|
|
|
|
|
|
/* Allocate a new field list entry and link it in. */
|
|
|
|
|
new_field = (struct nextfield *) xmalloc (sizeof (struct nextfield));
|
2000-12-15 02:01:51 +01:00
|
|
|
|
make_cleanup (xfree, new_field);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
memset (new_field, 0, sizeof (struct nextfield));
|
|
|
|
|
new_field->next = fip->fields;
|
|
|
|
|
fip->fields = new_field;
|
|
|
|
|
fip->nfields++;
|
|
|
|
|
|
|
|
|
|
/* Handle accessibility and virtuality of field.
|
|
|
|
|
The default accessibility for members is public, the default
|
|
|
|
|
accessibility for inheritance is private. */
|
|
|
|
|
if (die->tag != DW_TAG_inheritance)
|
|
|
|
|
new_field->accessibility = DW_ACCESS_public;
|
|
|
|
|
else
|
|
|
|
|
new_field->accessibility = DW_ACCESS_private;
|
|
|
|
|
new_field->virtuality = DW_VIRTUALITY_none;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_accessibility, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
new_field->accessibility = DW_UNSND (attr);
|
|
|
|
|
if (new_field->accessibility != DW_ACCESS_public)
|
|
|
|
|
fip->non_public_fields = 1;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_virtuality, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
new_field->virtuality = DW_UNSND (attr);
|
|
|
|
|
|
|
|
|
|
fp = &new_field->field;
|
2002-12-06 00:13:47 +01:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (die->tag == DW_TAG_member && ! die_is_declaration (die, cu))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-12-06 00:13:47 +01:00
|
|
|
|
/* Data member other than a C++ static data member. */
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Get type of field. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
fp->type = die_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-11-11 01:55:34 +01:00
|
|
|
|
FIELD_STATIC_KIND (*fp) = 0;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Get bit size of field (zero if none). */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_bit_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
FIELD_BITSIZE (*fp) = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
FIELD_BITSIZE (*fp) = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get bit offset of field. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
FIELD_BITPOS (*fp) =
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
decode_locdesc (DW_BLOCK (attr), cu) * bits_per_byte;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
FIELD_BITPOS (*fp) = 0;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_bit_offset, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
if (BITS_BIG_ENDIAN)
|
|
|
|
|
{
|
|
|
|
|
/* For big endian bits, the DW_AT_bit_offset gives the
|
1999-07-07 22:19:36 +02:00
|
|
|
|
additional bit offset from the MSB of the containing
|
|
|
|
|
anonymous object to the MSB of the field. We don't
|
|
|
|
|
have to do anything special since we don't need to
|
|
|
|
|
know the size of the anonymous object. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
FIELD_BITPOS (*fp) += DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* For little endian bits, compute the bit offset to the
|
1999-07-07 22:19:36 +02:00
|
|
|
|
MSB of the anonymous object, subtract off the number of
|
|
|
|
|
bits from the MSB of the field to the MSB of the
|
|
|
|
|
object, and then subtract off the number of bits of
|
|
|
|
|
the field itself. The result is the bit offset of
|
|
|
|
|
the LSB of the field. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int anonymous_size;
|
|
|
|
|
int bit_offset = DW_UNSND (attr);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
/* The size of the anonymous object containing
|
|
|
|
|
the bit field is explicit, so use the
|
|
|
|
|
indicated size (in bytes). */
|
|
|
|
|
anonymous_size = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* The size of the anonymous object containing
|
|
|
|
|
the bit field must be inferred from the type
|
|
|
|
|
attribute of the data member containing the
|
|
|
|
|
bit field. */
|
|
|
|
|
anonymous_size = TYPE_LENGTH (fp->type);
|
|
|
|
|
}
|
|
|
|
|
FIELD_BITPOS (*fp) += anonymous_size * bits_per_byte
|
|
|
|
|
- bit_offset - FIELD_BITSIZE (*fp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get name of field. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
fieldname = DW_STRING (attr);
|
2004-03-05 04:30:36 +01:00
|
|
|
|
|
|
|
|
|
/* The name is already allocated along with this objfile, so we don't
|
|
|
|
|
need to duplicate it for the type. */
|
|
|
|
|
fp->name = fieldname;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Change accessibility for artificial fields (e.g. virtual table
|
1999-07-07 22:19:36 +02:00
|
|
|
|
pointer or virtual base class pointer) to private. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (dwarf2_attr (die, DW_AT_artificial, cu))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
new_field->accessibility = DW_ACCESS_private;
|
|
|
|
|
fip->non_public_fields = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-12-06 00:13:47 +01:00
|
|
|
|
else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-12-06 00:13:47 +01:00
|
|
|
|
/* C++ static member. */
|
|
|
|
|
|
|
|
|
|
/* NOTE: carlton/2002-11-05: It should be a DW_TAG_member that
|
|
|
|
|
is a declaration, but all versions of G++ as of this writing
|
|
|
|
|
(so through at least 3.2.1) incorrectly generate
|
|
|
|
|
DW_TAG_variable tags. */
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char *physname;
|
|
|
|
|
|
2002-12-06 00:13:47 +01:00
|
|
|
|
/* Get name of field. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-10-12 06:37:53 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
fieldname = DW_STRING (attr);
|
|
|
|
|
else
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
/* Get physical name. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
physname = dwarf2_linkage_name (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* The name is already allocated along with this objfile, so we don't
|
|
|
|
|
need to duplicate it for the type. */
|
|
|
|
|
SET_FIELD_PHYSNAME (*fp, physname ? physname : "");
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
FIELD_TYPE (*fp) = die_type (die, cu);
|
2004-03-05 04:30:36 +01:00
|
|
|
|
FIELD_NAME (*fp) = fieldname;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else if (die->tag == DW_TAG_inheritance)
|
|
|
|
|
{
|
|
|
|
|
/* C++ base class field. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
FIELD_BITPOS (*fp) = (decode_locdesc (DW_BLOCK (attr), cu)
|
2000-07-24 03:26:10 +02:00
|
|
|
|
* bits_per_byte);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
FIELD_BITSIZE (*fp) = 0;
|
2002-11-11 01:55:34 +01:00
|
|
|
|
FIELD_STATIC_KIND (*fp) = 0;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
FIELD_TYPE (*fp) = die_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
FIELD_NAME (*fp) = type_name_no_tag (fp->type);
|
|
|
|
|
fip->nbaseclasses++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create the vector of fields, and attach it to the type. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_attach_fields_to_type (struct field_info *fip, struct type *type,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int nfields = fip->nfields;
|
|
|
|
|
|
|
|
|
|
/* Record the field count, allocate space for the array of fields,
|
|
|
|
|
and create blank accessibility bitfields if necessary. */
|
|
|
|
|
TYPE_NFIELDS (type) = nfields;
|
|
|
|
|
TYPE_FIELDS (type) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (type, sizeof (struct field) * nfields);
|
|
|
|
|
memset (TYPE_FIELDS (type), 0, sizeof (struct field) * nfields);
|
|
|
|
|
|
|
|
|
|
if (fip->non_public_fields)
|
|
|
|
|
{
|
|
|
|
|
ALLOCATE_CPLUS_STRUCT_TYPE (type);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_PRIVATE_BITS (type) =
|
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
|
B_CLRALL (TYPE_FIELD_PRIVATE_BITS (type), nfields);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_PROTECTED_BITS (type) =
|
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
|
B_CLRALL (TYPE_FIELD_PROTECTED_BITS (type), nfields);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_IGNORE_BITS (type) =
|
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
|
B_CLRALL (TYPE_FIELD_IGNORE_BITS (type), nfields);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the type has baseclasses, allocate and clear a bit vector for
|
|
|
|
|
TYPE_FIELD_VIRTUAL_BITS. */
|
|
|
|
|
if (fip->nbaseclasses)
|
|
|
|
|
{
|
|
|
|
|
int num_bytes = B_BYTES (fip->nbaseclasses);
|
|
|
|
|
char *pointer;
|
|
|
|
|
|
|
|
|
|
ALLOCATE_CPLUS_STRUCT_TYPE (type);
|
|
|
|
|
pointer = (char *) TYPE_ALLOC (type, num_bytes);
|
|
|
|
|
TYPE_FIELD_VIRTUAL_BITS (type) = (B_TYPE *) pointer;
|
|
|
|
|
B_CLRALL (TYPE_FIELD_VIRTUAL_BITS (type), fip->nbaseclasses);
|
|
|
|
|
TYPE_N_BASECLASSES (type) = fip->nbaseclasses;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the saved-up fields into the field vector. Start from the head
|
|
|
|
|
of the list, adding to the tail of the field array, so that they end
|
|
|
|
|
up in the same order in the array in which they were added to the list. */
|
|
|
|
|
while (nfields-- > 0)
|
|
|
|
|
{
|
|
|
|
|
TYPE_FIELD (type, nfields) = fip->fields->field;
|
|
|
|
|
switch (fip->fields->accessibility)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
case DW_ACCESS_private:
|
|
|
|
|
SET_TYPE_FIELD_PRIVATE (type, nfields);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
case DW_ACCESS_protected:
|
|
|
|
|
SET_TYPE_FIELD_PROTECTED (type, nfields);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
case DW_ACCESS_public:
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
default:
|
|
|
|
|
/* Unknown accessibility. Complain and treat it as public. */
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "unsupported accessibility %d",
|
|
|
|
|
fip->fields->accessibility);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
if (nfields < fip->nbaseclasses)
|
|
|
|
|
{
|
|
|
|
|
switch (fip->fields->virtuality)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
case DW_VIRTUALITY_virtual:
|
|
|
|
|
case DW_VIRTUALITY_pure_virtual:
|
|
|
|
|
SET_TYPE_FIELD_VIRTUAL (type, nfields);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fip->fields = fip->fields->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a member function to the proper fieldlist. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-24 03:26:10 +02:00
|
|
|
|
dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct type *type, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct attribute *attr;
|
|
|
|
|
struct fnfieldlist *flp;
|
|
|
|
|
int i;
|
|
|
|
|
struct fn_field *fnp;
|
|
|
|
|
char *fieldname;
|
|
|
|
|
char *physname;
|
|
|
|
|
struct nextfnfield *new_fnfield;
|
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
/* Get name of member function. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-10-12 06:37:53 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
fieldname = DW_STRING (attr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
1999-10-12 06:37:53 +02:00
|
|
|
|
return;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
/* Get the mangled name. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
physname = dwarf2_linkage_name (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Look up member function name in fieldlist. */
|
|
|
|
|
for (i = 0; i < fip->nfnfields; i++)
|
|
|
|
|
{
|
2003-12-13 23:29:06 +01:00
|
|
|
|
if (strcmp (fip->fnfieldlists[i].name, fieldname) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create new list element if necessary. */
|
|
|
|
|
if (i < fip->nfnfields)
|
|
|
|
|
flp = &fip->fnfieldlists[i];
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((fip->nfnfields % DW_FIELD_ALLOC_CHUNK) == 0)
|
|
|
|
|
{
|
|
|
|
|
fip->fnfieldlists = (struct fnfieldlist *)
|
|
|
|
|
xrealloc (fip->fnfieldlists,
|
|
|
|
|
(fip->nfnfields + DW_FIELD_ALLOC_CHUNK)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
* sizeof (struct fnfieldlist));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (fip->nfnfields == 0)
|
2000-04-26 14:41:48 +02:00
|
|
|
|
make_cleanup (free_current_contents, &fip->fnfieldlists);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
flp = &fip->fnfieldlists[fip->nfnfields];
|
|
|
|
|
flp->name = fieldname;
|
|
|
|
|
flp->length = 0;
|
|
|
|
|
flp->head = NULL;
|
|
|
|
|
fip->nfnfields++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a new member function field and chain it to the field list
|
|
|
|
|
entry. */
|
|
|
|
|
new_fnfield = (struct nextfnfield *) xmalloc (sizeof (struct nextfnfield));
|
2000-12-15 02:01:51 +01:00
|
|
|
|
make_cleanup (xfree, new_fnfield);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
memset (new_fnfield, 0, sizeof (struct nextfnfield));
|
|
|
|
|
new_fnfield->next = flp->head;
|
|
|
|
|
flp->head = new_fnfield;
|
|
|
|
|
flp->length++;
|
|
|
|
|
|
|
|
|
|
/* Fill in the member function field info. */
|
|
|
|
|
fnp = &new_fnfield->fnfield;
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* The name is already allocated along with this objfile, so we don't
|
|
|
|
|
need to duplicate it for the type. */
|
|
|
|
|
fnp->physname = physname ? physname : "";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fnp->type = alloc_type (objfile);
|
|
|
|
|
if (die->type && TYPE_CODE (die->type) == TYPE_CODE_FUNC)
|
|
|
|
|
{
|
|
|
|
|
int nparams = TYPE_NFIELDS (die->type);
|
|
|
|
|
|
2002-09-03 19:32:11 +02:00
|
|
|
|
/* TYPE is the domain of this method, and DIE->TYPE is the type
|
|
|
|
|
of the method itself (TYPE_CODE_METHOD). */
|
|
|
|
|
smash_to_method_type (fnp->type, type,
|
2002-06-14 16:34:26 +02:00
|
|
|
|
TYPE_TARGET_TYPE (die->type),
|
|
|
|
|
TYPE_FIELDS (die->type),
|
|
|
|
|
TYPE_NFIELDS (die->type),
|
|
|
|
|
TYPE_VARARGS (die->type));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Handle static member functions.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
Dwarf2 has no clean way to discern C++ static and non-static
|
|
|
|
|
member functions. G++ helps GDB by marking the first
|
|
|
|
|
parameter for non-static member functions (which is the
|
|
|
|
|
this pointer) as artificial. We obtain this information
|
|
|
|
|
from read_subroutine_type via TYPE_FIELD_ARTIFICIAL. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (nparams == 0 || TYPE_FIELD_ARTIFICIAL (die->type, 0) == 0)
|
|
|
|
|
fnp->voffset = VOFFSET_STATIC;
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "member function type missing for '%s'",
|
|
|
|
|
physname);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Get fcontext from DW_AT_containing_type if present. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
fnp->fcontext = die_containing_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* dwarf2 doesn't have stubbed physical names, so the setting of is_const
|
|
|
|
|
and is_volatile is irrelevant, as it is needed by gdb_mangle_name only. */
|
|
|
|
|
|
|
|
|
|
/* Get accessibility. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_accessibility, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
switch (DW_UNSND (attr))
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
case DW_ACCESS_private:
|
|
|
|
|
fnp->is_private = 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_ACCESS_protected:
|
|
|
|
|
fnp->is_protected = 1;
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-20 20:20:16 +01:00
|
|
|
|
/* Check for artificial methods. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_artificial, cu);
|
2002-01-20 20:20:16 +01:00
|
|
|
|
if (attr && DW_UNSND (attr) != 0)
|
|
|
|
|
fnp->is_artificial = 1;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Get index in virtual function table if it is a virtual member function. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_vtable_elem_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
2002-07-12 21:55:10 +02:00
|
|
|
|
{
|
|
|
|
|
/* Support the .debug_loc offsets */
|
|
|
|
|
if (attr_form_is_block (attr))
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu) + 2;
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
else if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_invalid_attrib_class_complaint ("DW_AT_vtable_elem_location",
|
|
|
|
|
fieldname);
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create the vector of member function fields, and attach it to the type. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_attach_fn_fields_to_type (struct field_info *fip, struct type *type,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct fnfieldlist *flp;
|
|
|
|
|
int total_length = 0;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
ALLOCATE_CPLUS_STRUCT_TYPE (type);
|
|
|
|
|
TYPE_FN_FIELDLISTS (type) = (struct fn_fieldlist *)
|
|
|
|
|
TYPE_ALLOC (type, sizeof (struct fn_fieldlist) * fip->nfnfields);
|
|
|
|
|
|
|
|
|
|
for (i = 0, flp = fip->fnfieldlists; i < fip->nfnfields; i++, flp++)
|
|
|
|
|
{
|
|
|
|
|
struct nextfnfield *nfp = flp->head;
|
|
|
|
|
struct fn_fieldlist *fn_flp = &TYPE_FN_FIELDLIST (type, i);
|
|
|
|
|
int k;
|
|
|
|
|
|
|
|
|
|
TYPE_FN_FIELDLIST_NAME (type, i) = flp->name;
|
|
|
|
|
TYPE_FN_FIELDLIST_LENGTH (type, i) = flp->length;
|
|
|
|
|
fn_flp->fn_fields = (struct fn_field *)
|
|
|
|
|
TYPE_ALLOC (type, sizeof (struct fn_field) * flp->length);
|
|
|
|
|
for (k = flp->length; (k--, nfp); nfp = nfp->next)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
fn_flp->fn_fields[k] = nfp->fnfield;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
total_length += flp->length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TYPE_NFN_FIELDS (type) = fip->nfnfields;
|
|
|
|
|
TYPE_NFN_FIELDS_TOTAL (type) = total_length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called when we find the DIE that starts a structure or union scope
|
|
|
|
|
(definition) to process all dies that define the members of the
|
|
|
|
|
structure or union.
|
|
|
|
|
|
|
|
|
|
NOTE: we need to call struct_type regardless of whether or not the
|
|
|
|
|
DIE has an at_name attribute, since it might be an anonymous
|
|
|
|
|
structure or union. This gets the type entered into our set of
|
|
|
|
|
user defined types.
|
|
|
|
|
|
|
|
|
|
However, if the structure is incomplete (an opaque struct/union)
|
|
|
|
|
then suppress creating a symbol table entry for it since gdb only
|
|
|
|
|
wants to find the one with the complete definition. Note that if
|
|
|
|
|
it is complete, we just call new_symbol, which does it's own
|
|
|
|
|
checking about whether the struct/union is anonymous or not (and
|
|
|
|
|
suppresses creating a symbol table entry itself). */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
struct attribute *attr;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
const char *previous_prefix = processing_current_prefix;
|
|
|
|
|
struct cleanup *back_to = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
if (die->type)
|
|
|
|
|
return;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
type = alloc_type (objfile);
|
|
|
|
|
|
|
|
|
|
INIT_CPLUS_SPECIFIC (type);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
2004-03-15 23:33:52 +01:00
|
|
|
|
char *new_prefix = determine_class_name (die, cu);
|
|
|
|
|
TYPE_TAG_NAME (type) = obsavestring (new_prefix,
|
|
|
|
|
strlen (new_prefix),
|
|
|
|
|
&objfile->objfile_obstack);
|
|
|
|
|
back_to = make_cleanup (xfree, new_prefix);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_current_prefix = new_prefix;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* The name is already allocated along with this objfile, so
|
|
|
|
|
we don't need to duplicate it for the type. */
|
2004-03-15 23:33:52 +01:00
|
|
|
|
TYPE_TAG_NAME (type) = DW_STRING (attr);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (die->tag == DW_TAG_structure_type)
|
|
|
|
|
{
|
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_STRUCT;
|
|
|
|
|
}
|
|
|
|
|
else if (die->tag == DW_TAG_union_type)
|
|
|
|
|
{
|
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_UNION;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* FIXME: TYPE_CODE_CLASS is currently defined to TYPE_CODE_STRUCT
|
1999-07-07 22:19:36 +02:00
|
|
|
|
in gdbtypes.h. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_CLASS;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (type) = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (type) = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-16 05:17:25 +02:00
|
|
|
|
if (die_is_declaration (die, cu))
|
|
|
|
|
TYPE_FLAGS (type) |= TYPE_FLAG_STUB;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* We need to add the type field to the die immediately so we don't
|
|
|
|
|
infinitely recurse when dealing with pointers to the structure
|
|
|
|
|
type within the structure itself. */
|
|
|
|
|
die->type = type;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (die->child != NULL && ! die_is_declaration (die, cu))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct field_info fi;
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
|
|
|
|
|
|
|
|
|
|
memset (&fi, 0, sizeof (struct field_info));
|
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
2002-12-06 00:13:47 +01:00
|
|
|
|
if (child_die->tag == DW_TAG_member
|
|
|
|
|
|| child_die->tag == DW_TAG_variable)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-12-06 00:13:47 +01:00
|
|
|
|
/* NOTE: carlton/2002-11-05: A C++ static data member
|
|
|
|
|
should be a DW_TAG_member that is a declaration, but
|
|
|
|
|
all versions of G++ as of this writing (so through at
|
|
|
|
|
least 3.2.1) incorrectly generate DW_TAG_variable
|
|
|
|
|
tags for them instead. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_add_field (&fi, child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2000-07-24 19:07:26 +02:00
|
|
|
|
else if (child_die->tag == DW_TAG_subprogram)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* C++ member function. */
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_type_die (child_die, cu);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_add_member_fn (&fi, child_die, type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else if (child_die->tag == DW_TAG_inheritance)
|
|
|
|
|
{
|
|
|
|
|
/* C++ base class field. */
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_add_field (&fi, child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Attach fields and member functions to the type. */
|
|
|
|
|
if (fi.nfields)
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_attach_fields_to_type (&fi, type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (fi.nfnfields)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_attach_fn_fields_to_type (&fi, type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Get the type which refers to the base class (possibly this
|
1999-04-16 03:35:26 +02:00
|
|
|
|
class itself) which contains the vtable pointer for the current
|
|
|
|
|
class from the DW_AT_containing_type attribute. */
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct type *t = die_containing_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
TYPE_VPTR_BASETYPE (type) = t;
|
|
|
|
|
if (type == t)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
static const char vptr_name[] =
|
|
|
|
|
{'_', 'v', 'p', 't', 'r', '\0'};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Our own class provides vtbl ptr. */
|
|
|
|
|
for (i = TYPE_NFIELDS (t) - 1;
|
|
|
|
|
i >= TYPE_N_BASECLASSES (t);
|
|
|
|
|
--i)
|
|
|
|
|
{
|
|
|
|
|
char *fieldname = TYPE_FIELD_NAME (t, i);
|
|
|
|
|
|
2003-12-13 23:29:06 +01:00
|
|
|
|
if ((strncmp (fieldname, vptr_name,
|
|
|
|
|
strlen (vptr_name) - 1)
|
|
|
|
|
== 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&& is_cplus_marker (fieldname[strlen (vptr_name)]))
|
|
|
|
|
{
|
|
|
|
|
TYPE_VPTR_FIELDNO (type) = i;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Complain if virtual function table field not found. */
|
|
|
|
|
if (i < TYPE_N_BASECLASSES (t))
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"virtual function table pointer not found when defining class '%s'",
|
|
|
|
|
TYPE_TAG_NAME (type) ? TYPE_TAG_NAME (type) :
|
|
|
|
|
"");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TYPE_VPTR_FIELDNO (type) = TYPE_VPTR_FIELDNO (t);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
processing_current_prefix = previous_prefix;
|
|
|
|
|
if (back_to != NULL)
|
|
|
|
|
do_cleanups (back_to);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
static void
|
|
|
|
|
process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
const char *previous_prefix = processing_current_prefix;
|
2004-03-16 23:43:15 +01:00
|
|
|
|
struct die_info *child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
if (TYPE_TAG_NAME (die->type) != NULL)
|
|
|
|
|
processing_current_prefix = TYPE_TAG_NAME (die->type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-16 23:43:15 +01:00
|
|
|
|
/* NOTE: carlton/2004-03-16: GCC 3.4 (or at least one of its
|
|
|
|
|
snapshots) has been known to create a die giving a declaration
|
|
|
|
|
for a class that has, as a child, a die giving a definition for a
|
|
|
|
|
nested class. So we have to process our children even if the
|
|
|
|
|
current die is a declaration. Normally, of course, a declaration
|
|
|
|
|
won't have any children at all. */
|
2004-03-14 22:08:24 +01:00
|
|
|
|
|
2004-03-16 23:43:15 +01:00
|
|
|
|
while (child_die != NULL && child_die->tag)
|
|
|
|
|
{
|
|
|
|
|
if (child_die->tag == DW_TAG_member
|
|
|
|
|
|| child_die->tag == DW_TAG_variable
|
|
|
|
|
|| child_die->tag == DW_TAG_inheritance)
|
2004-03-14 22:08:24 +01:00
|
|
|
|
{
|
2004-03-16 23:43:15 +01:00
|
|
|
|
/* Do nothing. */
|
2004-03-14 22:08:24 +01:00
|
|
|
|
}
|
2004-03-16 23:43:15 +01:00
|
|
|
|
else
|
|
|
|
|
process_die (child_die, cu);
|
2004-03-14 22:08:24 +01:00
|
|
|
|
|
2004-03-16 23:43:15 +01:00
|
|
|
|
child_die = sibling_die (child_die);
|
2004-03-14 22:08:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-03-16 23:43:15 +01:00
|
|
|
|
if (die->child != NULL && ! die_is_declaration (die, cu))
|
|
|
|
|
new_symbol (die, die->type, cu);
|
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
processing_current_prefix = previous_prefix;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a DW_AT_enumeration_type die, set its type. We do not
|
|
|
|
|
complete the type's fields yet, or create any symbols. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
struct attribute *attr;
|
2004-03-14 22:08:24 +01:00
|
|
|
|
|
|
|
|
|
if (die->type)
|
|
|
|
|
return;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
type = alloc_type (objfile);
|
|
|
|
|
|
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_ENUM;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
{
|
2004-03-05 04:30:36 +01:00
|
|
|
|
char *name = DW_STRING (attr);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
if (processing_has_namespace_info)
|
|
|
|
|
{
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* objfiles.h (struct objfile): Add objfile_obstack field.
Remove type_obstack field.
* dwarf2read.c (dwarf2_add_field,dwarf2_add_member_fn,
read_structure_scope read_enumeration, new_symbol): Replace
type_obstack with objfile_obstack.
* dwarfread.c (struct_type, enum_type): Ditto.
* gdbtypes.c (alloc_type, alloc_type_instance, init_type)
(lookup_fundamental_type): Ditto.
* gdbtypes.h (TYPE_ALLOC): Ditto.
* hpread.c (hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_read_struct_type)
(fix_static_member_physnames, hpread_read_array_type)
(hpread_read_subrange_type, hpread_type_lookup): Ditto.
* jv-lang.c (java_lookup_class, type_from_class, type_from_class)
(java_link_class_type): Ditto.
* mdebugread.c (parse_type): Ditto.
* objfiles.c (allocate_objfile, free_objfile): Ditto.
* solib-sunos.c (solib_add_common_symbols): Ditto.
* stabsread.c (define_symbol, read_type, read_member_functions,
read_cpp_abbrev, read_one_struct_field): Ditto.
* symfile.c (reread_symbols): Ditto.
* symmisc.c (print_objfile_statistics): Ditto.
2004-02-07 17:57:55 +01:00
|
|
|
|
TYPE_TAG_NAME (type) = obconcat (&objfile->objfile_obstack,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_current_prefix,
|
|
|
|
|
processing_current_prefix[0] == '\0'
|
|
|
|
|
? "" : "::",
|
|
|
|
|
name);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* The name is already allocated along with this objfile, so
|
|
|
|
|
we don't need to duplicate it for the type. */
|
|
|
|
|
TYPE_TAG_NAME (type) = name;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (type) = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (type) = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-15 23:33:52 +01:00
|
|
|
|
/* Determine the name of the type represented by DIE, which should be
|
|
|
|
|
a named C++ compound type. Return the name in question; the caller
|
|
|
|
|
is responsible for xfree()'ing it. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
determine_class_name (struct die_info *die, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *back_to = NULL;
|
|
|
|
|
struct die_info *spec_die = die_specification (die, cu);
|
|
|
|
|
char *new_prefix = NULL;
|
|
|
|
|
|
|
|
|
|
/* If this is the definition of a class that is declared by another
|
|
|
|
|
die, then processing_current_prefix may not be accurate; see
|
|
|
|
|
read_func_scope for a similar example. */
|
|
|
|
|
if (spec_die != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *specification_prefix = determine_prefix (spec_die, cu);
|
|
|
|
|
processing_current_prefix = specification_prefix;
|
|
|
|
|
back_to = make_cleanup (xfree, specification_prefix);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we don't have namespace debug info, guess the name by trying
|
|
|
|
|
to demangle the names of members, just like we did in
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
guess_structure_name. */
|
2004-03-15 23:33:52 +01:00
|
|
|
|
if (!processing_has_namespace_info)
|
|
|
|
|
{
|
|
|
|
|
struct die_info *child;
|
|
|
|
|
|
|
|
|
|
for (child = die->child;
|
|
|
|
|
child != NULL && child->tag != 0;
|
|
|
|
|
child = sibling_die (child))
|
|
|
|
|
{
|
|
|
|
|
if (child->tag == DW_TAG_subprogram)
|
|
|
|
|
{
|
2004-07-06 21:29:31 +02:00
|
|
|
|
new_prefix
|
|
|
|
|
= language_class_name_from_physname (cu->language_defn,
|
|
|
|
|
dwarf2_linkage_name
|
2004-03-15 23:33:52 +01:00
|
|
|
|
(child, cu));
|
|
|
|
|
|
|
|
|
|
if (new_prefix != NULL)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (new_prefix == NULL)
|
|
|
|
|
{
|
|
|
|
|
const char *name = dwarf2_name (die, cu);
|
|
|
|
|
new_prefix = typename_concat (processing_current_prefix,
|
|
|
|
|
name ? name : "<<anonymous>>");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (back_to != NULL)
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
|
|
|
|
|
return new_prefix;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-14 22:08:24 +01:00
|
|
|
|
/* Given a pointer to a die which begins an enumeration, process all
|
|
|
|
|
the dies that define the members of the enumeration, and create the
|
|
|
|
|
symbol for the enumeration type.
|
|
|
|
|
|
|
|
|
|
NOTE: We reverse the order of the element list. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
struct field *fields;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
int num_fields;
|
|
|
|
|
int unsigned_enum = 1;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
num_fields = 0;
|
|
|
|
|
fields = NULL;
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
|
|
|
|
if (child_die->tag != DW_TAG_enumerator)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (child_die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
2004-03-14 22:08:24 +01:00
|
|
|
|
sym = new_symbol (child_die, die->type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (SYMBOL_VALUE (sym) < 0)
|
|
|
|
|
unsigned_enum = 0;
|
|
|
|
|
|
|
|
|
|
if ((num_fields % DW_FIELD_ALLOC_CHUNK) == 0)
|
|
|
|
|
{
|
|
|
|
|
fields = (struct field *)
|
|
|
|
|
xrealloc (fields,
|
|
|
|
|
(num_fields + DW_FIELD_ALLOC_CHUNK)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
* sizeof (struct field));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
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-25 22:36:23 +01:00
|
|
|
|
FIELD_NAME (fields[num_fields]) = DEPRECATED_SYMBOL_NAME (sym);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
FIELD_TYPE (fields[num_fields]) = NULL;
|
|
|
|
|
FIELD_BITPOS (fields[num_fields]) = SYMBOL_VALUE (sym);
|
|
|
|
|
FIELD_BITSIZE (fields[num_fields]) = 0;
|
2002-11-11 01:55:34 +01:00
|
|
|
|
FIELD_STATIC_KIND (fields[num_fields]) = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
num_fields++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (num_fields)
|
|
|
|
|
{
|
2004-03-14 22:08:24 +01:00
|
|
|
|
TYPE_NFIELDS (die->type) = num_fields;
|
|
|
|
|
TYPE_FIELDS (die->type) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (die->type, sizeof (struct field) * num_fields);
|
|
|
|
|
memcpy (TYPE_FIELDS (die->type), fields,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
sizeof (struct field) * num_fields);
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (fields);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
if (unsigned_enum)
|
2004-03-14 22:08:24 +01:00
|
|
|
|
TYPE_FLAGS (die->type) |= TYPE_FLAG_UNSIGNED;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2004-03-14 22:08:24 +01:00
|
|
|
|
|
|
|
|
|
new_symbol (die, die->type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract all information from a DW_TAG_array_type DIE and put it in
|
|
|
|
|
the DIE's type field. For now, this only handles one dimensional
|
|
|
|
|
arrays. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_array_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
struct type *type = NULL;
|
|
|
|
|
struct type *element_type, *range_type, *index_type;
|
|
|
|
|
struct type **range_types = NULL;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
int ndim = 0;
|
|
|
|
|
struct cleanup *back_to;
|
|
|
|
|
|
|
|
|
|
/* Return if we've already decoded this type. */
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
element_type = die_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Irix 6.2 native cc creates array types without children for
|
|
|
|
|
arrays with unspecified length. */
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
index_type = dwarf2_fundamental_type (objfile, FT_INTEGER, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
range_type = create_range_type (NULL, index_type, 0, -1);
|
|
|
|
|
die->type = create_array_type (NULL, element_type, range_type);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
back_to = make_cleanup (null_cleanup, NULL);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
|
|
|
|
if (child_die->tag == DW_TAG_subrange_type)
|
|
|
|
|
{
|
2004-01-17 06:35:47 +01:00
|
|
|
|
read_subrange_type (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-17 06:35:47 +01:00
|
|
|
|
if (child_die->type != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* The range type was succesfully read. Save it for
|
|
|
|
|
the array type creation. */
|
|
|
|
|
if ((ndim % DW_FIELD_ALLOC_CHUNK) == 0)
|
|
|
|
|
{
|
|
|
|
|
range_types = (struct type **)
|
|
|
|
|
xrealloc (range_types, (ndim + DW_FIELD_ALLOC_CHUNK)
|
|
|
|
|
* sizeof (struct type *));
|
|
|
|
|
if (ndim == 0)
|
|
|
|
|
make_cleanup (free_current_contents, &range_types);
|
|
|
|
|
}
|
|
|
|
|
range_types[ndim++] = child_die->type;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dwarf2 dimensions are output from left to right, create the
|
|
|
|
|
necessary array types in backwards order. */
|
|
|
|
|
type = element_type;
|
|
|
|
|
while (ndim-- > 0)
|
|
|
|
|
type = create_array_type (NULL, type, range_types[ndim]);
|
|
|
|
|
|
2002-04-26 22:08:19 +02:00
|
|
|
|
/* Understand Dwarf2 support for vector types (like they occur on
|
|
|
|
|
the PowerPC w/ AltiVec). Gcc just adds another attribute to the
|
|
|
|
|
array type. This is not part of the Dwarf2/3 standard yet, but a
|
|
|
|
|
custom vendor extension. The main difference between a regular
|
|
|
|
|
array and the vector variant is that vectors are passed by value
|
|
|
|
|
to functions. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_GNU_vector, cu);
|
2002-04-26 22:08:19 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
TYPE_FLAGS (type) |= TYPE_FLAG_VECTOR;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
|
|
|
|
|
/* Install the type in the die. */
|
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First cut: install each common block member as a global variable. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_common_block (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
CORE_ADDR base = (CORE_ADDR) 0;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
2002-07-12 21:55:10 +02:00
|
|
|
|
/* Support the .debug_loc offsets */
|
|
|
|
|
if (attr_form_is_block (attr))
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base = decode_locdesc (DW_BLOCK (attr), cu);
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
else if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
|
|
|
|
|
"common block member");
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
sym = new_symbol (child_die, NULL, cu);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (child_die, DW_AT_data_member_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (sym) =
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base + decode_locdesc (DW_BLOCK (attr), cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
|
|
|
|
}
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-23 18:40:55 +02:00
|
|
|
|
/* Read a C++ namespace. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_namespace (struct die_info *die, struct dwarf2_cu *cu)
|
2002-10-23 18:40:55 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2004-01-09 23:22:07 +01:00
|
|
|
|
const char *previous_prefix = processing_current_prefix;
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
const char *name;
|
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 01:07:11 +02:00
|
|
|
|
int is_anonymous;
|
|
|
|
|
struct die_info *current_die;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
name = namespace_name (die, &is_anonymous, cu);
|
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 01:07:11 +02:00
|
|
|
|
|
|
|
|
|
/* Now build the name of the current namespace. */
|
|
|
|
|
|
2004-01-09 23:22:07 +01:00
|
|
|
|
if (previous_prefix[0] == '\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 01:07:11 +02:00
|
|
|
|
{
|
2004-01-09 23:22:07 +01:00
|
|
|
|
processing_current_prefix = name;
|
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 01:07:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-01-09 23:22:07 +01:00
|
|
|
|
/* We need temp_name around because processing_current_prefix
|
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 01:07:11 +02:00
|
|
|
|
is a const char *. */
|
2004-01-09 23:22:07 +01:00
|
|
|
|
char *temp_name = alloca (strlen (previous_prefix)
|
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 01:07:11 +02:00
|
|
|
|
+ 2 + strlen(name) + 1);
|
2004-01-09 23:22:07 +01:00
|
|
|
|
strcpy (temp_name, previous_prefix);
|
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 01:07:11 +02:00
|
|
|
|
strcat (temp_name, "::");
|
|
|
|
|
strcat (temp_name, name);
|
|
|
|
|
|
2004-01-09 23:22:07 +01:00
|
|
|
|
processing_current_prefix = temp_name;
|
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 01:07:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
/* Add a symbol associated to this if we haven't seen the namespace
|
|
|
|
|
before. Also, add a using directive if it's an anonymous
|
|
|
|
|
namespace. */
|
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 01:07:11 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (dwarf2_extension (die, cu) == NULL)
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
/* FIXME: carlton/2003-06-27: Once GDB is more const-correct,
|
|
|
|
|
this cast will hopefully become unnecessary. */
|
|
|
|
|
type = init_type (TYPE_CODE_NAMESPACE, 0, 0,
|
2004-01-09 23:22:07 +01:00
|
|
|
|
(char *) processing_current_prefix,
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
objfile);
|
|
|
|
|
TYPE_TAG_NAME (type) = TYPE_NAME (type);
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
new_symbol (die, type, cu);
|
2004-03-15 23:33:52 +01:00
|
|
|
|
die->type = type;
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
|
|
|
|
|
if (is_anonymous)
|
2004-01-09 23:22:07 +01:00
|
|
|
|
cp_add_using_directive (processing_current_prefix,
|
|
|
|
|
strlen (previous_prefix),
|
|
|
|
|
strlen (processing_current_prefix));
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
}
|
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 01:07:11 +02:00
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
2002-10-23 18:40:55 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
struct die_info *child_die = die->child;
|
2002-10-23 18:40:55 +02:00
|
|
|
|
|
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
process_die (child_die, cu);
|
2002-10-23 18:40:55 +02:00
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
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 01:07:11 +02:00
|
|
|
|
|
2004-01-09 23:22:07 +01:00
|
|
|
|
processing_current_prefix = previous_prefix;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the name of the namespace represented by DIE. Set
|
|
|
|
|
*IS_ANONYMOUS to tell whether or not the namespace is an anonymous
|
|
|
|
|
namespace. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
namespace_name (struct die_info *die, int *is_anonymous, struct dwarf2_cu *cu)
|
2004-01-09 23:22:07 +01:00
|
|
|
|
{
|
|
|
|
|
struct die_info *current_die;
|
|
|
|
|
const char *name = NULL;
|
|
|
|
|
|
|
|
|
|
/* Loop through the extensions until we find a name. */
|
|
|
|
|
|
|
|
|
|
for (current_die = die;
|
|
|
|
|
current_die != NULL;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
current_die = dwarf2_extension (die, cu))
|
2004-01-09 23:22:07 +01:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
name = dwarf2_name (current_die, cu);
|
2004-01-09 23:22:07 +01:00
|
|
|
|
if (name != NULL)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Is it an anonymous namespace? */
|
|
|
|
|
|
|
|
|
|
*is_anonymous = (name == NULL);
|
|
|
|
|
if (*is_anonymous)
|
|
|
|
|
name = "(anonymous namespace)";
|
|
|
|
|
|
|
|
|
|
return name;
|
2002-10-23 18:40:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Extract all information from a DW_TAG_pointer_type DIE and add to
|
|
|
|
|
the user defined type vector. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_pointer_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
2002-10-16 22:50:22 +02:00
|
|
|
|
struct attribute *attr_byte_size;
|
|
|
|
|
struct attribute *attr_address_class;
|
|
|
|
|
int byte_size, addr_class;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = lookup_pointer_type (die_type (die, cu));
|
2002-10-16 22:50:22 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr_byte_size = dwarf2_attr (die, DW_AT_byte_size, cu);
|
2002-10-16 22:50:22 +02:00
|
|
|
|
if (attr_byte_size)
|
|
|
|
|
byte_size = DW_UNSND (attr_byte_size);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2002-10-16 22:50:22 +02:00
|
|
|
|
byte_size = cu_header->addr_size;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr_address_class = dwarf2_attr (die, DW_AT_address_class, cu);
|
2002-10-16 22:50:22 +02:00
|
|
|
|
if (attr_address_class)
|
|
|
|
|
addr_class = DW_UNSND (attr_address_class);
|
|
|
|
|
else
|
|
|
|
|
addr_class = DW_ADDR_none;
|
|
|
|
|
|
|
|
|
|
/* If the pointer size or address class is different than the
|
|
|
|
|
default, create a type variant marked as such and set the
|
|
|
|
|
length accordingly. */
|
|
|
|
|
if (TYPE_LENGTH (type) != byte_size || addr_class != DW_ADDR_none)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-10-16 22:50:22 +02:00
|
|
|
|
if (ADDRESS_CLASS_TYPE_FLAGS_P ())
|
|
|
|
|
{
|
|
|
|
|
int type_flags;
|
|
|
|
|
|
|
|
|
|
type_flags = ADDRESS_CLASS_TYPE_FLAGS (byte_size, addr_class);
|
|
|
|
|
gdb_assert ((type_flags & ~TYPE_FLAG_ADDRESS_CLASS_ALL) == 0);
|
|
|
|
|
type = make_type_with_address_space (type, type_flags);
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_LENGTH (type) != byte_size)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "invalid pointer size %d", byte_size);
|
2002-10-16 22:50:22 +02:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* Should we also complain about unhandled address classes? */
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-10-16 22:50:22 +02:00
|
|
|
|
|
|
|
|
|
TYPE_LENGTH (type) = byte_size;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract all information from a DW_TAG_ptr_to_member_type DIE and add to
|
|
|
|
|
the user defined type vector. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_ptr_to_member_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
struct type *to_type;
|
|
|
|
|
struct type *domain;
|
|
|
|
|
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type = alloc_type (objfile);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
to_type = die_type (die, cu);
|
|
|
|
|
domain = die_containing_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
smash_to_member_type (type, domain, to_type);
|
|
|
|
|
|
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract all information from a DW_TAG_reference_type DIE and add to
|
|
|
|
|
the user defined type vector. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_reference_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = lookup_reference_type (die_type (die, cu));
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (type) = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2000-07-24 03:26:10 +02:00
|
|
|
|
TYPE_LENGTH (type) = cu_header->addr_size;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2001-01-24 01:22:47 +01:00
|
|
|
|
struct type *base_type;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base_type = die_type (die, cu);
|
2001-01-24 01:22:47 +01:00
|
|
|
|
die->type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_volatile_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2001-01-24 01:22:47 +01:00
|
|
|
|
struct type *base_type;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
base_type = die_type (die, cu);
|
2001-01-24 01:22:47 +01:00
|
|
|
|
die->type = make_cv_type (TYPE_CONST (base_type), 1, base_type, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract all information from a DW_TAG_string_type DIE and add to
|
|
|
|
|
the user defined type vector. It isn't really a user defined type,
|
|
|
|
|
but it behaves like one, with other DIE's using an AT_user_def_type
|
|
|
|
|
attribute to reference it. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type, *range_type, *index_type, *char_type;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
unsigned int length;
|
|
|
|
|
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_string_length, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
length = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-01-11 17:56:04 +01:00
|
|
|
|
/* check for the DW_AT_byte_size attribute */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
2002-01-11 17:56:04 +01:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
length = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
length = 1;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
index_type = dwarf2_fundamental_type (objfile, FT_INTEGER, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
range_type = create_range_type (NULL, index_type, 1, length);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_fortran)
|
2002-01-11 17:56:04 +01:00
|
|
|
|
{
|
|
|
|
|
/* Need to create a unique string type for bounds
|
|
|
|
|
information */
|
|
|
|
|
type = create_string_type (0, range_type);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
char_type = dwarf2_fundamental_type (objfile, FT_CHAR, cu);
|
2002-01-11 17:56:04 +01:00
|
|
|
|
type = create_string_type (char_type, range_type);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle DIES due to C code like:
|
|
|
|
|
|
|
|
|
|
struct foo
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
int (*funcp)(int a, long l);
|
|
|
|
|
int b;
|
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
('funcp' generates a DW_TAG_subroutine_type DIE)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type; /* Type that this function returns */
|
|
|
|
|
struct type *ftype; /* Function that returns above type */
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
|
|
|
|
|
/* Decode the type that this subroutine returns */
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = die_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
ftype = lookup_function_type (type);
|
|
|
|
|
|
|
|
|
|
/* All functions in C++ have prototypes. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_prototyped, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if ((attr && (DW_UNSND (attr) != 0))
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
|| cu->language == language_cplus)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
TYPE_FLAGS (ftype) |= TYPE_FLAG_PROTOTYPED;
|
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *child_die;
|
|
|
|
|
int nparams = 0;
|
|
|
|
|
int iparams = 0;
|
|
|
|
|
|
|
|
|
|
/* Count the number of parameters.
|
|
|
|
|
FIXME: GDB currently ignores vararg functions, but knows about
|
|
|
|
|
vararg member functions. */
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
|
|
|
|
if (child_die->tag == DW_TAG_formal_parameter)
|
|
|
|
|
nparams++;
|
|
|
|
|
else if (child_die->tag == DW_TAG_unspecified_parameters)
|
|
|
|
|
TYPE_FLAGS (ftype) |= TYPE_FLAG_VARARGS;
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate storage for parameters and fill them in. */
|
|
|
|
|
TYPE_NFIELDS (ftype) = nparams;
|
|
|
|
|
TYPE_FIELDS (ftype) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (ftype, nparams * sizeof (struct field));
|
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
child_die = die->child;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (child_die && child_die->tag)
|
|
|
|
|
{
|
|
|
|
|
if (child_die->tag == DW_TAG_formal_parameter)
|
|
|
|
|
{
|
|
|
|
|
/* Dwarf2 has no clean way to discern C++ static and non-static
|
1999-07-07 22:19:36 +02:00
|
|
|
|
member functions. G++ helps GDB by marking the first
|
|
|
|
|
parameter for non-static member functions (which is the
|
|
|
|
|
this pointer) as artificial. We pass this information
|
|
|
|
|
to dwarf2_add_member_fn via TYPE_FIELD_ARTIFICIAL. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (child_die, DW_AT_artificial, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
TYPE_FIELD_ARTIFICIAL (ftype, iparams) = DW_UNSND (attr);
|
|
|
|
|
else
|
|
|
|
|
TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
TYPE_FIELD_TYPE (ftype, iparams) = die_type (child_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
iparams++;
|
|
|
|
|
}
|
|
|
|
|
child_die = sibling_die (child_die);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
die->type = ftype;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_typedef (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2001-12-10 00:17:07 +01:00
|
|
|
|
struct attribute *attr;
|
|
|
|
|
char *name = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!die->type)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
2001-12-10 00:17:07 +01:00
|
|
|
|
{
|
|
|
|
|
name = DW_STRING (attr);
|
|
|
|
|
}
|
|
|
|
|
die->type = init_type (TYPE_CODE_TYPEDEF, 0, TYPE_FLAG_TARGET_STUB, name, objfile);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
TYPE_TARGET_TYPE (die->type) = die_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a representation of a given base type and install
|
|
|
|
|
it in the TYPE field of the die. */
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_base_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
int encoding = 0, size = 0;
|
|
|
|
|
|
|
|
|
|
/* If we've already decoded this die, this is a no-op. */
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_encoding, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
encoding = DW_UNSND (attr);
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
size = DW_UNSND (attr);
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
{
|
|
|
|
|
enum type_code code = TYPE_CODE_INT;
|
2001-12-09 08:26:47 +01:00
|
|
|
|
int type_flags = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
switch (encoding)
|
|
|
|
|
{
|
|
|
|
|
case DW_ATE_address:
|
|
|
|
|
/* Turn DW_ATE_address into a void * pointer. */
|
|
|
|
|
code = TYPE_CODE_PTR;
|
2001-12-09 08:26:47 +01:00
|
|
|
|
type_flags |= TYPE_FLAG_UNSIGNED;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_ATE_boolean:
|
|
|
|
|
code = TYPE_CODE_BOOL;
|
2001-12-09 08:26:47 +01:00
|
|
|
|
type_flags |= TYPE_FLAG_UNSIGNED;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_ATE_complex_float:
|
|
|
|
|
code = TYPE_CODE_COMPLEX;
|
|
|
|
|
break;
|
|
|
|
|
case DW_ATE_float:
|
|
|
|
|
code = TYPE_CODE_FLT;
|
|
|
|
|
break;
|
|
|
|
|
case DW_ATE_signed:
|
|
|
|
|
case DW_ATE_signed_char:
|
|
|
|
|
break;
|
|
|
|
|
case DW_ATE_unsigned:
|
|
|
|
|
case DW_ATE_unsigned_char:
|
2001-12-09 08:26:47 +01:00
|
|
|
|
type_flags |= TYPE_FLAG_UNSIGNED;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "unsupported DW_AT_encoding: '%s'",
|
|
|
|
|
dwarf_type_encoding_name (encoding));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2001-12-09 08:26:47 +01:00
|
|
|
|
type = init_type (code, size, type_flags, DW_STRING (attr), objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (encoding == DW_ATE_address)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
TYPE_TARGET_TYPE (type) = dwarf2_fundamental_type (objfile, FT_VOID,
|
|
|
|
|
cu);
|
2002-03-21 01:53:44 +01:00
|
|
|
|
else if (encoding == DW_ATE_complex_float)
|
|
|
|
|
{
|
|
|
|
|
if (size == 32)
|
|
|
|
|
TYPE_TARGET_TYPE (type)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
= dwarf2_fundamental_type (objfile, FT_EXT_PREC_FLOAT, cu);
|
2002-03-21 01:53:44 +01:00
|
|
|
|
else if (size == 16)
|
|
|
|
|
TYPE_TARGET_TYPE (type)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
= dwarf2_fundamental_type (objfile, FT_DBL_PREC_FLOAT, cu);
|
2002-03-21 01:53:44 +01:00
|
|
|
|
else if (size == 8)
|
|
|
|
|
TYPE_TARGET_TYPE (type)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
= dwarf2_fundamental_type (objfile, FT_FLOAT, cu);
|
2002-03-21 01:53:44 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = dwarf_base_type (encoding, size, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
die->type = type;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-17 06:35:47 +01:00
|
|
|
|
/* Read the given DW_AT_subrange DIE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct type *base_type;
|
|
|
|
|
struct type *range_type;
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
int low = 0;
|
|
|
|
|
int high = -1;
|
|
|
|
|
|
|
|
|
|
/* If we have already decoded this die, then nothing more to do. */
|
|
|
|
|
if (die->type)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
base_type = die_type (die, cu);
|
|
|
|
|
if (base_type == NULL)
|
|
|
|
|
{
|
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"DW_AT_type missing from DW_TAG_subrange_type");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (base_type) == TYPE_CODE_VOID)
|
|
|
|
|
base_type = alloc_type (NULL);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_fortran)
|
2004-01-17 06:35:47 +01:00
|
|
|
|
{
|
|
|
|
|
/* FORTRAN implies a lower bound of 1, if not given. */
|
|
|
|
|
low = 1;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
|
2004-01-17 06:35:47 +01:00
|
|
|
|
if (attr)
|
|
|
|
|
low = dwarf2_get_attr_constant_value (attr, 0);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
|
2004-01-17 06:35:47 +01:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
if (attr->form == DW_FORM_block1)
|
|
|
|
|
{
|
|
|
|
|
/* GCC encodes arrays with unspecified or dynamic length
|
|
|
|
|
with a DW_FORM_block1 attribute.
|
|
|
|
|
FIXME: GDB does not yet know how to handle dynamic
|
|
|
|
|
arrays properly, treat them as arrays with unspecified
|
|
|
|
|
length for now.
|
|
|
|
|
|
|
|
|
|
FIXME: jimb/2003-09-22: GDB does not really know
|
|
|
|
|
how to handle arrays of unspecified length
|
|
|
|
|
either; we just represent them as zero-length
|
|
|
|
|
arrays. Choose an appropriate upper bound given
|
|
|
|
|
the lower bound we've computed above. */
|
|
|
|
|
high = low - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
high = dwarf2_get_attr_constant_value (attr, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
range_type = create_range_type (NULL, base_type, low, high);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
2004-01-17 06:35:47 +01:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
TYPE_NAME (range_type) = DW_STRING (attr);
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
|
2004-01-17 06:35:47 +01:00
|
|
|
|
if (attr)
|
|
|
|
|
TYPE_LENGTH (range_type) = DW_UNSND (attr);
|
|
|
|
|
|
|
|
|
|
die->type = range_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read a whole compilation unit into a linked list of dies. */
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static struct die_info *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_comp_unit (char *info_ptr, bfd *abfd, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-11-08 03:50:51 +01:00
|
|
|
|
/* Reset die reference table; we are
|
2000-07-18 09:47:02 +02:00
|
|
|
|
building new ones now. */
|
|
|
|
|
dwarf2_empty_hash_tables ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
return read_die_and_children (info_ptr, abfd, cu, &info_ptr, NULL);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read a single die and all its descendents. Set the die's sibling
|
|
|
|
|
field to NULL; set other fields in the die correctly, and set all
|
|
|
|
|
of the descendents' fields correctly. Set *NEW_INFO_PTR to the
|
|
|
|
|
location of the info_ptr after reading all of those dies. PARENT
|
|
|
|
|
is the parent of the die in question. */
|
|
|
|
|
|
|
|
|
|
static struct die_info *
|
|
|
|
|
read_die_and_children (char *info_ptr, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
char **new_info_ptr,
|
|
|
|
|
struct die_info *parent)
|
|
|
|
|
{
|
|
|
|
|
struct die_info *die;
|
|
|
|
|
char *cur_ptr;
|
|
|
|
|
int has_children;
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cur_ptr = read_full_die (&die, abfd, info_ptr, cu, &has_children);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
store_in_ref_table (die->offset, die);
|
|
|
|
|
|
|
|
|
|
if (has_children)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
die->child = read_die_and_siblings (cur_ptr, abfd, cu,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
new_info_ptr, die);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
die->child = NULL;
|
|
|
|
|
*new_info_ptr = cur_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
die->sibling = NULL;
|
|
|
|
|
die->parent = parent;
|
|
|
|
|
return die;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read a die, all of its descendents, and all of its siblings; set
|
|
|
|
|
all of the fields of all of the dies correctly. Arguments are as
|
|
|
|
|
in read_die_and_children. */
|
|
|
|
|
|
|
|
|
|
static struct die_info *
|
|
|
|
|
read_die_and_siblings (char *info_ptr, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
char **new_info_ptr,
|
|
|
|
|
struct die_info *parent)
|
|
|
|
|
{
|
|
|
|
|
struct die_info *first_die, *last_sibling;
|
|
|
|
|
char *cur_ptr;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
cur_ptr = info_ptr;
|
2003-10-01 00:29:28 +02:00
|
|
|
|
first_die = last_sibling = NULL;
|
|
|
|
|
|
|
|
|
|
while (1)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
struct die_info *die
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
= read_die_and_children (cur_ptr, abfd, cu, &cur_ptr, parent);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
|
|
|
|
|
if (!first_die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
first_die = die;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-10-01 00:29:28 +02:00
|
|
|
|
else
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
last_sibling->sibling = die;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->tag == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
*new_info_ptr = cur_ptr;
|
|
|
|
|
return first_die;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
last_sibling = die;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free a linked list of dies. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
free_die_list (struct die_info *dies)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *die, *next;
|
|
|
|
|
|
|
|
|
|
die = dies;
|
|
|
|
|
while (die)
|
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
|
|
|
|
free_die_list (die->child);
|
|
|
|
|
next = die->sibling;
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (die->attrs);
|
|
|
|
|
xfree (die);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
die = next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-05-22 11:02:23 +02:00
|
|
|
|
static void
|
|
|
|
|
do_free_die_list_cleanup (void *dies)
|
|
|
|
|
{
|
|
|
|
|
free_die_list (dies);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct cleanup *
|
|
|
|
|
make_cleanup_free_die_list (struct die_info *dies)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_free_die_list_cleanup, dies);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read the contents of the section at OFFSET and of size SIZE from the
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* dbxread.c (dbx_symfile_init, start_psymtab, end_psymtab,
coffstab_build_psymtabs, elfstab_build_psymtabs)
(stabsect_build_psymtabs): Replace psymbol_obstack with
objfile_obstack.
* dwarf2-frame.c (decode_frame_entry_1): Ditto.
* dwarf2read.c (dwarf2_build_psymtabs_hard, dwarf2_read_section):
Ditto.
* dwarfread.c (scan_compilation_units): Ditto.
* elfread.c (elfstab_offset_sections): Ditto.
* hppa-tdep.c (read_unwind_info): Ditto.
* hpread.c (hpread_build_psymtabs, hpread_start_psymtab)
(hpread_end_psymtab): Ditto.
* mdebugread.c (mdebug_build_psymtabs, add_pending)
(parse_partial_symbols, new_psymtab, elfmdebug_build_psymtabs):
Ditto.
* mips-tdep.c (non_heuristic_proc_desc): Ditto.
* objfiles.c (add_to_objfile_sections)
(build_objfile_section_table): Ditto.
(allocate_objfile): Remove init of psymbol_obstack.
(free_objfile): Remove freeing of psymbol_obstack.
* objfiles.h (struct objfile): Remove field
psymbol_obstack. Update comments.
* pa64solib.c (pa64_solib_add_solib_objfile): Replace
psymbol_obstack with objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
psymbol_obstack.
* somread.c (som_symfile_offsets, init_import_symbols)
(init_export_symbols): Replace psymbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add_solib_objfile): Ditto.
* symfile.c (default_symfile_offsets, syms_from_objfile)
(reread_symbols): Remove freeing and init of psymbol_obstack.
(cashier_psymtab): Update comment.
* symmisc.c (print_objfile_statistics): Don't report stats for
psymbol obstack.
* symtab.h (struct general_symbol_info, struct partial_symtab):
Update comments.
* xcoffread.c (xcoff_start_psymtab, xcoff_end_psymtab, swap_sym)
(xcoff_symfile_offsets): Replace psymbol_obstack with
objfile_obstack.
2004-02-07 19:29:54 +01:00
|
|
|
|
object file specified by OBJFILE into the objfile_obstack and return it. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2001-12-07 13:10:15 +01:00
|
|
|
|
char *
|
2003-12-02 17:41:39 +01:00
|
|
|
|
dwarf2_read_section (struct objfile *objfile, asection *sectp)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
bfd *abfd = objfile->obfd;
|
2003-01-31 20:22:18 +01:00
|
|
|
|
char *buf, *retbuf;
|
2004-06-15 03:04:20 +02:00
|
|
|
|
bfd_size_type size = bfd_get_section_size (sectp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (size == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* dbxread.c (dbx_symfile_init, start_psymtab, end_psymtab,
coffstab_build_psymtabs, elfstab_build_psymtabs)
(stabsect_build_psymtabs): Replace psymbol_obstack with
objfile_obstack.
* dwarf2-frame.c (decode_frame_entry_1): Ditto.
* dwarf2read.c (dwarf2_build_psymtabs_hard, dwarf2_read_section):
Ditto.
* dwarfread.c (scan_compilation_units): Ditto.
* elfread.c (elfstab_offset_sections): Ditto.
* hppa-tdep.c (read_unwind_info): Ditto.
* hpread.c (hpread_build_psymtabs, hpread_start_psymtab)
(hpread_end_psymtab): Ditto.
* mdebugread.c (mdebug_build_psymtabs, add_pending)
(parse_partial_symbols, new_psymtab, elfmdebug_build_psymtabs):
Ditto.
* mips-tdep.c (non_heuristic_proc_desc): Ditto.
* objfiles.c (add_to_objfile_sections)
(build_objfile_section_table): Ditto.
(allocate_objfile): Remove init of psymbol_obstack.
(free_objfile): Remove freeing of psymbol_obstack.
* objfiles.h (struct objfile): Remove field
psymbol_obstack. Update comments.
* pa64solib.c (pa64_solib_add_solib_objfile): Replace
psymbol_obstack with objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
psymbol_obstack.
* somread.c (som_symfile_offsets, init_import_symbols)
(init_export_symbols): Replace psymbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add_solib_objfile): Ditto.
* symfile.c (default_symfile_offsets, syms_from_objfile)
(reread_symbols): Remove freeing and init of psymbol_obstack.
(cashier_psymtab): Update comment.
* symmisc.c (print_objfile_statistics): Don't report stats for
psymbol obstack.
* symtab.h (struct general_symbol_info, struct partial_symtab):
Update comments.
* xcoffread.c (xcoff_start_psymtab, xcoff_end_psymtab, swap_sym)
(xcoff_symfile_offsets): Replace psymbol_obstack with
objfile_obstack.
2004-02-07 19:29:54 +01:00
|
|
|
|
buf = (char *) obstack_alloc (&objfile->objfile_obstack, size);
|
2003-01-31 20:22:18 +01:00
|
|
|
|
retbuf
|
|
|
|
|
= (char *) symfile_relocate_debug_section (abfd, sectp, (bfd_byte *) buf);
|
|
|
|
|
if (retbuf != NULL)
|
|
|
|
|
return retbuf;
|
|
|
|
|
|
2003-12-02 17:41:39 +01:00
|
|
|
|
if (bfd_seek (abfd, sectp->filepos, SEEK_SET) != 0
|
|
|
|
|
|| bfd_bread (buf, size, abfd) != size)
|
|
|
|
|
error ("Dwarf Error: Can't read DWARF data from '%s'",
|
|
|
|
|
bfd_get_filename (abfd));
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In DWARF version 2, the description of the debugging information is
|
|
|
|
|
stored in a separate .debug_abbrev section. Before we read any
|
|
|
|
|
dies from a section we read in all abbreviations and install them
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
in a hash table. This function also sets flags in CU describing
|
|
|
|
|
the data found in the abbrev table. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_read_abbrevs (bfd *abfd, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
char *abbrev_ptr;
|
|
|
|
|
struct abbrev_info *cur_abbrev;
|
|
|
|
|
unsigned int abbrev_number, bytes_read, abbrev_name;
|
|
|
|
|
unsigned int abbrev_form, hash_number;
|
2004-03-09 17:57:44 +01:00
|
|
|
|
struct attr_abbrev *cur_attrs;
|
|
|
|
|
unsigned int allocated_attrs;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-10-09 06:43:49 +02:00
|
|
|
|
/* Initialize dwarf2 abbrevs */
|
2004-03-09 17:57:44 +01:00
|
|
|
|
obstack_init (&cu->abbrev_obstack);
|
|
|
|
|
cu->dwarf2_abbrevs = obstack_alloc (&cu->abbrev_obstack,
|
|
|
|
|
(ABBREV_HASH_SIZE
|
|
|
|
|
* sizeof (struct abbrev_info *)));
|
|
|
|
|
memset (cu->dwarf2_abbrevs, 0,
|
|
|
|
|
ABBREV_HASH_SIZE * sizeof (struct abbrev_info *));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
abbrev_ptr = dwarf2_per_objfile->abbrev_buffer + cu_header->abbrev_offset;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
allocated_attrs = ATTR_ALLOC_CHUNK;
|
|
|
|
|
cur_attrs = xmalloc (allocated_attrs * sizeof (struct attr_abbrev));
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* loop until we reach an abbrev number of 0 */
|
|
|
|
|
while (abbrev_number)
|
|
|
|
|
{
|
2004-03-09 17:57:44 +01:00
|
|
|
|
cur_abbrev = dwarf_alloc_abbrev (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* read in abbrev header */
|
|
|
|
|
cur_abbrev->number = abbrev_number;
|
|
|
|
|
cur_abbrev->tag = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
cur_abbrev->has_children = read_1_byte (abfd, abbrev_ptr);
|
|
|
|
|
abbrev_ptr += 1;
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
if (cur_abbrev->tag == DW_TAG_namespace)
|
|
|
|
|
cu->has_namespace_info = 1;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* now read in declarations */
|
|
|
|
|
abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
while (abbrev_name)
|
|
|
|
|
{
|
2004-03-09 17:57:44 +01:00
|
|
|
|
if (cur_abbrev->num_attrs == allocated_attrs)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-03-09 17:57:44 +01:00
|
|
|
|
allocated_attrs += ATTR_ALLOC_CHUNK;
|
|
|
|
|
cur_attrs
|
|
|
|
|
= xrealloc (cur_attrs, (allocated_attrs
|
|
|
|
|
* sizeof (struct attr_abbrev)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2004-03-09 17:57:44 +01:00
|
|
|
|
cur_attrs[cur_abbrev->num_attrs].name = abbrev_name;
|
|
|
|
|
cur_attrs[cur_abbrev->num_attrs++].form = abbrev_form;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
cur_abbrev->attrs = obstack_alloc (&cu->abbrev_obstack,
|
|
|
|
|
(cur_abbrev->num_attrs
|
|
|
|
|
* sizeof (struct attr_abbrev)));
|
|
|
|
|
memcpy (cur_abbrev->attrs, cur_attrs,
|
|
|
|
|
cur_abbrev->num_attrs * sizeof (struct attr_abbrev));
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
hash_number = abbrev_number % ABBREV_HASH_SIZE;
|
2004-03-09 17:57:44 +01:00
|
|
|
|
cur_abbrev->next = cu->dwarf2_abbrevs[hash_number];
|
|
|
|
|
cu->dwarf2_abbrevs[hash_number] = cur_abbrev;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Get next abbreviation.
|
|
|
|
|
Under Irix6 the abbreviations for a compilation unit are not
|
1999-07-07 22:19:36 +02:00
|
|
|
|
always properly terminated with an abbrev number of 0.
|
|
|
|
|
Exit loop if we encounter an abbreviation which we have
|
|
|
|
|
already read (which means we are about to read the abbreviations
|
|
|
|
|
for the next compile unit) or if the end of the abbreviation
|
|
|
|
|
table is reached. */
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if ((unsigned int) (abbrev_ptr - dwarf2_per_objfile->abbrev_buffer)
|
|
|
|
|
>= dwarf2_per_objfile->abbrev_size)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
|
|
|
|
|
abbrev_ptr += bytes_read;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
if (dwarf2_lookup_abbrev (abbrev_number, cu) != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2004-03-09 17:57:44 +01:00
|
|
|
|
|
|
|
|
|
xfree (cur_attrs);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
/* Release the memory used by the abbrev table for a compilation unit. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2004-03-09 17:57:44 +01:00
|
|
|
|
dwarf2_free_abbrev_table (void *ptr_to_cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-03-09 17:57:44 +01:00
|
|
|
|
struct dwarf2_cu *cu = ptr_to_cu;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
obstack_free (&cu->abbrev_obstack, NULL);
|
|
|
|
|
cu->dwarf2_abbrevs = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Lookup an abbrev_info structure in the abbrev hash table. */
|
|
|
|
|
|
|
|
|
|
static struct abbrev_info *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_lookup_abbrev (unsigned int number, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int hash_number;
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
|
|
|
|
|
hash_number = number % ABBREV_HASH_SIZE;
|
2004-03-09 17:57:44 +01:00
|
|
|
|
abbrev = cu->dwarf2_abbrevs[hash_number];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
while (abbrev)
|
|
|
|
|
{
|
|
|
|
|
if (abbrev->number == number)
|
|
|
|
|
return abbrev;
|
|
|
|
|
else
|
|
|
|
|
abbrev = abbrev->next;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Returns nonzero if TAG represents a type that we might generate a partial
|
|
|
|
|
symbol for. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_type_tag_for_partial (int tag)
|
|
|
|
|
{
|
|
|
|
|
switch (tag)
|
|
|
|
|
{
|
|
|
|
|
#if 0
|
|
|
|
|
/* Some types that would be reasonable to generate partial symbols for,
|
|
|
|
|
that we don't at present. */
|
|
|
|
|
case DW_TAG_array_type:
|
|
|
|
|
case DW_TAG_file_type:
|
|
|
|
|
case DW_TAG_ptr_to_member_type:
|
|
|
|
|
case DW_TAG_set_type:
|
|
|
|
|
case DW_TAG_string_type:
|
|
|
|
|
case DW_TAG_subroutine_type:
|
|
|
|
|
#endif
|
|
|
|
|
case DW_TAG_base_type:
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_enumeration_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_subrange_type:
|
|
|
|
|
case DW_TAG_typedef:
|
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Load all DIEs that are interesting for partial symbols into memory. */
|
|
|
|
|
|
|
|
|
|
static struct partial_die_info *
|
|
|
|
|
load_partial_dies (bfd *abfd, char *info_ptr, int building_psymtab,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct partial_die_info *part_die;
|
|
|
|
|
struct partial_die_info *parent_die, *last_die, *first_die = NULL;
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
|
|
|
|
|
int nesting_level = 1;
|
|
|
|
|
|
|
|
|
|
parent_die = NULL;
|
|
|
|
|
last_die = NULL;
|
|
|
|
|
|
|
|
|
|
cu->partial_dies
|
|
|
|
|
= htab_create_alloc_ex (cu->header.length / 12,
|
|
|
|
|
partial_die_hash,
|
|
|
|
|
partial_die_eq,
|
|
|
|
|
NULL,
|
|
|
|
|
&cu->comp_unit_obstack,
|
|
|
|
|
hashtab_obstack_allocate,
|
|
|
|
|
dummy_obstack_deallocate);
|
|
|
|
|
|
|
|
|
|
part_die = obstack_alloc (&cu->comp_unit_obstack,
|
|
|
|
|
sizeof (struct partial_die_info));
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
abbrev = peek_die_abbrev (info_ptr, &bytes_read, cu);
|
|
|
|
|
|
|
|
|
|
/* A NULL abbrev means the end of a series of children. */
|
|
|
|
|
if (abbrev == NULL)
|
|
|
|
|
{
|
|
|
|
|
if (--nesting_level == 0)
|
|
|
|
|
{
|
|
|
|
|
/* PART_DIE was probably the last thing allocated on the
|
|
|
|
|
comp_unit_obstack, so we could call obstack_free
|
|
|
|
|
here. We don't do that because the waste is small,
|
|
|
|
|
and will be cleaned up when we're done with this
|
|
|
|
|
compilation unit. This way, we're also more robust
|
|
|
|
|
against other users of the comp_unit_obstack. */
|
|
|
|
|
return first_die;
|
|
|
|
|
}
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
last_die = parent_die;
|
|
|
|
|
parent_die = parent_die->die_parent;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check whether this DIE is interesting enough to save. */
|
|
|
|
|
if (!is_type_tag_for_partial (abbrev->tag)
|
|
|
|
|
&& abbrev->tag != DW_TAG_enumerator
|
|
|
|
|
&& abbrev->tag != DW_TAG_subprogram
|
|
|
|
|
&& abbrev->tag != DW_TAG_variable
|
|
|
|
|
&& abbrev->tag != DW_TAG_namespace)
|
|
|
|
|
{
|
|
|
|
|
/* Otherwise we skip to the next sibling, if any. */
|
|
|
|
|
info_ptr = skip_one_die (info_ptr + bytes_read, abbrev, cu);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
info_ptr = read_partial_die (part_die, abbrev, bytes_read,
|
|
|
|
|
abfd, info_ptr, cu);
|
|
|
|
|
|
|
|
|
|
/* This two-pass algorithm for processing partial symbols has a
|
|
|
|
|
high cost in cache pressure. Thus, handle some simple cases
|
|
|
|
|
here which cover the majority of C partial symbols. DIEs
|
|
|
|
|
which neither have specification tags in them, nor could have
|
|
|
|
|
specification tags elsewhere pointing at them, can simply be
|
|
|
|
|
processed and discarded.
|
|
|
|
|
|
|
|
|
|
This segment is also optional; scan_partial_symbols and
|
|
|
|
|
add_partial_symbol will handle these DIEs if we chain
|
|
|
|
|
them in normally. When compilers which do not emit large
|
|
|
|
|
quantities of duplicate debug information are more common,
|
|
|
|
|
this code can probably be removed. */
|
|
|
|
|
|
|
|
|
|
/* Any complete simple types at the top level (pretty much all
|
|
|
|
|
of them, for a language without namespaces), can be processed
|
|
|
|
|
directly. */
|
|
|
|
|
if (parent_die == NULL
|
|
|
|
|
&& part_die->has_specification == 0
|
|
|
|
|
&& part_die->is_declaration == 0
|
|
|
|
|
&& (part_die->tag == DW_TAG_typedef
|
|
|
|
|
|| part_die->tag == DW_TAG_base_type
|
|
|
|
|
|| part_die->tag == DW_TAG_subrange_type))
|
|
|
|
|
{
|
|
|
|
|
if (building_psymtab && part_die->name != NULL)
|
|
|
|
|
add_psymbol_to_list (part_die->name, strlen (part_die->name),
|
|
|
|
|
VAR_DOMAIN, LOC_TYPEDEF,
|
|
|
|
|
&cu->objfile->static_psymbols,
|
|
|
|
|
0, (CORE_ADDR) 0, cu->language, cu->objfile);
|
|
|
|
|
info_ptr = locate_pdi_sibling (part_die, info_ptr, abfd, cu);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we're at the second level, and we're an enumerator, and
|
|
|
|
|
our parent has no specification (meaning possibly lives in a
|
|
|
|
|
namespace elsewhere), then we can add the partial symbol now
|
|
|
|
|
instead of queueing it. */
|
|
|
|
|
if (part_die->tag == DW_TAG_enumerator
|
|
|
|
|
&& parent_die != NULL
|
|
|
|
|
&& parent_die->die_parent == NULL
|
|
|
|
|
&& parent_die->tag == DW_TAG_enumeration_type
|
|
|
|
|
&& parent_die->has_specification == 0)
|
|
|
|
|
{
|
|
|
|
|
if (part_die->name == NULL)
|
|
|
|
|
complaint (&symfile_complaints, "malformed enumerator DIE ignored");
|
|
|
|
|
else if (building_psymtab)
|
|
|
|
|
add_psymbol_to_list (part_die->name, strlen (part_die->name),
|
|
|
|
|
VAR_DOMAIN, LOC_CONST,
|
|
|
|
|
cu->language == language_cplus
|
|
|
|
|
? &cu->objfile->global_psymbols
|
|
|
|
|
: &cu->objfile->static_psymbols,
|
|
|
|
|
0, (CORE_ADDR) 0, cu->language, cu->objfile);
|
|
|
|
|
|
|
|
|
|
info_ptr = locate_pdi_sibling (part_die, info_ptr, abfd, cu);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We'll save this DIE so link it in. */
|
|
|
|
|
part_die->die_parent = parent_die;
|
|
|
|
|
part_die->die_sibling = NULL;
|
|
|
|
|
part_die->die_child = NULL;
|
|
|
|
|
|
|
|
|
|
if (last_die && last_die == parent_die)
|
|
|
|
|
last_die->die_child = part_die;
|
|
|
|
|
else if (last_die)
|
|
|
|
|
last_die->die_sibling = part_die;
|
|
|
|
|
|
|
|
|
|
last_die = part_die;
|
|
|
|
|
|
|
|
|
|
if (first_die == NULL)
|
|
|
|
|
first_die = part_die;
|
|
|
|
|
|
|
|
|
|
/* Maybe add the DIE to the hash table. Not all DIEs that we
|
|
|
|
|
find interesting need to be in the hash table, because we
|
|
|
|
|
also have the parent/sibling/child chains; only those that we
|
|
|
|
|
might refer to by offset later during partial symbol reading.
|
|
|
|
|
|
|
|
|
|
For now this means things that might have be the target of a
|
|
|
|
|
DW_AT_specification, DW_AT_abstract_origin, or
|
|
|
|
|
DW_AT_extension. DW_AT_extension will refer only to
|
|
|
|
|
namespaces; DW_AT_abstract_origin refers to functions (and
|
|
|
|
|
many things under the function DIE, but we do not recurse
|
|
|
|
|
into function DIEs during partial symbol reading) and
|
|
|
|
|
possibly variables as well; DW_AT_specification refers to
|
|
|
|
|
declarations. Declarations ought to have the DW_AT_declaration
|
|
|
|
|
flag. It happens that GCC forgets to put it in sometimes, but
|
|
|
|
|
only for functions, not for types.
|
|
|
|
|
|
|
|
|
|
Adding more things than necessary to the hash table is harmless
|
|
|
|
|
except for the performance cost. Adding too few will result in
|
|
|
|
|
internal errors in find_partial_die. */
|
|
|
|
|
|
|
|
|
|
if (abbrev->tag == DW_TAG_subprogram
|
|
|
|
|
|| abbrev->tag == DW_TAG_variable
|
|
|
|
|
|| abbrev->tag == DW_TAG_namespace
|
|
|
|
|
|| part_die->is_declaration)
|
|
|
|
|
{
|
|
|
|
|
void **slot;
|
|
|
|
|
|
|
|
|
|
slot = htab_find_slot_with_hash (cu->partial_dies, part_die,
|
|
|
|
|
part_die->offset, INSERT);
|
|
|
|
|
*slot = part_die;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
part_die = obstack_alloc (&cu->comp_unit_obstack,
|
|
|
|
|
sizeof (struct partial_die_info));
|
|
|
|
|
|
|
|
|
|
/* For some DIEs we want to follow their children (if any). For C
|
|
|
|
|
we have no reason to follow the children of structures; for other
|
|
|
|
|
languages we have to, both so that we can get at method physnames
|
|
|
|
|
to infer fully qualified class names, and for DW_AT_specification. */
|
|
|
|
|
if (last_die->has_children
|
|
|
|
|
&& (last_die->tag == DW_TAG_namespace
|
|
|
|
|
|| last_die->tag == DW_TAG_enumeration_type
|
|
|
|
|
|| (cu->language != language_c
|
|
|
|
|
&& (last_die->tag == DW_TAG_class_type
|
|
|
|
|
|| last_die->tag == DW_TAG_structure_type
|
|
|
|
|
|| last_die->tag == DW_TAG_union_type))))
|
|
|
|
|
{
|
|
|
|
|
nesting_level++;
|
|
|
|
|
parent_die = last_die;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Otherwise we skip to the next sibling, if any. */
|
|
|
|
|
info_ptr = locate_pdi_sibling (last_die, info_ptr, abfd, cu);
|
|
|
|
|
|
|
|
|
|
/* Back to the top, do it again. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read a minimal amount of information into the minimal die structure. */
|
|
|
|
|
|
|
|
|
|
static char *
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
read_partial_die (struct partial_die_info *part_die,
|
|
|
|
|
struct abbrev_info *abbrev,
|
|
|
|
|
unsigned int abbrev_len, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
char *info_ptr, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
unsigned int bytes_read, i;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct attribute attr;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
int has_low_pc_attr = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int has_high_pc_attr = 0;
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
memset (part_die, 0, sizeof (struct partial_die_info));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
part_die->offset = info_ptr - dwarf2_per_objfile->info_buffer;
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
|
|
|
|
|
info_ptr += abbrev_len;
|
|
|
|
|
|
|
|
|
|
if (abbrev == NULL)
|
|
|
|
|
return info_ptr;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
part_die->tag = abbrev->tag;
|
|
|
|
|
part_die->has_children = abbrev->has_children;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < abbrev->num_attrs; ++i)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
info_ptr = read_attribute (&attr, &abbrev->attrs[i], abfd, info_ptr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Store the data if it is of an attribute we want to keep in a
|
1999-07-07 22:19:36 +02:00
|
|
|
|
partial symbol table. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
switch (attr.name)
|
|
|
|
|
{
|
|
|
|
|
case DW_AT_name:
|
|
|
|
|
|
|
|
|
|
/* Prefer DW_AT_MIPS_linkage_name over DW_AT_name. */
|
|
|
|
|
if (part_die->name == NULL)
|
|
|
|
|
part_die->name = DW_STRING (&attr);
|
|
|
|
|
break;
|
2004-06-10 22:05:45 +02:00
|
|
|
|
case DW_AT_comp_dir:
|
|
|
|
|
if (part_die->dirname == NULL)
|
|
|
|
|
part_die->dirname = DW_STRING (&attr);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_AT_MIPS_linkage_name:
|
|
|
|
|
part_die->name = DW_STRING (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_low_pc:
|
|
|
|
|
has_low_pc_attr = 1;
|
|
|
|
|
part_die->lowpc = DW_ADDR (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_high_pc:
|
|
|
|
|
has_high_pc_attr = 1;
|
|
|
|
|
part_die->highpc = DW_ADDR (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_location:
|
2002-07-12 21:55:10 +02:00
|
|
|
|
/* Support the .debug_loc offsets */
|
|
|
|
|
if (attr_form_is_block (&attr))
|
|
|
|
|
{
|
|
|
|
|
part_die->locdesc = DW_BLOCK (&attr);
|
|
|
|
|
}
|
|
|
|
|
else if (attr.form == DW_FORM_data4 || attr.form == DW_FORM_data8)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
|
|
|
|
|
"partial symbol information");
|
2002-07-12 21:55:10 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_AT_language:
|
|
|
|
|
part_die->language = DW_UNSND (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_external:
|
|
|
|
|
part_die->is_external = DW_UNSND (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_declaration:
|
|
|
|
|
part_die->is_declaration = DW_UNSND (&attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_type:
|
|
|
|
|
part_die->has_type = 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_AT_abstract_origin:
|
|
|
|
|
case DW_AT_specification:
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
case DW_AT_extension:
|
|
|
|
|
part_die->has_specification = 1;
|
|
|
|
|
part_die->spec_offset = dwarf2_get_ref_die_offset (&attr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_AT_sibling:
|
|
|
|
|
/* Ignore absolute siblings, they might point outside of
|
|
|
|
|
the current compile unit. */
|
|
|
|
|
if (attr.form == DW_FORM_ref_addr)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "ignoring absolute DW_AT_sibling");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
part_die->sibling = dwarf2_per_objfile->info_buffer
|
|
|
|
|
+ dwarf2_get_ref_die_offset (&attr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
case DW_AT_stmt_list:
|
|
|
|
|
part_die->has_stmt_list = 1;
|
|
|
|
|
part_die->line_offset = DW_UNSND (&attr);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* When using the GNU linker, .gnu.linkonce. sections are used to
|
|
|
|
|
eliminate duplicate copies of functions and vtables and such.
|
|
|
|
|
The linker will arbitrarily choose one and discard the others.
|
|
|
|
|
The AT_*_pc values for such functions refer to local labels in
|
|
|
|
|
these sections. If the section from that file was discarded, the
|
|
|
|
|
labels are not in the output, so the relocs get a value of 0.
|
|
|
|
|
If this is a discarded function, mark the pc bounds as invalid,
|
|
|
|
|
so that GDB will ignore it. */
|
|
|
|
|
if (has_low_pc_attr && has_high_pc_attr
|
|
|
|
|
&& part_die->lowpc < part_die->highpc
|
|
|
|
|
&& (part_die->lowpc != 0
|
|
|
|
|
|| (bfd_get_file_flags (abfd) & HAS_RELOC)))
|
2001-07-04 18:08:20 +02:00
|
|
|
|
part_die->has_pc_info = 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* Find a cached partial DIE at OFFSET in CU. */
|
|
|
|
|
|
|
|
|
|
static struct partial_die_info *
|
|
|
|
|
find_partial_die_in_comp_unit (unsigned long offset, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct partial_die_info *lookup_die = NULL;
|
|
|
|
|
struct partial_die_info part_die;
|
|
|
|
|
|
|
|
|
|
part_die.offset = offset;
|
|
|
|
|
lookup_die = htab_find_with_hash (cu->partial_dies, &part_die, offset);
|
|
|
|
|
|
|
|
|
|
if (lookup_die == NULL)
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
"could not find partial DIE in cache\n");
|
|
|
|
|
|
|
|
|
|
return lookup_die;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a partial DIE at OFFSET, which may or may not be in CU. */
|
|
|
|
|
|
|
|
|
|
static struct partial_die_info *
|
|
|
|
|
find_partial_die (unsigned long offset, struct dwarf2_cu *cu,
|
|
|
|
|
struct dwarf2_cu **target_cu)
|
|
|
|
|
{
|
|
|
|
|
struct dwarf2_per_cu_data *per_cu;
|
|
|
|
|
|
|
|
|
|
if (offset >= cu->header.offset
|
|
|
|
|
&& offset < cu->header.offset + cu->header.length)
|
|
|
|
|
{
|
|
|
|
|
*target_cu = cu;
|
|
|
|
|
return find_partial_die_in_comp_unit (offset, cu);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
"unsupported inter-compilation-unit reference");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adjust PART_DIE before generating a symbol for it. This function
|
|
|
|
|
may set the is_external flag or change the DIE's name. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
fixup_partial_die (struct partial_die_info *part_die,
|
|
|
|
|
struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
/* If we found a reference attribute and the DIE has no name, try
|
|
|
|
|
to find a name in the referred to DIE. */
|
|
|
|
|
|
|
|
|
|
if (part_die->name == NULL && part_die->has_specification)
|
|
|
|
|
{
|
|
|
|
|
struct partial_die_info *spec_die;
|
|
|
|
|
struct dwarf2_cu *spec_cu;
|
|
|
|
|
|
|
|
|
|
spec_die = find_partial_die (part_die->spec_offset, cu, &spec_cu);
|
|
|
|
|
|
|
|
|
|
fixup_partial_die (spec_die, spec_cu);
|
|
|
|
|
|
|
|
|
|
if (spec_die->name)
|
|
|
|
|
{
|
|
|
|
|
part_die->name = spec_die->name;
|
|
|
|
|
|
|
|
|
|
/* Copy DW_AT_external attribute if it is set. */
|
|
|
|
|
if (spec_die->is_external)
|
|
|
|
|
part_die->is_external = spec_die->is_external;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set default names for some unnamed DIEs. */
|
|
|
|
|
if (part_die->name == NULL && (part_die->tag == DW_TAG_structure_type
|
|
|
|
|
|| part_die->tag == DW_TAG_class_type))
|
|
|
|
|
part_die->name = "(anonymous class)";
|
|
|
|
|
|
|
|
|
|
if (part_die->name == NULL && part_die->tag == DW_TAG_namespace)
|
|
|
|
|
part_die->name = "(anonymous namespace)";
|
|
|
|
|
|
|
|
|
|
if (part_die->tag == DW_TAG_structure_type
|
|
|
|
|
|| part_die->tag == DW_TAG_class_type
|
|
|
|
|
|| part_die->tag == DW_TAG_union_type)
|
|
|
|
|
guess_structure_name (part_die, cu);
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-01 00:29:28 +02:00
|
|
|
|
/* Read the die from the .debug_info section buffer. Set DIEP to
|
|
|
|
|
point to a newly allocated die with its information, except for its
|
|
|
|
|
child, sibling, and parent fields. Set HAS_CHILDREN to tell
|
|
|
|
|
whether the die has children or not. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-24 03:26:10 +02:00
|
|
|
|
read_full_die (struct die_info **diep, bfd *abfd, char *info_ptr,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu, int *has_children)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int abbrev_number, bytes_read, i, offset;
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
struct die_info *die;
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
offset = info_ptr - dwarf2_per_objfile->info_buffer;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
if (!abbrev_number)
|
|
|
|
|
{
|
|
|
|
|
die = dwarf_alloc_die ();
|
|
|
|
|
die->tag = 0;
|
|
|
|
|
die->abbrev = abbrev_number;
|
|
|
|
|
die->type = NULL;
|
|
|
|
|
*diep = die;
|
2003-10-01 00:29:28 +02:00
|
|
|
|
*has_children = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
abbrev = dwarf2_lookup_abbrev (abbrev_number, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!abbrev)
|
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
error ("Dwarf Error: could not find abbrev number %d [in module %s]",
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
abbrev_number,
|
2003-10-01 00:29:28 +02:00
|
|
|
|
bfd_get_filename (abfd));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
die = dwarf_alloc_die ();
|
|
|
|
|
die->offset = offset;
|
|
|
|
|
die->tag = abbrev->tag;
|
|
|
|
|
die->abbrev = abbrev_number;
|
|
|
|
|
die->type = NULL;
|
|
|
|
|
|
|
|
|
|
die->num_attrs = abbrev->num_attrs;
|
|
|
|
|
die->attrs = (struct attribute *)
|
|
|
|
|
xmalloc (die->num_attrs * sizeof (struct attribute));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < abbrev->num_attrs; ++i)
|
|
|
|
|
{
|
|
|
|
|
info_ptr = read_attribute (&die->attrs[i], &abbrev->attrs[i],
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
abfd, info_ptr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*diep = die;
|
2003-10-01 00:29:28 +02:00
|
|
|
|
*has_children = abbrev->has_children;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-29 14:19:06 +01:00
|
|
|
|
/* Read an attribute value described by an attribute form. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static char *
|
2001-11-29 14:19:06 +01:00
|
|
|
|
read_attribute_value (struct attribute *attr, unsigned form,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *abfd, char *info_ptr,
|
|
|
|
|
struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
struct dwarf_block *blk;
|
|
|
|
|
|
2001-11-29 14:19:06 +01:00
|
|
|
|
attr->form = form;
|
|
|
|
|
switch (form)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
case DW_FORM_addr:
|
|
|
|
|
case DW_FORM_ref_addr:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
|
2000-07-24 03:26:10 +02:00
|
|
|
|
info_ptr += bytes_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block2:
|
2004-04-19 20:20:50 +02:00
|
|
|
|
blk = dwarf_alloc_block (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
blk->size = read_2_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 2;
|
|
|
|
|
blk->data = read_n_bytes (abfd, info_ptr, blk->size);
|
|
|
|
|
info_ptr += blk->size;
|
|
|
|
|
DW_BLOCK (attr) = blk;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block4:
|
2004-04-19 20:20:50 +02:00
|
|
|
|
blk = dwarf_alloc_block (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
blk->size = read_4_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 4;
|
|
|
|
|
blk->data = read_n_bytes (abfd, info_ptr, blk->size);
|
|
|
|
|
info_ptr += blk->size;
|
|
|
|
|
DW_BLOCK (attr) = blk;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data2:
|
|
|
|
|
DW_UNSND (attr) = read_2_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 2;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data4:
|
|
|
|
|
DW_UNSND (attr) = read_4_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 4;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data8:
|
|
|
|
|
DW_UNSND (attr) = read_8_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 8;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_string:
|
|
|
|
|
DW_STRING (attr) = read_string (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
2001-11-17 01:08:10 +01:00
|
|
|
|
case DW_FORM_strp:
|
|
|
|
|
DW_STRING (attr) = read_indirect_string (abfd, info_ptr, cu_header,
|
|
|
|
|
&bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_block:
|
2004-04-19 20:20:50 +02:00
|
|
|
|
blk = dwarf_alloc_block (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
blk->size = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
blk->data = read_n_bytes (abfd, info_ptr, blk->size);
|
|
|
|
|
info_ptr += blk->size;
|
|
|
|
|
DW_BLOCK (attr) = blk;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block1:
|
2004-04-19 20:20:50 +02:00
|
|
|
|
blk = dwarf_alloc_block (cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
blk->size = read_1_byte (abfd, info_ptr);
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
blk->data = read_n_bytes (abfd, info_ptr, blk->size);
|
|
|
|
|
info_ptr += blk->size;
|
|
|
|
|
DW_BLOCK (attr) = blk;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
|
DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_flag:
|
|
|
|
|
DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_sdata:
|
|
|
|
|
DW_SND (attr) = read_signed_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_udata:
|
|
|
|
|
DW_UNSND (attr) = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_ref1:
|
|
|
|
|
DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
|
|
|
|
|
info_ptr += 1;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_ref2:
|
|
|
|
|
DW_UNSND (attr) = read_2_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 2;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_ref4:
|
|
|
|
|
DW_UNSND (attr) = read_4_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 4;
|
|
|
|
|
break;
|
2000-08-04 18:25:30 +02:00
|
|
|
|
case DW_FORM_ref8:
|
|
|
|
|
DW_UNSND (attr) = read_8_bytes (abfd, info_ptr);
|
|
|
|
|
info_ptr += 8;
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_ref_udata:
|
|
|
|
|
DW_UNSND (attr) = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_indirect:
|
2001-11-29 14:19:06 +01:00
|
|
|
|
form = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
|
|
|
|
|
info_ptr += bytes_read;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
info_ptr = read_attribute_value (attr, form, abfd, info_ptr, cu);
|
2001-11-29 14:19:06 +01:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Cannot handle %s in DWARF reader [in module %s]",
|
|
|
|
|
dwarf_form_name (form),
|
|
|
|
|
bfd_get_filename (abfd));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return info_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-29 14:19:06 +01:00
|
|
|
|
/* Read an attribute described by an abbreviated attribute. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
read_attribute (struct attribute *attr, struct attr_abbrev *abbrev,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
bfd *abfd, char *info_ptr, struct dwarf2_cu *cu)
|
2001-11-29 14:19:06 +01:00
|
|
|
|
{
|
|
|
|
|
attr->name = abbrev->name;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
return read_attribute_value (attr, abbrev->form, abfd, info_ptr, cu);
|
2001-11-29 14:19:06 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* read dwarf information from a buffer */
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_1_byte (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_8 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_1_signed_byte (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_signed_8 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_2_bytes (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_16 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_2_signed_bytes (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_signed_16 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_4_bytes (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_4_signed_bytes (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_signed_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static unsigned long
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_8_bytes (bfd *abfd, char *buf)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
return bfd_get_64 (abfd, (bfd_byte *) buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_address (bfd *abfd, char *buf, struct dwarf2_cu *cu, int *bytes_read)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
CORE_ADDR retval = 0;
|
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
if (cu_header->signed_addr_p)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-07-24 03:26:10 +02:00
|
|
|
|
switch (cu_header->addr_size)
|
|
|
|
|
{
|
|
|
|
|
case 2:
|
|
|
|
|
retval = bfd_get_signed_16 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
retval = bfd_get_signed_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case 8:
|
|
|
|
|
retval = bfd_get_signed_64 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2001-02-08 07:03:54 +01:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2003-02-03 15:33:20 +01:00
|
|
|
|
"read_address: bad switch, signed [in module %s]",
|
|
|
|
|
bfd_get_filename (abfd));
|
2000-07-24 03:26:10 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (cu_header->addr_size)
|
|
|
|
|
{
|
|
|
|
|
case 2:
|
|
|
|
|
retval = bfd_get_16 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
retval = bfd_get_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case 8:
|
|
|
|
|
retval = bfd_get_64 (abfd, (bfd_byte *) buf);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2001-02-08 07:03:54 +01:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2003-02-03 15:33:20 +01:00
|
|
|
|
"read_address: bad switch, unsigned [in module %s]",
|
|
|
|
|
bfd_get_filename (abfd));
|
2000-07-24 03:26:10 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2000-04-09 00:35:35 +02:00
|
|
|
|
|
2000-07-24 03:26:10 +02:00
|
|
|
|
*bytes_read = cu_header->addr_size;
|
|
|
|
|
return retval;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-16 23:00:43 +02:00
|
|
|
|
/* Read the initial length from a section. The (draft) DWARF 3
|
2000-08-04 18:25:30 +02:00
|
|
|
|
specification allows the initial length to take up either 4 bytes
|
|
|
|
|
or 12 bytes. If the first 4 bytes are 0xffffffff, then the next 8
|
|
|
|
|
bytes describe the length and all offsets will be 8 bytes in length
|
|
|
|
|
instead of 4.
|
|
|
|
|
|
2002-07-16 23:00:43 +02:00
|
|
|
|
An older, non-standard 64-bit format is also handled by this
|
|
|
|
|
function. The older format in question stores the initial length
|
|
|
|
|
as an 8-byte quantity without an escape value. Lengths greater
|
|
|
|
|
than 2^32 aren't very common which means that the initial 4 bytes
|
|
|
|
|
is almost always zero. Since a length value of zero doesn't make
|
|
|
|
|
sense for the 32-bit format, this initial zero can be considered to
|
|
|
|
|
be an escape value which indicates the presence of the older 64-bit
|
|
|
|
|
format. As written, the code can't detect (old format) lengths
|
|
|
|
|
greater than 4GB. If it becomes necessary to handle lengths somewhat
|
|
|
|
|
larger than 4GB, we could allow other small values (such as the
|
|
|
|
|
non-sensical values of 1, 2, and 3) to also be used as escape values
|
|
|
|
|
indicating the presence of the old format.
|
|
|
|
|
|
2000-08-04 18:25:30 +02:00
|
|
|
|
The value returned via bytes_read should be used to increment
|
|
|
|
|
the relevant pointer after calling read_initial_length().
|
|
|
|
|
|
|
|
|
|
As a side effect, this function sets the fields initial_length_size
|
|
|
|
|
and offset_size in cu_header to the values appropriate for the
|
|
|
|
|
length field. (The format of the initial length field determines
|
|
|
|
|
the width of file offsets to be fetched later with fetch_offset().)
|
|
|
|
|
|
|
|
|
|
[ Note: read_initial_length() and read_offset() are based on the
|
|
|
|
|
document entitled "DWARF Debugging Information Format", revision
|
2002-07-16 23:00:43 +02:00
|
|
|
|
3, draft 8, dated November 19, 2001. This document was obtained
|
2000-08-04 18:25:30 +02:00
|
|
|
|
from:
|
|
|
|
|
|
2002-07-16 23:00:43 +02:00
|
|
|
|
http://reality.sgiweb.org/davea/dwarf3-draft8-011125.pdf
|
2000-08-04 18:25:30 +02:00
|
|
|
|
|
|
|
|
|
This document is only a draft and is subject to change. (So beware.)
|
|
|
|
|
|
2002-07-16 23:00:43 +02:00
|
|
|
|
Details regarding the older, non-standard 64-bit format were
|
|
|
|
|
determined empirically by examining 64-bit ELF files produced
|
|
|
|
|
by the SGI toolchain on an IRIX 6.5 machine.
|
|
|
|
|
|
|
|
|
|
- Kevin, July 16, 2002
|
2000-08-04 18:25:30 +02:00
|
|
|
|
] */
|
|
|
|
|
|
|
|
|
|
static LONGEST
|
|
|
|
|
read_initial_length (bfd *abfd, char *buf, struct comp_unit_head *cu_header,
|
|
|
|
|
int *bytes_read)
|
|
|
|
|
{
|
|
|
|
|
LONGEST retval = 0;
|
|
|
|
|
|
|
|
|
|
retval = bfd_get_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
|
|
|
|
|
if (retval == 0xffffffff)
|
|
|
|
|
{
|
|
|
|
|
retval = bfd_get_64 (abfd, (bfd_byte *) buf + 4);
|
|
|
|
|
*bytes_read = 12;
|
|
|
|
|
if (cu_header != NULL)
|
|
|
|
|
{
|
|
|
|
|
cu_header->initial_length_size = 12;
|
|
|
|
|
cu_header->offset_size = 8;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-07-16 23:00:43 +02:00
|
|
|
|
else if (retval == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Handle (non-standard) 64-bit DWARF2 formats such as that used
|
|
|
|
|
by IRIX. */
|
|
|
|
|
retval = bfd_get_64 (abfd, (bfd_byte *) buf);
|
|
|
|
|
*bytes_read = 8;
|
|
|
|
|
if (cu_header != NULL)
|
|
|
|
|
{
|
|
|
|
|
cu_header->initial_length_size = 8;
|
|
|
|
|
cu_header->offset_size = 8;
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-08-04 18:25:30 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*bytes_read = 4;
|
|
|
|
|
if (cu_header != NULL)
|
|
|
|
|
{
|
|
|
|
|
cu_header->initial_length_size = 4;
|
|
|
|
|
cu_header->offset_size = 4;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read an offset from the data stream. The size of the offset is
|
|
|
|
|
given by cu_header->offset_size. */
|
|
|
|
|
|
|
|
|
|
static LONGEST
|
|
|
|
|
read_offset (bfd *abfd, char *buf, const struct comp_unit_head *cu_header,
|
|
|
|
|
int *bytes_read)
|
|
|
|
|
{
|
|
|
|
|
LONGEST retval = 0;
|
|
|
|
|
|
|
|
|
|
switch (cu_header->offset_size)
|
|
|
|
|
{
|
|
|
|
|
case 4:
|
|
|
|
|
retval = bfd_get_32 (abfd, (bfd_byte *) buf);
|
|
|
|
|
*bytes_read = 4;
|
|
|
|
|
break;
|
|
|
|
|
case 8:
|
|
|
|
|
retval = bfd_get_64 (abfd, (bfd_byte *) buf);
|
|
|
|
|
*bytes_read = 8;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2001-02-08 07:03:54 +01:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2003-02-03 15:33:20 +01:00
|
|
|
|
"read_offset: bad switch [in module %s]",
|
|
|
|
|
bfd_get_filename (abfd));
|
2000-08-04 18:25:30 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_n_bytes (bfd *abfd, char *buf, unsigned int size)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* If the size of a host char is 8 bits, we can return a pointer
|
|
|
|
|
to the buffer, otherwise we have to copy the data to a buffer
|
|
|
|
|
allocated on the temporary obstack. */
|
2001-11-17 01:08:10 +01:00
|
|
|
|
gdb_assert (HOST_CHAR_BIT == 8);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_string (bfd *abfd, char *buf, unsigned int *bytes_read_ptr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* If the size of a host char is 8 bits, we can return a pointer
|
|
|
|
|
to the string, otherwise we have to copy the string to a buffer
|
|
|
|
|
allocated on the temporary obstack. */
|
2001-11-17 01:08:10 +01:00
|
|
|
|
gdb_assert (HOST_CHAR_BIT == 8);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (*buf == '\0')
|
|
|
|
|
{
|
|
|
|
|
*bytes_read_ptr = 1;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
*bytes_read_ptr = strlen (buf) + 1;
|
|
|
|
|
return buf;
|
2001-11-17 01:08:10 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
read_indirect_string (bfd *abfd, char *buf,
|
|
|
|
|
const struct comp_unit_head *cu_header,
|
|
|
|
|
unsigned int *bytes_read_ptr)
|
|
|
|
|
{
|
|
|
|
|
LONGEST str_offset = read_offset (abfd, buf, cu_header,
|
|
|
|
|
(int *) bytes_read_ptr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (dwarf2_per_objfile->str_buffer == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("DW_FORM_strp used without .debug_str section [in module %s]",
|
|
|
|
|
bfd_get_filename (abfd));
|
2001-11-17 01:08:10 +01:00
|
|
|
|
return NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (str_offset >= dwarf2_per_objfile->str_size)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("DW_FORM_strp pointing outside of .debug_str section [in module %s]",
|
|
|
|
|
bfd_get_filename (abfd));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2001-11-17 01:08:10 +01:00
|
|
|
|
gdb_assert (HOST_CHAR_BIT == 8);
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (dwarf2_per_objfile->str_buffer[str_offset] == '\0')
|
2001-11-17 01:08:10 +01:00
|
|
|
|
return NULL;
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
return dwarf2_per_objfile->str_buffer + str_offset;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static unsigned long
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_unsigned_leb128 (bfd *abfd, char *buf, unsigned int *bytes_read_ptr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-06-15 01:29:06 +02:00
|
|
|
|
unsigned long result;
|
|
|
|
|
unsigned int num_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int i, shift;
|
|
|
|
|
unsigned char byte;
|
|
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
shift = 0;
|
|
|
|
|
num_read = 0;
|
|
|
|
|
i = 0;
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
byte = bfd_get_8 (abfd, (bfd_byte *) buf);
|
|
|
|
|
buf++;
|
|
|
|
|
num_read++;
|
2000-06-15 01:29:06 +02:00
|
|
|
|
result |= ((unsigned long)(byte & 127) << shift);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if ((byte & 128) == 0)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
shift += 7;
|
|
|
|
|
}
|
|
|
|
|
*bytes_read_ptr = num_read;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2000-06-15 01:29:06 +02:00
|
|
|
|
static long
|
2000-07-30 03:48:28 +02:00
|
|
|
|
read_signed_leb128 (bfd *abfd, char *buf, unsigned int *bytes_read_ptr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-06-15 01:29:06 +02:00
|
|
|
|
long result;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int i, shift, size, num_read;
|
|
|
|
|
unsigned char byte;
|
|
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
|
shift = 0;
|
|
|
|
|
size = 32;
|
|
|
|
|
num_read = 0;
|
|
|
|
|
i = 0;
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
byte = bfd_get_8 (abfd, (bfd_byte *) buf);
|
|
|
|
|
buf++;
|
|
|
|
|
num_read++;
|
2000-06-15 01:29:06 +02:00
|
|
|
|
result |= ((long)(byte & 127) << shift);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
shift += 7;
|
|
|
|
|
if ((byte & 128) == 0)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ((shift < size) && (byte & 0x40))
|
|
|
|
|
{
|
|
|
|
|
result |= -(1 << shift);
|
|
|
|
|
}
|
|
|
|
|
*bytes_read_ptr = num_read;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-09 20:38:11 +01:00
|
|
|
|
/* Return a pointer to just past the end of an LEB128 number in BUF. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
skip_leb128 (bfd *abfd, char *buf)
|
|
|
|
|
{
|
|
|
|
|
int byte;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
byte = bfd_get_8 (abfd, (bfd_byte *) buf);
|
|
|
|
|
buf++;
|
|
|
|
|
if ((byte & 128) == 0)
|
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
set_cu_language (unsigned int lang, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (lang)
|
|
|
|
|
{
|
|
|
|
|
case DW_LANG_C89:
|
|
|
|
|
case DW_LANG_C:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_c;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LANG_C_plus_plus:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_cplus;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LANG_Fortran77:
|
|
|
|
|
case DW_LANG_Fortran90:
|
2002-01-11 17:56:04 +01:00
|
|
|
|
case DW_LANG_Fortran95:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_fortran;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LANG_Mips_Assembler:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_asm;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2001-06-08 20:08:03 +02:00
|
|
|
|
case DW_LANG_Java:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_java;
|
2001-06-08 20:08:03 +02:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_LANG_Ada83:
|
2002-08-01 00:35:48 +02:00
|
|
|
|
case DW_LANG_Ada95:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_LANG_Cobol74:
|
|
|
|
|
case DW_LANG_Cobol85:
|
|
|
|
|
case DW_LANG_Pascal83:
|
|
|
|
|
case DW_LANG_Modula2:
|
|
|
|
|
default:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language = language_minimal;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->language_defn = language_def (cu->language);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the named attribute or NULL if not there. */
|
|
|
|
|
|
|
|
|
|
static struct attribute *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
struct attribute *spec = NULL;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < die->num_attrs; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (die->attrs[i].name == name)
|
|
|
|
|
{
|
|
|
|
|
return &die->attrs[i];
|
|
|
|
|
}
|
|
|
|
|
if (die->attrs[i].name == DW_AT_specification
|
|
|
|
|
|| die->attrs[i].name == DW_AT_abstract_origin)
|
|
|
|
|
spec = &die->attrs[i];
|
|
|
|
|
}
|
|
|
|
|
if (spec)
|
|
|
|
|
{
|
|
|
|
|
struct die_info *ref_die =
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
follow_die_ref (dwarf2_get_ref_die_offset (spec, cu));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (ref_die)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
return dwarf2_attr (ref_die, name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-19 20:12:00 +02:00
|
|
|
|
/* Return non-zero iff the attribute NAME is defined for the given DIE,
|
|
|
|
|
and holds a non-zero value. This function should only be used for
|
|
|
|
|
DW_FORM_flag attributes. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dwarf2_flag_true_p (struct die_info *die, unsigned name, struct dwarf2_cu *cu)
|
|
|
|
|
{
|
|
|
|
|
struct attribute *attr = dwarf2_attr (die, name, cu);
|
|
|
|
|
|
|
|
|
|
return (attr && DW_UNSND (attr));
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-14 05:37:06 +01:00
|
|
|
|
static int
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
die_is_declaration (struct die_info *die, struct dwarf2_cu *cu)
|
2000-02-14 05:37:06 +01:00
|
|
|
|
{
|
2004-04-19 20:12:00 +02:00
|
|
|
|
/* A DIE is a declaration if it has a DW_AT_declaration attribute
|
|
|
|
|
which value is non-zero. However, we have to be careful with
|
|
|
|
|
DIEs having a DW_AT_specification attribute, because dwarf2_attr()
|
|
|
|
|
(via dwarf2_flag_true_p) follows this attribute. So we may
|
|
|
|
|
end up accidently finding a declaration attribute that belongs
|
|
|
|
|
to a different DIE referenced by the specification attribute,
|
|
|
|
|
even though the given DIE does not have a declaration attribute. */
|
|
|
|
|
return (dwarf2_flag_true_p (die, DW_AT_declaration, cu)
|
|
|
|
|
&& dwarf2_attr (die, DW_AT_specification, cu) == NULL);
|
2000-02-14 05:37:06 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
/* Return the die giving the specification for DIE, if there is
|
|
|
|
|
one. */
|
|
|
|
|
|
|
|
|
|
static struct die_info *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
die_specification (struct die_info *die, struct dwarf2_cu *cu)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
struct attribute *spec_attr = dwarf2_attr (die, DW_AT_specification, cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
if (spec_attr == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
else
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
return follow_die_ref (dwarf2_get_ref_die_offset (spec_attr, cu));
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
/* Free the line_header structure *LH, and any arrays and strings it
|
|
|
|
|
refers to. */
|
|
|
|
|
static void
|
|
|
|
|
free_line_header (struct line_header *lh)
|
|
|
|
|
{
|
|
|
|
|
if (lh->standard_opcode_lengths)
|
2002-05-24 21:41:45 +02:00
|
|
|
|
xfree (lh->standard_opcode_lengths);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
/* Remember that all the lh->file_names[i].name pointers are
|
|
|
|
|
pointers into debug_line_buffer, and don't need to be freed. */
|
|
|
|
|
if (lh->file_names)
|
2002-05-24 21:41:45 +02:00
|
|
|
|
xfree (lh->file_names);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
/* Similarly for the include directory names. */
|
|
|
|
|
if (lh->include_dirs)
|
2002-05-24 21:41:45 +02:00
|
|
|
|
xfree (lh->include_dirs);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
2002-05-24 21:41:45 +02:00
|
|
|
|
xfree (lh);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Add an entry to LH's include directory table. */
|
|
|
|
|
static void
|
|
|
|
|
add_include_dir (struct line_header *lh, char *include_dir)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
/* Grow the array if necessary. */
|
|
|
|
|
if (lh->include_dirs_size == 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
lh->include_dirs_size = 1; /* for testing */
|
|
|
|
|
lh->include_dirs = xmalloc (lh->include_dirs_size
|
|
|
|
|
* sizeof (*lh->include_dirs));
|
|
|
|
|
}
|
|
|
|
|
else if (lh->num_include_dirs >= lh->include_dirs_size)
|
|
|
|
|
{
|
|
|
|
|
lh->include_dirs_size *= 2;
|
|
|
|
|
lh->include_dirs = xrealloc (lh->include_dirs,
|
|
|
|
|
(lh->include_dirs_size
|
|
|
|
|
* sizeof (*lh->include_dirs)));
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
lh->include_dirs[lh->num_include_dirs++] = include_dir;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Add an entry to LH's file name table. */
|
|
|
|
|
static void
|
|
|
|
|
add_file_name (struct line_header *lh,
|
|
|
|
|
char *name,
|
|
|
|
|
unsigned int dir_index,
|
|
|
|
|
unsigned int mod_time,
|
|
|
|
|
unsigned int length)
|
|
|
|
|
{
|
|
|
|
|
struct file_entry *fe;
|
|
|
|
|
|
|
|
|
|
/* Grow the array if necessary. */
|
|
|
|
|
if (lh->file_names_size == 0)
|
|
|
|
|
{
|
|
|
|
|
lh->file_names_size = 1; /* for testing */
|
|
|
|
|
lh->file_names = xmalloc (lh->file_names_size
|
|
|
|
|
* sizeof (*lh->file_names));
|
|
|
|
|
}
|
|
|
|
|
else if (lh->num_file_names >= lh->file_names_size)
|
|
|
|
|
{
|
|
|
|
|
lh->file_names_size *= 2;
|
|
|
|
|
lh->file_names = xrealloc (lh->file_names,
|
|
|
|
|
(lh->file_names_size
|
|
|
|
|
* sizeof (*lh->file_names)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fe = &lh->file_names[lh->num_file_names++];
|
|
|
|
|
fe->name = name;
|
|
|
|
|
fe->dir_index = dir_index;
|
|
|
|
|
fe->mod_time = mod_time;
|
|
|
|
|
fe->length = length;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
fe->included_p = 0;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the statement program header starting at OFFSET in
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
.debug_line, according to the endianness of ABFD. Return a pointer
|
|
|
|
|
to a struct line_header, allocated using xmalloc.
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
NOTE: the strings in the include directory and file name tables of
|
|
|
|
|
the returned object point into debug_line_buffer, and must not be
|
|
|
|
|
freed. */
|
|
|
|
|
static struct line_header *
|
|
|
|
|
dwarf_decode_line_header (unsigned int offset, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
|
|
|
|
struct cleanup *back_to;
|
|
|
|
|
struct line_header *lh;
|
|
|
|
|
char *line_ptr;
|
|
|
|
|
int bytes_read;
|
|
|
|
|
int i;
|
|
|
|
|
char *cur_dir, *cur_file;
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (dwarf2_per_objfile->line_buffer == NULL)
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "missing .debug_line section");
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make sure that at least there's room for the total_length field. That
|
|
|
|
|
could be 12 bytes long, but we're just going to fudge that. */
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (offset + 4 >= dwarf2_per_objfile->line_size)
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_statement_list_fits_in_line_number_section_complaint ();
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lh = xmalloc (sizeof (*lh));
|
|
|
|
|
memset (lh, 0, sizeof (*lh));
|
|
|
|
|
back_to = make_cleanup ((make_cleanup_ftype *) free_line_header,
|
|
|
|
|
(void *) lh);
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
line_ptr = dwarf2_per_objfile->line_buffer + offset;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
/* read in the header */
|
|
|
|
|
lh->total_length = read_initial_length (abfd, line_ptr, NULL, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (line_ptr + lh->total_length > (dwarf2_per_objfile->line_buffer
|
|
|
|
|
+ dwarf2_per_objfile->line_size))
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_statement_list_fits_in_line_number_section_complaint ();
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
lh->statement_program_end = line_ptr + lh->total_length;
|
|
|
|
|
lh->version = read_2_bytes (abfd, line_ptr);
|
|
|
|
|
line_ptr += 2;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
lh->header_length = read_offset (abfd, line_ptr, &cu->header, &bytes_read);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
lh->minimum_instruction_length = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
lh->default_is_stmt = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
lh->line_base = read_1_signed_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
lh->line_range = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
lh->opcode_base = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
lh->standard_opcode_lengths
|
|
|
|
|
= (unsigned char *) xmalloc (lh->opcode_base * sizeof (unsigned char));
|
|
|
|
|
|
|
|
|
|
lh->standard_opcode_lengths[0] = 1; /* This should never be used anyway. */
|
|
|
|
|
for (i = 1; i < lh->opcode_base; ++i)
|
|
|
|
|
{
|
|
|
|
|
lh->standard_opcode_lengths[i] = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read directory table */
|
|
|
|
|
while ((cur_dir = read_string (abfd, line_ptr, &bytes_read)) != NULL)
|
|
|
|
|
{
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
add_include_dir (lh, cur_dir);
|
|
|
|
|
}
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
|
|
|
|
|
/* Read file name table */
|
|
|
|
|
while ((cur_file = read_string (abfd, line_ptr, &bytes_read)) != NULL)
|
|
|
|
|
{
|
|
|
|
|
unsigned int dir_index, mod_time, length;
|
|
|
|
|
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
dir_index = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
mod_time = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
length = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
|
|
|
|
|
add_file_name (lh, cur_file, dir_index, mod_time, length);
|
|
|
|
|
}
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
lh->statement_program_start = line_ptr;
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (line_ptr > (dwarf2_per_objfile->line_buffer
|
|
|
|
|
+ dwarf2_per_objfile->line_size))
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"line number info header doesn't fit in `.debug_line' section");
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
|
|
|
|
discard_cleanups (back_to);
|
|
|
|
|
return lh;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-04-05 00:26:43 +02:00
|
|
|
|
/* This function exists to work around a bug in certain compilers
|
|
|
|
|
(particularly GCC 2.95), in which the first line number marker of a
|
|
|
|
|
function does not show up until after the prologue, right before
|
|
|
|
|
the second line number marker. This function shifts ADDRESS down
|
|
|
|
|
to the beginning of the function if necessary, and is called on
|
|
|
|
|
addresses passed to record_line. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
check_cu_functions (CORE_ADDR address, struct dwarf2_cu *cu)
|
2002-04-05 00:26:43 +02:00
|
|
|
|
{
|
|
|
|
|
struct function_range *fn;
|
|
|
|
|
|
|
|
|
|
/* Find the function_range containing address. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (!cu->first_fn)
|
2002-04-05 00:26:43 +02:00
|
|
|
|
return address;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (!cu->cached_fn)
|
|
|
|
|
cu->cached_fn = cu->first_fn;
|
2002-04-05 00:26:43 +02:00
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
fn = cu->cached_fn;
|
2002-04-05 00:26:43 +02:00
|
|
|
|
while (fn)
|
|
|
|
|
if (fn->lowpc <= address && fn->highpc > address)
|
|
|
|
|
goto found;
|
|
|
|
|
else
|
|
|
|
|
fn = fn->next;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
fn = cu->first_fn;
|
|
|
|
|
while (fn && fn != cu->cached_fn)
|
2002-04-05 00:26:43 +02:00
|
|
|
|
if (fn->lowpc <= address && fn->highpc > address)
|
|
|
|
|
goto found;
|
|
|
|
|
else
|
|
|
|
|
fn = fn->next;
|
|
|
|
|
|
|
|
|
|
return address;
|
|
|
|
|
|
|
|
|
|
found:
|
|
|
|
|
if (fn->seen_line)
|
|
|
|
|
return address;
|
|
|
|
|
if (address != fn->lowpc)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"misplaced first line number at 0x%lx for '%s'",
|
|
|
|
|
(unsigned long) address, fn->name);
|
2002-04-05 00:26:43 +02:00
|
|
|
|
fn->seen_line = 1;
|
|
|
|
|
return fn->lowpc;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
/* Decode the Line Number Program (LNP) for the given line_header
|
|
|
|
|
structure and CU. The actual information extracted and the type
|
|
|
|
|
of structures created from the LNP depends on the value of PST.
|
|
|
|
|
|
|
|
|
|
1. If PST is NULL, then this procedure uses the data from the program
|
|
|
|
|
to create all necessary symbol tables, and their linetables.
|
|
|
|
|
The compilation directory of the file is passed in COMP_DIR,
|
|
|
|
|
and must not be NULL.
|
|
|
|
|
|
|
|
|
|
2. If PST is not NULL, this procedure reads the program to determine
|
|
|
|
|
the list of files included by the unit represented by PST, and
|
|
|
|
|
builds all the associated partial symbol tables. In this case,
|
|
|
|
|
the value of COMP_DIR is ignored, and can thus be NULL (the COMP_DIR
|
|
|
|
|
is not used to compute the full name of the symtab, and therefore
|
|
|
|
|
omitting it when building the partial symtab does not introduce
|
|
|
|
|
the potential for inconsistency - a partial symtab and its associated
|
|
|
|
|
symbtab having a different fullname -). */
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
|
2004-05-03 18:21:51 +02:00
|
|
|
|
struct dwarf2_cu *cu, struct partial_symtab *pst)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
char *line_ptr;
|
|
|
|
|
char *line_end;
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
unsigned int bytes_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
unsigned char op_code, extended_op, adj_opcode;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
|
|
|
|
struct objfile *objfile = cu->objfile;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
const int decode_for_pst_p = (pst != NULL);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
|
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
line_ptr = lh->statement_program_start;
|
|
|
|
|
line_end = lh->statement_program_end;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Read the statement sequences until there's nothing left. */
|
|
|
|
|
while (line_ptr < line_end)
|
|
|
|
|
{
|
|
|
|
|
/* state machine registers */
|
|
|
|
|
CORE_ADDR address = 0;
|
|
|
|
|
unsigned int file = 1;
|
|
|
|
|
unsigned int line = 1;
|
|
|
|
|
unsigned int column = 0;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
int is_stmt = lh->default_is_stmt;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int basic_block = 0;
|
|
|
|
|
int end_sequence = 0;
|
|
|
|
|
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (!decode_for_pst_p && lh->num_file_names >= file)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-05-03 18:21:51 +02:00
|
|
|
|
/* Start a subfile for the current file of the state machine. */
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
/* lh->include_dirs and lh->file_names are 0-based, but the
|
|
|
|
|
directory and file name numbers in the statement program
|
|
|
|
|
are 1-based. */
|
|
|
|
|
struct file_entry *fe = &lh->file_names[file - 1];
|
|
|
|
|
char *dir;
|
|
|
|
|
if (fe->dir_index)
|
|
|
|
|
dir = lh->include_dirs[fe->dir_index - 1];
|
|
|
|
|
else
|
|
|
|
|
dir = comp_dir;
|
|
|
|
|
dwarf2_start_subfile (fe->name, dir);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Decode the table. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
while (!end_sequence)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
op_code = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
2001-11-12 21:36:55 +01:00
|
|
|
|
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
if (op_code >= lh->opcode_base)
|
2001-11-12 21:36:55 +01:00
|
|
|
|
{ /* Special operand. */
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
adj_opcode = op_code - lh->opcode_base;
|
|
|
|
|
address += (adj_opcode / lh->line_range)
|
|
|
|
|
* lh->minimum_instruction_length;
|
|
|
|
|
line += lh->line_base + (adj_opcode % lh->line_range);
|
2004-08-02 03:25:57 +02:00
|
|
|
|
lh->file_names[file - 1].included_p = 1;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (!decode_for_pst_p)
|
|
|
|
|
{
|
|
|
|
|
/* append row to matrix using current values */
|
|
|
|
|
record_line (current_subfile, line,
|
|
|
|
|
check_cu_functions (address, cu));
|
|
|
|
|
}
|
2001-11-12 21:36:55 +01:00
|
|
|
|
basic_block = 1;
|
|
|
|
|
}
|
|
|
|
|
else switch (op_code)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
case DW_LNS_extended_op:
|
2004-06-16 19:16:15 +02:00
|
|
|
|
read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
extended_op = read_1_byte (abfd, line_ptr);
|
|
|
|
|
line_ptr += 1;
|
|
|
|
|
switch (extended_op)
|
|
|
|
|
{
|
|
|
|
|
case DW_LNE_end_sequence:
|
|
|
|
|
end_sequence = 1;
|
2004-08-02 03:25:57 +02:00
|
|
|
|
lh->file_names[file - 1].included_p = 1;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (!decode_for_pst_p)
|
|
|
|
|
record_line (current_subfile, 0, address);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LNE_set_address:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
address = read_address (abfd, line_ptr, cu, &bytes_read);
|
2000-07-24 03:26:10 +02:00
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
address += baseaddr;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LNE_define_file:
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
|
|
|
|
char *cur_file;
|
|
|
|
|
unsigned int dir_index, mod_time, length;
|
|
|
|
|
|
|
|
|
|
cur_file = read_string (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
dir_index =
|
|
|
|
|
read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
mod_time =
|
|
|
|
|
read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
length =
|
|
|
|
|
read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
add_file_name (lh, cur_file, dir_index, mod_time, length);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"mangled .debug_line section");
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
return;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_copy:
|
2004-08-02 03:25:57 +02:00
|
|
|
|
lh->file_names[file - 1].included_p = 1;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (!decode_for_pst_p)
|
|
|
|
|
record_line (current_subfile, line,
|
|
|
|
|
check_cu_functions (address, cu));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
basic_block = 0;
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_advance_pc:
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
address += lh->minimum_instruction_length
|
1999-04-16 03:35:26 +02:00
|
|
|
|
* read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_advance_line:
|
|
|
|
|
line += read_signed_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_set_file:
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
{
|
|
|
|
|
/* lh->include_dirs and lh->file_names are 0-based,
|
|
|
|
|
but the directory and file name numbers in the
|
|
|
|
|
statement program are 1-based. */
|
|
|
|
|
struct file_entry *fe;
|
|
|
|
|
char *dir;
|
|
|
|
|
file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
fe = &lh->file_names[file - 1];
|
|
|
|
|
if (fe->dir_index)
|
|
|
|
|
dir = lh->include_dirs[fe->dir_index - 1];
|
|
|
|
|
else
|
|
|
|
|
dir = comp_dir;
|
2004-05-03 18:21:51 +02:00
|
|
|
|
if (!decode_for_pst_p)
|
|
|
|
|
dwarf2_start_subfile (fe->name, dir);
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_set_column:
|
|
|
|
|
column = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_negate_stmt:
|
|
|
|
|
is_stmt = (!is_stmt);
|
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_set_basic_block:
|
|
|
|
|
basic_block = 1;
|
|
|
|
|
break;
|
1999-09-22 05:28:34 +02:00
|
|
|
|
/* Add to the address register of the state machine the
|
|
|
|
|
address increment value corresponding to special opcode
|
|
|
|
|
255. Ie, this value is scaled by the minimum instruction
|
|
|
|
|
length since special opcode 255 would have scaled the
|
|
|
|
|
the increment. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_LNS_const_add_pc:
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
address += (lh->minimum_instruction_length
|
|
|
|
|
* ((255 - lh->opcode_base) / lh->line_range));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_LNS_fixed_advance_pc:
|
|
|
|
|
address += read_2_bytes (abfd, line_ptr);
|
|
|
|
|
line_ptr += 2;
|
|
|
|
|
break;
|
2001-11-12 21:36:55 +01:00
|
|
|
|
default:
|
|
|
|
|
{ /* Unknown standard opcode, ignore it. */
|
|
|
|
|
int i;
|
Separate the job of reading the line number info statement program
header (...expialidocious) out into its own function.
* dwarf2read.c (struct line_head, struct filenames, struct
directories): Replace with...
(struct line_header): New structure, containing the full
contents of the statement program header, including the
include directory and file name tables.
(read_file_scope): If we have line number info, instead of just
calling dwarf_decode_lines to do all the work, call
dwarf_decode_line_header first to get a `struct line_header'
containing the data in the statement program header, and then
pass that to dwarf_decode_lines, which will pick up where that
left off. Be sure to clean up the `struct line_header' object.
(dwarf_decode_line_header, free_line_header, add_include_dir,
add_file_name): New functions.
(dwarf_decode_lines): Move all the code to read the statement
program header into dwarf_decode_line_header. Take the line
header it built as the first argument, instead of the offset to
the compilation unit's line number info. Use the new `struct
line_header' type instead of the old structures. No need to do
cleanups here now, since we don't allocate anything.
(dwarf2_statement_list_fits_in_line_number_section,
dwarf2_line_header_too_long): New complaints.
2002-05-06 23:00:21 +02:00
|
|
|
|
for (i = 0; i < lh->standard_opcode_lengths[op_code]; i++)
|
2001-11-12 21:36:55 +01:00
|
|
|
|
{
|
|
|
|
|
(void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
|
|
|
|
|
line_ptr += bytes_read;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-05-03 18:21:51 +02:00
|
|
|
|
|
|
|
|
|
if (decode_for_pst_p)
|
|
|
|
|
{
|
|
|
|
|
int file_index;
|
|
|
|
|
|
|
|
|
|
/* Now that we're done scanning the Line Header Program, we can
|
|
|
|
|
create the psymtab of each included file. */
|
|
|
|
|
for (file_index = 0; file_index < lh->num_file_names; file_index++)
|
|
|
|
|
if (lh->file_names[file_index].included_p == 1)
|
|
|
|
|
{
|
|
|
|
|
char *include_name = lh->file_names [file_index].name;
|
|
|
|
|
|
|
|
|
|
if (strcmp (include_name, pst->filename) != 0)
|
|
|
|
|
dwarf2_create_include_psymtab (include_name, pst, objfile);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start a subfile for DWARF. FILENAME is the name of the file and
|
|
|
|
|
DIRNAME the name of the source directory which contains FILENAME
|
|
|
|
|
or NULL if not known.
|
|
|
|
|
This routine tries to keep line numbers from identical absolute and
|
|
|
|
|
relative file names in a common subfile.
|
|
|
|
|
|
|
|
|
|
Using the `list' example from the GDB testsuite, which resides in
|
|
|
|
|
/srcdir and compiling it with Irix6.2 cc in /compdir using a filename
|
|
|
|
|
of /srcdir/list0.c yields the following debugging information for list0.c:
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
DW_AT_name: /srcdir/list0.c
|
|
|
|
|
DW_AT_comp_dir: /compdir
|
2000-06-05 22:49:53 +02:00
|
|
|
|
files.files[0].name: list0.h
|
1999-07-07 22:19:36 +02:00
|
|
|
|
files.files[0].dir: /srcdir
|
2000-06-05 22:49:53 +02:00
|
|
|
|
files.files[1].name: list0.c
|
1999-07-07 22:19:36 +02:00
|
|
|
|
files.files[1].dir: /srcdir
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
The line number information for list0.c has to end up in a single
|
|
|
|
|
subfile, so that `break /srcdir/list0.c:1' works as expected. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_start_subfile (char *filename, char *dirname)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* If the filename isn't absolute, try to match an existing subfile
|
|
|
|
|
with the full pathname. */
|
|
|
|
|
|
2001-04-30 12:30:27 +02:00
|
|
|
|
if (!IS_ABSOLUTE_PATH (filename) && dirname != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct subfile *subfile;
|
|
|
|
|
char *fullname = concat (dirname, "/", filename, NULL);
|
|
|
|
|
|
|
|
|
|
for (subfile = subfiles; subfile; subfile = subfile->next)
|
|
|
|
|
{
|
2001-04-30 12:30:27 +02:00
|
|
|
|
if (FILENAME_CMP (subfile->name, fullname) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
current_subfile = subfile;
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (fullname);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (fullname);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
start_subfile (filename, dirname);
|
|
|
|
|
}
|
|
|
|
|
|
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 16:24:18 +01:00
|
|
|
|
static void
|
|
|
|
|
var_decode_location (struct attribute *attr, struct symbol *sym,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
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 16:24:18 +01:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
|
|
|
|
|
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 16:24:18 +01:00
|
|
|
|
/* NOTE drow/2003-01-30: There used to be a comment and some special
|
|
|
|
|
code here to turn a symbol with DW_AT_external and a
|
|
|
|
|
SYMBOL_VALUE_ADDRESS of 0 into a LOC_UNRESOLVED symbol. This was
|
|
|
|
|
necessary for platforms (maybe Alpha, certainly PowerPC GNU/Linux
|
|
|
|
|
with some versions of binutils) where shared libraries could have
|
|
|
|
|
relocations against symbols in their debug information - the
|
|
|
|
|
minimal symbol would have the right address, but the debug info
|
|
|
|
|
would not. It's no longer necessary, because we will explicitly
|
|
|
|
|
apply relocations when we read in the debug information now. */
|
|
|
|
|
|
|
|
|
|
/* A DW_AT_location attribute with no contents indicates that a
|
|
|
|
|
variable has been optimized away. */
|
|
|
|
|
if (attr_form_is_block (attr) && DW_BLOCK (attr)->size == 0)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_OPTIMIZED_OUT;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle one degenerate form of location expression specially, to
|
|
|
|
|
preserve GDB's previous behavior when section offsets are
|
|
|
|
|
specified. If this is just a DW_OP_addr then mark this symbol
|
|
|
|
|
as LOC_STATIC. */
|
|
|
|
|
|
|
|
|
|
if (attr_form_is_block (attr)
|
|
|
|
|
&& DW_BLOCK (attr)->size == 1 + cu_header->addr_size
|
|
|
|
|
&& DW_BLOCK (attr)->data[0] == DW_OP_addr)
|
|
|
|
|
{
|
|
|
|
|
int dummy;
|
|
|
|
|
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (sym) =
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_address (objfile->obfd, DW_BLOCK (attr)->data + 1, cu, &dummy);
|
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 16:24:18 +01:00
|
|
|
|
fixup_symbol_section (sym, objfile);
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets,
|
|
|
|
|
SYMBOL_SECTION (sym));
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_STATIC;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* NOTE drow/2002-01-30: It might be worthwhile to have a static
|
|
|
|
|
expression evaluator, and use LOC_COMPUTED only when necessary
|
|
|
|
|
(i.e. when the value of a register or memory location is
|
|
|
|
|
referenced, or a thread-local block, etc.). Then again, it might
|
|
|
|
|
not be worthwhile. I'm assuming that it isn't unless performance
|
|
|
|
|
or memory numbers show me otherwise. */
|
|
|
|
|
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_symbol_mark_computed (attr, sym, cu);
|
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 16:24:18 +01:00
|
|
|
|
SYMBOL_CLASS (sym) = LOC_COMPUTED;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Given a pointer to a DWARF information entry, figure out if we need
|
|
|
|
|
to make a symbol table entry for it, and if so, create a new entry
|
|
|
|
|
and return a pointer to it.
|
|
|
|
|
If TYPE is NULL, determine symbol type from the die, otherwise
|
1999-10-12 06:37:53 +02:00
|
|
|
|
used the passed type. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
static struct symbol *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct symbol *sym = NULL;
|
|
|
|
|
char *name;
|
|
|
|
|
struct attribute *attr = NULL;
|
|
|
|
|
struct attribute *attr2 = NULL;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
CORE_ADDR baseaddr;
|
|
|
|
|
|
|
|
|
|
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
if (die->tag != DW_TAG_namespace)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
name = dwarf2_linkage_name (die, cu);
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
else
|
|
|
|
|
name = TYPE_NAME (type);
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (name)
|
|
|
|
|
{
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
sym = (struct symbol *) obstack_alloc (&objfile->objfile_obstack,
|
1999-04-16 03:35:26 +02:00
|
|
|
|
sizeof (struct symbol));
|
|
|
|
|
OBJSTAT (objfile, n_syms++);
|
|
|
|
|
memset (sym, 0, sizeof (struct symbol));
|
2003-02-04 19:07:01 +01:00
|
|
|
|
|
|
|
|
|
/* Cache this symbol's name and the name's demangled form (if any). */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
SYMBOL_LANGUAGE (sym) = cu->language;
|
2003-02-04 19:07:01 +01:00
|
|
|
|
SYMBOL_SET_NAMES (sym, name, strlen (name), objfile);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Default assumptions.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
Use the passed type or decode it from the die. */
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_CLASS (sym) = LOC_STATIC;
|
|
|
|
|
if (type != NULL)
|
|
|
|
|
SYMBOL_TYPE (sym) = type;
|
|
|
|
|
else
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
SYMBOL_TYPE (sym) = die_type (die, cu);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_decl_line, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_LINE (sym) = DW_UNSND (attr);
|
|
|
|
|
}
|
|
|
|
|
switch (die->tag)
|
|
|
|
|
{
|
|
|
|
|
case DW_TAG_label:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_low_pc, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (sym) = DW_ADDR (attr) + baseaddr;
|
|
|
|
|
}
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_LABEL;
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_subprogram:
|
|
|
|
|
/* SYMBOL_BLOCK_VALUE (sym) will be filled in later by
|
|
|
|
|
finish_block. */
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_BLOCK;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr2 = dwarf2_attr (die, DW_AT_external, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr2 && (DW_UNSND (attr2) != 0))
|
|
|
|
|
{
|
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_variable:
|
|
|
|
|
/* Compilation with minimal debug info may result in variables
|
|
|
|
|
with missing type entries. Change the misleading `void' type
|
|
|
|
|
to something sensible. */
|
|
|
|
|
if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_VOID)
|
|
|
|
|
SYMBOL_TYPE (sym) = init_type (TYPE_CODE_INT,
|
|
|
|
|
TARGET_INT_BIT / HOST_CHAR_BIT, 0,
|
|
|
|
|
"<variable, no debug info>",
|
|
|
|
|
objfile);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_const_value, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_const_value (attr, sym, cu);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr2 = dwarf2_attr (die, DW_AT_external, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr2 && (DW_UNSND (attr2) != 0))
|
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
|
|
|
|
else
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
var_decode_location (attr, sym, cu);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr2 = dwarf2_attr (die, DW_AT_external, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr2 && (DW_UNSND (attr2) != 0))
|
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 16:24:18 +01:00
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We do not know the address of this symbol.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
If it is an external symbol and we have type information
|
|
|
|
|
for it, enter the symbol as a LOC_UNRESOLVED symbol.
|
|
|
|
|
The address of the variable will then be determined from
|
|
|
|
|
the minimal symbol table whenever the variable is
|
|
|
|
|
referenced. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr2 = dwarf2_attr (die, DW_AT_external, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr2 && (DW_UNSND (attr2) != 0)
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
&& dwarf2_attr (die, DW_AT_type, cu) != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_UNRESOLVED;
|
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_formal_parameter:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_location, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
var_decode_location (attr, sym, cu);
|
2003-07-31 23:05:38 +02:00
|
|
|
|
/* FIXME drow/2003-07-31: Is LOC_COMPUTED_ARG necessary? */
|
|
|
|
|
if (SYMBOL_CLASS (sym) == LOC_COMPUTED)
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_COMPUTED_ARG;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_const_value, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_const_value (attr, sym, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_unspecified_parameters:
|
|
|
|
|
/* From varargs functions; gdb doesn't seem to have any
|
|
|
|
|
interest in this information, so just ignore it for now.
|
|
|
|
|
(FIXME?) */
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
|
case DW_TAG_enumeration_type:
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_TYPEDEF;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
/* Make sure that the symbol includes appropriate enclosing
|
|
|
|
|
classes/namespaces in its name. These are calculated in
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_structure_type, and the correct name is saved in
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
the type. */
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
struct type *type = SYMBOL_TYPE (sym);
|
|
|
|
|
|
|
|
|
|
if (TYPE_TAG_NAME (type) != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME: carlton/2003-11-10: Should this use
|
|
|
|
|
SYMBOL_SET_NAMES instead? (The same problem also
|
2004-03-05 04:30:36 +01:00
|
|
|
|
arises further down in this function.) */
|
|
|
|
|
/* The type's name is already allocated along with
|
|
|
|
|
this objfile, so we don't need to duplicate it
|
|
|
|
|
for the symbol. */
|
|
|
|
|
SYMBOL_LINKAGE_NAME (sym) = TYPE_TAG_NAME (type);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
/* NOTE: carlton/2003-11-10: C++ class symbols shouldn't
|
|
|
|
|
really ever be static objects: otherwise, if you try
|
|
|
|
|
to, say, break of a class's method and you're in a file
|
|
|
|
|
which doesn't mention that class, it won't work unless
|
|
|
|
|
the check for all static symbols in lookup_symbol_aux
|
|
|
|
|
saves you. See the OtherFileClass tests in
|
|
|
|
|
gdb.c++/namespace.exp. */
|
|
|
|
|
|
|
|
|
|
struct pending **list_to_add;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
list_to_add = (cu->list_in_scope == &file_symbols
|
|
|
|
|
&& cu->language == language_cplus
|
|
|
|
|
? &global_symbols : cu->list_in_scope);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
add_symbol_to_list (sym, list_to_add);
|
|
|
|
|
|
|
|
|
|
/* The semantics of C++ state that "struct foo { ... }" also
|
|
|
|
|
defines a typedef for "foo". Synthesize a typedef symbol so
|
|
|
|
|
that "ptype foo" works as expected. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language == language_cplus)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
|
|
|
|
struct symbol *typedef_sym = (struct symbol *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_alloc (&objfile->objfile_obstack,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
sizeof (struct symbol));
|
|
|
|
|
*typedef_sym = *sym;
|
|
|
|
|
SYMBOL_DOMAIN (typedef_sym) = VAR_DOMAIN;
|
2004-03-05 04:30:36 +01:00
|
|
|
|
/* The symbol's name is already allocated along with
|
|
|
|
|
this objfile, so we don't need to duplicate it for
|
|
|
|
|
the type. */
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
|
2004-03-05 04:30:36 +01:00
|
|
|
|
TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_NATURAL_NAME (sym);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
add_symbol_to_list (typedef_sym, list_to_add);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_typedef:
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
if (processing_has_namespace_info
|
|
|
|
|
&& processing_current_prefix[0] != '\0')
|
|
|
|
|
{
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
SYMBOL_LINKAGE_NAME (sym) = obconcat (&objfile->objfile_obstack,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_current_prefix,
|
|
|
|
|
"::",
|
|
|
|
|
name);
|
|
|
|
|
}
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_TYPEDEF;
|
|
|
|
|
SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_base_type:
|
2004-01-17 06:35:47 +01:00
|
|
|
|
case DW_TAG_subrange_type:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_CLASS (sym) = LOC_TYPEDEF;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
add_symbol_to_list (sym, cu->list_in_scope);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_enumerator:
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
if (processing_has_namespace_info
|
|
|
|
|
&& processing_current_prefix[0] != '\0')
|
|
|
|
|
{
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
SYMBOL_LINKAGE_NAME (sym) = obconcat (&objfile->objfile_obstack,
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
processing_current_prefix,
|
|
|
|
|
"::",
|
|
|
|
|
name);
|
|
|
|
|
}
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_const_value, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr)
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf2_const_value (attr, sym, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
|
|
|
|
/* NOTE: carlton/2003-11-10: See comment above in the
|
|
|
|
|
DW_TAG_class_type, etc. block. */
|
|
|
|
|
|
|
|
|
|
struct pending **list_to_add;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
list_to_add = (cu->list_in_scope == &file_symbols
|
|
|
|
|
&& cu->language == language_cplus
|
|
|
|
|
? &global_symbols : cu->list_in_scope);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
add_symbol_to_list (sym, list_to_add);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2003-09-11 David Carlton <carlton@kealia.com>
* gdbtypes.h: Add TYPE_CODE_NAMESPACE.
* gdbtypes.c (init_type): Handle TYPE_CODE_NAMESPACE.
(recursive_dump_type): Ditto.
* printcmd.c (print_formatted): Ditto.
* typeprint.c (print_type_scalar): Ditto.
* c-typeprint.c (c_type_print_varspec_prefix): Ditto.
(c_type_print_varspec_suffix, c_type_print_base): Ditto.
* cp-support.h: Declare cp_check_possible_namespace_symbols,
maint_cplus_cmd_list.
* cp-support.c: Make maint_cplus_cmd_list extern.
* cp-namespace.c: Include objfiles.h, gdbtypes.h, dictionary.h,
command.h.
(lookup_symbol_file): Look in possible namespace blocks when
appropriate.
(initialize_namespace_symtab): New.
(get_possible_namespace_block, free_namespace_block)
(check_possible_namespace_symbols)
(check_possible_namespace_symbols_loop)
(check_one_possible_namespace_symbol)
(lookup_possible_namespace_symbol, maintenance_cplus_namespace)
(_initialize_cp_namespace): Ditto.
* block.h: Declare allocate_block.
* block.c (allocate_block): New.
* jv-lang.c (get_java_class_symtab): Allocate blocks via
allocate_block.
* symfile.h: Update declaration of add_psymbol_to_list.
* symfile.c (add_psymbol_to_list): Return the partial symbol in
question.
* dwarf2read.c (dwarf2_build_psymtabs_hard): Add argument to
scan_partial_symbols_call.
(scan_partial_symbols): Add NAMESPACE argument; update calls to
helper functions.
(add_partial_symbol): If necessary, scan mangled names for names
of namespaces.
(add_partial_namespace): Add NAMESPACE argument; generate partial
symbols associated to namespaces.
(add_partial_enumeration): Add NAMESPACE argument.
(new_symbol): Allow namespace syms.
(read_namespace): Generate namespace syms.
* objfiles.h: Add opaque declaration of struct symtab.
(struct objfile): Add cp_namespace_symtab member.
* objfiles.c (allocate_objfile): Set
objfile->cp_namespace_symtab.
* Makefile.in (cp-namespace.o): Depend on objfiles_h, gdbtypes_h,
dictionary_h, command_h.
2003-09-11 David Carlton <carlton@kealia.com>
* gdb.c++/namespace.exp: Add tests for namespace types.
* gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'.
(test_namespace): New.
2003-09-11 21:49:20 +02:00
|
|
|
|
case DW_TAG_namespace:
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_TYPEDEF;
|
|
|
|
|
add_symbol_to_list (sym, &global_symbols);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
/* Not a tag we recognize. Hopefully we aren't processing
|
|
|
|
|
trash data, but since we must specifically ignore things
|
|
|
|
|
we don't recognize, there is nothing else we should do at
|
|
|
|
|
this point. */
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "unsupported tag: '%s'",
|
|
|
|
|
dwarf_tag_name (die->tag));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (sym);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy constant value from an attribute to a symbol. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-24 03:26:10 +02:00
|
|
|
|
dwarf2_const_value (struct attribute *attr, struct symbol *sym,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct dwarf_block *blk;
|
|
|
|
|
|
|
|
|
|
switch (attr->form)
|
|
|
|
|
{
|
|
|
|
|
case DW_FORM_addr:
|
2000-07-24 03:26:10 +02:00
|
|
|
|
if (TYPE_LENGTH (SYMBOL_TYPE (sym)) != cu_header->addr_size)
|
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-25 22:36:23 +01:00
|
|
|
|
dwarf2_const_value_length_mismatch_complaint (DEPRECATED_SYMBOL_NAME (sym),
|
2002-12-11 21:55:37 +01:00
|
|
|
|
cu_header->addr_size,
|
|
|
|
|
TYPE_LENGTH (SYMBOL_TYPE
|
|
|
|
|
(sym)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE_BYTES (sym) = (char *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_alloc (&objfile->objfile_obstack, cu_header->addr_size);
|
2003-05-13 21:27:28 +02:00
|
|
|
|
/* NOTE: cagney/2003-05-09: In-lined store_address call with
|
|
|
|
|
it's body - store_unsigned_integer. */
|
|
|
|
|
store_unsigned_integer (SYMBOL_VALUE_BYTES (sym), cu_header->addr_size,
|
|
|
|
|
DW_ADDR (attr));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST_BYTES;
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block1:
|
|
|
|
|
case DW_FORM_block2:
|
|
|
|
|
case DW_FORM_block4:
|
|
|
|
|
case DW_FORM_block:
|
|
|
|
|
blk = DW_BLOCK (attr);
|
|
|
|
|
if (TYPE_LENGTH (SYMBOL_TYPE (sym)) != blk->size)
|
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-25 22:36:23 +01:00
|
|
|
|
dwarf2_const_value_length_mismatch_complaint (DEPRECATED_SYMBOL_NAME (sym),
|
2002-12-11 21:55:37 +01:00
|
|
|
|
blk->size,
|
|
|
|
|
TYPE_LENGTH (SYMBOL_TYPE
|
|
|
|
|
(sym)));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE_BYTES (sym) = (char *)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
obstack_alloc (&objfile->objfile_obstack, blk->size);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
memcpy (SYMBOL_VALUE_BYTES (sym), blk->data, blk->size);
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST_BYTES;
|
|
|
|
|
break;
|
1999-10-12 06:37:53 +02:00
|
|
|
|
|
|
|
|
|
/* The DW_AT_const_value attributes are supposed to carry the
|
|
|
|
|
symbol's value "represented as it would be on the target
|
|
|
|
|
architecture." By the time we get here, it's already been
|
|
|
|
|
converted to host endianness, so we just need to sign- or
|
|
|
|
|
zero-extend it as appropriate. */
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
|
dwarf2_const_value_data (attr, sym, 8);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_data2:
|
1999-10-12 06:37:53 +02:00
|
|
|
|
dwarf2_const_value_data (attr, sym, 16);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_data4:
|
1999-10-12 06:37:53 +02:00
|
|
|
|
dwarf2_const_value_data (attr, sym, 32);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_data8:
|
1999-10-12 06:37:53 +02:00
|
|
|
|
dwarf2_const_value_data (attr, sym, 64);
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_sdata:
|
1999-10-12 06:37:53 +02:00
|
|
|
|
SYMBOL_VALUE (sym) = DW_SND (attr);
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_udata:
|
|
|
|
|
SYMBOL_VALUE (sym) = DW_UNSND (attr);
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST;
|
|
|
|
|
break;
|
1999-10-12 06:37:53 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"unsupported const value attribute form: '%s'",
|
|
|
|
|
dwarf_form_name (attr->form));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
SYMBOL_VALUE (sym) = 0;
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-12 06:37:53 +02:00
|
|
|
|
|
|
|
|
|
/* Given an attr with a DW_FORM_dataN value in host byte order, sign-
|
|
|
|
|
or zero-extend it as appropriate for the symbol's type. */
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_const_value_data (struct attribute *attr,
|
|
|
|
|
struct symbol *sym,
|
|
|
|
|
int bits)
|
|
|
|
|
{
|
|
|
|
|
LONGEST l = DW_UNSND (attr);
|
|
|
|
|
|
|
|
|
|
if (bits < sizeof (l) * 8)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_UNSIGNED (SYMBOL_TYPE (sym)))
|
|
|
|
|
l &= ((LONGEST) 1 << bits) - 1;
|
|
|
|
|
else
|
2000-05-13 02:51:35 +02:00
|
|
|
|
l = (l << (sizeof (l) * 8 - bits)) >> (sizeof (l) * 8 - bits);
|
1999-10-12 06:37:53 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SYMBOL_VALUE (sym) = l;
|
|
|
|
|
SYMBOL_CLASS (sym) = LOC_CONST;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Return the type of the die in question using its DW_AT_type attribute. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
die_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
struct attribute *type_attr;
|
|
|
|
|
struct die_info *type_die;
|
|
|
|
|
unsigned int ref;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type_attr = dwarf2_attr (die, DW_AT_type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!type_attr)
|
|
|
|
|
{
|
|
|
|
|
/* A missing DW_AT_type represents a void type. */
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
return dwarf2_fundamental_type (cu->objfile, FT_VOID, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
ref = dwarf2_get_ref_die_offset (type_attr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
type_die = follow_die_ref (ref);
|
|
|
|
|
if (!type_die)
|
|
|
|
|
{
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Cannot find referent at offset %d [in module %s]",
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
ref, cu->objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = tag_type_to_type (type_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!type)
|
|
|
|
|
{
|
|
|
|
|
dump_die (type_die);
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Problem turning type die at offset into gdb type [in module %s]",
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu->objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the containing type of the die in question using its
|
|
|
|
|
DW_AT_containing_type attribute. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
die_containing_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type = NULL;
|
|
|
|
|
struct attribute *type_attr;
|
|
|
|
|
struct die_info *type_die = NULL;
|
|
|
|
|
unsigned int ref;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type_attr = dwarf2_attr (die, DW_AT_containing_type, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (type_attr)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
ref = dwarf2_get_ref_die_offset (type_attr, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
type_die = follow_die_ref (ref);
|
|
|
|
|
if (!type_die)
|
|
|
|
|
{
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Cannot find referent at offset %d [in module %s]", ref,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu->objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = tag_type_to_type (type_die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
if (!type)
|
|
|
|
|
{
|
|
|
|
|
if (type_die)
|
|
|
|
|
dump_die (type_die);
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Problem turning containing type into gdb type [in module %s]",
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu->objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
static struct type *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type_at_offset (unsigned int offset, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *die;
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
die = follow_die_ref (offset);
|
|
|
|
|
if (!die)
|
|
|
|
|
{
|
|
|
|
|
error ("Dwarf Error: Cannot find type referent at offset %d.", offset);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
type = tag_type_to_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static struct type *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
tag_type_to_type (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (die->type)
|
|
|
|
|
{
|
|
|
|
|
return die->type;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_type_die (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!die->type)
|
|
|
|
|
{
|
|
|
|
|
dump_die (die);
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: Cannot find type of die [in module %s]",
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu->objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return die->type;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_type_die (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
char *prefix = determine_prefix (die, cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
const char *old_prefix = processing_current_prefix;
|
|
|
|
|
struct cleanup *back_to = make_cleanup (xfree, prefix);
|
|
|
|
|
processing_current_prefix = prefix;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
switch (die->tag)
|
|
|
|
|
{
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
case DW_TAG_union_type:
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_structure_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_enumeration_type:
|
2004-03-14 22:08:24 +01:00
|
|
|
|
read_enumeration_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_subprogram:
|
|
|
|
|
case DW_TAG_subroutine_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_subroutine_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_array_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_array_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_pointer_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_pointer_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_ptr_to_member_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_ptr_to_member_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_reference_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_reference_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_const_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_const_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_volatile_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_volatile_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_string_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_tag_string_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_typedef:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_typedef (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2004-01-17 06:35:47 +01:00
|
|
|
|
case DW_TAG_subrange_type:
|
|
|
|
|
read_subrange_type (die, cu);
|
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_base_type:
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
read_base_type (die, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "unexepected tag in read_type_die: '%s'",
|
|
|
|
|
dwarf_tag_name (die->tag));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
|
|
|
|
|
processing_current_prefix = old_prefix;
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-23 23:41:28 +01:00
|
|
|
|
/* Return the name of the namespace/class that DIE is defined within,
|
|
|
|
|
or "" if we can't tell. The caller should xfree the result. */
|
|
|
|
|
|
|
|
|
|
/* NOTE: carlton/2004-01-23: See read_func_scope (and the comment
|
|
|
|
|
therein) for an example of how to use this function to deal with
|
|
|
|
|
DW_AT_specification. */
|
|
|
|
|
|
|
|
|
|
static char *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
|
|
|
|
struct die_info *parent;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->language != language_cplus)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
parent = die->parent;
|
|
|
|
|
|
|
|
|
|
if (parent == NULL)
|
|
|
|
|
{
|
2004-03-15 23:33:52 +01:00
|
|
|
|
return xstrdup ("");
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (parent->tag) {
|
|
|
|
|
case DW_TAG_namespace:
|
|
|
|
|
{
|
2004-03-15 23:33:52 +01:00
|
|
|
|
/* FIXME: carlton/2004-03-05: Should I follow extension dies
|
|
|
|
|
before doing this check? */
|
|
|
|
|
if (parent->type != NULL && TYPE_TAG_NAME (parent->type) != NULL)
|
|
|
|
|
{
|
|
|
|
|
return xstrdup (TYPE_TAG_NAME (parent->type));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int dummy;
|
|
|
|
|
char *parent_prefix = determine_prefix (parent, cu);
|
|
|
|
|
char *retval = typename_concat (parent_prefix,
|
|
|
|
|
namespace_name (parent, &dummy,
|
|
|
|
|
cu));
|
|
|
|
|
xfree (parent_prefix);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
{
|
2004-03-15 23:33:52 +01:00
|
|
|
|
if (parent->type != NULL && TYPE_TAG_NAME (parent->type) != NULL)
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
{
|
2004-03-15 23:33:52 +01:00
|
|
|
|
return xstrdup (TYPE_TAG_NAME (parent->type));
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
2004-03-15 23:33:52 +01:00
|
|
|
|
{
|
|
|
|
|
const char *old_prefix = processing_current_prefix;
|
|
|
|
|
char *new_prefix = determine_prefix (parent, cu);
|
|
|
|
|
char *retval;
|
|
|
|
|
|
|
|
|
|
processing_current_prefix = new_prefix;
|
|
|
|
|
retval = determine_class_name (parent, cu);
|
|
|
|
|
processing_current_prefix = old_prefix;
|
|
|
|
|
|
|
|
|
|
xfree (new_prefix);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
default:
|
2004-03-15 23:33:52 +01:00
|
|
|
|
return determine_prefix (parent, cu);
|
2004-01-14 David Carlton <carlton@kealia.com>
Change symbols for C++ nested types to contain the fully qualified
name, if possible. (At least in the DWARF-2 case.) Partial fix
for PR's c++/57, c++/488, c++/539, c++/573, c++/609, c++/832,
c++/895.
* c-exp.y: Update copyright:
(qualified_type): Handle types nested within classes.
* cp-namespace.c: Update comments.
(cp_set_block_scope): Delete #if 0.
(cp_lookup_nested_type): Handle types nested within classes.
* dwarf2read.c: (scan_partial_symbols): Call add_partial_structure
when appropriate.
(add_partial_symbol): Add the name of the enclosing namespace to
types.
(pdi_needs_namespace): New.
(add_partial_namespace): Tweak comment.
(add_partial_structure): New.
(psymtab_to_symtab_1): Initialize processing_current_prefix
here...
(process_die): instead of here.
(read_structure_scope): Try to figure out the name of the class or
namespace that the structure might be defined within.
(read_enumeration): Generate fully-qualified names, if possible.
(read_namespace): Don't set name to NULL.
(die_specification): New.
(new_symbol): Generate fully-qualified names for types.
(read_type_die): Determine appropriate prefix.
(determine_prefix): New.
(typename_concat): New.
(class_name): New.
* valops.c: Update copyright.
(value_aggregate_elt): Pass NOSIDE to
value_struct_elt_for_reference.
(value_struct_elt_for_reference): Make static, add NOSIDE
parameter, call value_maybe_namespace_elt as a last resort.
(value_namespace_elt): Break out code into
value_maybe_namespace_elt.
(value_maybe_namespace_elt): New.
2004-01-14 David Carlton <carlton@kealia.com>
* gdb.cp/namespace.exp: Add tests involving classes defined within
namespaces.
* gdb.cp/namespace.cc (C::CClass): New.
* gdb.cp/namespace1.cc: Update copyright.
(C::OtherFileClass): New.
2004-01-14 17:54:43 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a newly-allocated string formed by concatenating PREFIX,
|
|
|
|
|
"::", and SUFFIX, except that if PREFIX is NULL or the empty
|
|
|
|
|
string, just return a copy of SUFFIX. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
typename_concat (const char *prefix, const char *suffix)
|
|
|
|
|
{
|
|
|
|
|
if (prefix == NULL || prefix[0] == '\0')
|
|
|
|
|
return xstrdup (suffix);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *retval = xmalloc (strlen (prefix) + 2 + strlen (suffix) + 1);
|
|
|
|
|
|
|
|
|
|
strcpy (retval, prefix);
|
|
|
|
|
strcat (retval, "::");
|
|
|
|
|
strcat (retval, suffix);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static struct type *
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
dwarf_base_type (int encoding, int size, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* FIXME - this should not produce a new (struct type *)
|
|
|
|
|
every time. It should cache base types. */
|
|
|
|
|
struct type *type;
|
|
|
|
|
switch (encoding)
|
|
|
|
|
{
|
|
|
|
|
case DW_ATE_address:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_VOID, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_boolean:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_BOOLEAN, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_complex_float:
|
|
|
|
|
if (size == 16)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_DBL_PREC_COMPLEX, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_COMPLEX, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_float:
|
|
|
|
|
if (size == 8)
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_DBL_PREC_FLOAT, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_FLOAT, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_signed:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_SIGNED_CHAR, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_SIGNED_SHORT, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
case 4:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_SIGNED_INTEGER, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_signed_char:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_SIGNED_CHAR, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_unsigned:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_UNSIGNED_CHAR, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case 2:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_UNSIGNED_SHORT, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
case 4:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_UNSIGNED_INTEGER, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
case DW_ATE_unsigned_char:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_UNSIGNED_CHAR, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
default:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
type = dwarf2_fundamental_type (objfile, FT_SIGNED_INTEGER, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
struct die_info *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
copy_die (struct die_info *old_die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *new_die;
|
|
|
|
|
int i, num_attrs;
|
|
|
|
|
|
|
|
|
|
new_die = (struct die_info *) xmalloc (sizeof (struct die_info));
|
|
|
|
|
memset (new_die, 0, sizeof (struct die_info));
|
|
|
|
|
|
|
|
|
|
new_die->tag = old_die->tag;
|
|
|
|
|
new_die->has_children = old_die->has_children;
|
|
|
|
|
new_die->abbrev = old_die->abbrev;
|
|
|
|
|
new_die->offset = old_die->offset;
|
|
|
|
|
new_die->type = NULL;
|
|
|
|
|
|
|
|
|
|
num_attrs = old_die->num_attrs;
|
|
|
|
|
new_die->num_attrs = num_attrs;
|
|
|
|
|
new_die->attrs = (struct attribute *)
|
|
|
|
|
xmalloc (num_attrs * sizeof (struct attribute));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < old_die->num_attrs; ++i)
|
|
|
|
|
{
|
|
|
|
|
new_die->attrs[i].name = old_die->attrs[i].name;
|
|
|
|
|
new_die->attrs[i].form = old_die->attrs[i].form;
|
|
|
|
|
new_die->attrs[i].u.addr = old_die->attrs[i].u.addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new_die->next = NULL;
|
|
|
|
|
return new_die;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Return sibling of die, NULL if no sibling. */
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static struct die_info *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
sibling_die (struct die_info *die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-10-01 00:29:28 +02:00
|
|
|
|
return die->sibling;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get linkage name of a die, return NULL if not found. */
|
|
|
|
|
|
|
|
|
|
static char *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
return DW_STRING (attr);
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
return DW_STRING (attr);
|
|
|
|
|
return 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 01:07:11 +02:00
|
|
|
|
/* Get name of a die, return NULL if not found. */
|
|
|
|
|
|
|
|
|
|
static char *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_name (struct die_info *die, struct dwarf2_cu *cu)
|
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 01:07:11 +02:00
|
|
|
|
{
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_name, cu);
|
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 01:07:11 +02:00
|
|
|
|
if (attr && DW_STRING (attr))
|
|
|
|
|
return DW_STRING (attr);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the die that this die in an extension of, or NULL if there
|
|
|
|
|
is none. */
|
|
|
|
|
|
|
|
|
|
static struct die_info *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_extension (struct die_info *die, struct dwarf2_cu *cu)
|
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 01:07:11 +02:00
|
|
|
|
{
|
|
|
|
|
struct attribute *attr;
|
|
|
|
|
struct die_info *extension_die;
|
|
|
|
|
unsigned int ref;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
attr = dwarf2_attr (die, DW_AT_extension, cu);
|
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 01:07:11 +02:00
|
|
|
|
if (attr == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
ref = dwarf2_get_ref_die_offset (attr, cu);
|
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 01:07:11 +02:00
|
|
|
|
extension_die = follow_die_ref (ref);
|
|
|
|
|
if (!extension_die)
|
|
|
|
|
{
|
|
|
|
|
error ("Dwarf Error: Cannot find referent at offset %d.", ref);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return extension_die;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Convert a DIE tag into its string name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_tag_name (unsigned tag)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (tag)
|
|
|
|
|
{
|
|
|
|
|
case DW_TAG_padding:
|
|
|
|
|
return "DW_TAG_padding";
|
|
|
|
|
case DW_TAG_array_type:
|
|
|
|
|
return "DW_TAG_array_type";
|
|
|
|
|
case DW_TAG_class_type:
|
|
|
|
|
return "DW_TAG_class_type";
|
|
|
|
|
case DW_TAG_entry_point:
|
|
|
|
|
return "DW_TAG_entry_point";
|
|
|
|
|
case DW_TAG_enumeration_type:
|
|
|
|
|
return "DW_TAG_enumeration_type";
|
|
|
|
|
case DW_TAG_formal_parameter:
|
|
|
|
|
return "DW_TAG_formal_parameter";
|
|
|
|
|
case DW_TAG_imported_declaration:
|
|
|
|
|
return "DW_TAG_imported_declaration";
|
|
|
|
|
case DW_TAG_label:
|
|
|
|
|
return "DW_TAG_label";
|
|
|
|
|
case DW_TAG_lexical_block:
|
|
|
|
|
return "DW_TAG_lexical_block";
|
|
|
|
|
case DW_TAG_member:
|
|
|
|
|
return "DW_TAG_member";
|
|
|
|
|
case DW_TAG_pointer_type:
|
|
|
|
|
return "DW_TAG_pointer_type";
|
|
|
|
|
case DW_TAG_reference_type:
|
|
|
|
|
return "DW_TAG_reference_type";
|
|
|
|
|
case DW_TAG_compile_unit:
|
|
|
|
|
return "DW_TAG_compile_unit";
|
|
|
|
|
case DW_TAG_string_type:
|
|
|
|
|
return "DW_TAG_string_type";
|
|
|
|
|
case DW_TAG_structure_type:
|
|
|
|
|
return "DW_TAG_structure_type";
|
|
|
|
|
case DW_TAG_subroutine_type:
|
|
|
|
|
return "DW_TAG_subroutine_type";
|
|
|
|
|
case DW_TAG_typedef:
|
|
|
|
|
return "DW_TAG_typedef";
|
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
|
return "DW_TAG_union_type";
|
|
|
|
|
case DW_TAG_unspecified_parameters:
|
|
|
|
|
return "DW_TAG_unspecified_parameters";
|
|
|
|
|
case DW_TAG_variant:
|
|
|
|
|
return "DW_TAG_variant";
|
|
|
|
|
case DW_TAG_common_block:
|
|
|
|
|
return "DW_TAG_common_block";
|
|
|
|
|
case DW_TAG_common_inclusion:
|
|
|
|
|
return "DW_TAG_common_inclusion";
|
|
|
|
|
case DW_TAG_inheritance:
|
|
|
|
|
return "DW_TAG_inheritance";
|
|
|
|
|
case DW_TAG_inlined_subroutine:
|
|
|
|
|
return "DW_TAG_inlined_subroutine";
|
|
|
|
|
case DW_TAG_module:
|
|
|
|
|
return "DW_TAG_module";
|
|
|
|
|
case DW_TAG_ptr_to_member_type:
|
|
|
|
|
return "DW_TAG_ptr_to_member_type";
|
|
|
|
|
case DW_TAG_set_type:
|
|
|
|
|
return "DW_TAG_set_type";
|
|
|
|
|
case DW_TAG_subrange_type:
|
|
|
|
|
return "DW_TAG_subrange_type";
|
|
|
|
|
case DW_TAG_with_stmt:
|
|
|
|
|
return "DW_TAG_with_stmt";
|
|
|
|
|
case DW_TAG_access_declaration:
|
|
|
|
|
return "DW_TAG_access_declaration";
|
|
|
|
|
case DW_TAG_base_type:
|
|
|
|
|
return "DW_TAG_base_type";
|
|
|
|
|
case DW_TAG_catch_block:
|
|
|
|
|
return "DW_TAG_catch_block";
|
|
|
|
|
case DW_TAG_const_type:
|
|
|
|
|
return "DW_TAG_const_type";
|
|
|
|
|
case DW_TAG_constant:
|
|
|
|
|
return "DW_TAG_constant";
|
|
|
|
|
case DW_TAG_enumerator:
|
|
|
|
|
return "DW_TAG_enumerator";
|
|
|
|
|
case DW_TAG_file_type:
|
|
|
|
|
return "DW_TAG_file_type";
|
|
|
|
|
case DW_TAG_friend:
|
|
|
|
|
return "DW_TAG_friend";
|
|
|
|
|
case DW_TAG_namelist:
|
|
|
|
|
return "DW_TAG_namelist";
|
|
|
|
|
case DW_TAG_namelist_item:
|
|
|
|
|
return "DW_TAG_namelist_item";
|
|
|
|
|
case DW_TAG_packed_type:
|
|
|
|
|
return "DW_TAG_packed_type";
|
|
|
|
|
case DW_TAG_subprogram:
|
|
|
|
|
return "DW_TAG_subprogram";
|
|
|
|
|
case DW_TAG_template_type_param:
|
|
|
|
|
return "DW_TAG_template_type_param";
|
|
|
|
|
case DW_TAG_template_value_param:
|
|
|
|
|
return "DW_TAG_template_value_param";
|
|
|
|
|
case DW_TAG_thrown_type:
|
|
|
|
|
return "DW_TAG_thrown_type";
|
|
|
|
|
case DW_TAG_try_block:
|
|
|
|
|
return "DW_TAG_try_block";
|
|
|
|
|
case DW_TAG_variant_part:
|
|
|
|
|
return "DW_TAG_variant_part";
|
|
|
|
|
case DW_TAG_variable:
|
|
|
|
|
return "DW_TAG_variable";
|
|
|
|
|
case DW_TAG_volatile_type:
|
|
|
|
|
return "DW_TAG_volatile_type";
|
2002-10-23 18:40:55 +02:00
|
|
|
|
case DW_TAG_dwarf_procedure:
|
|
|
|
|
return "DW_TAG_dwarf_procedure";
|
|
|
|
|
case DW_TAG_restrict_type:
|
|
|
|
|
return "DW_TAG_restrict_type";
|
|
|
|
|
case DW_TAG_interface_type:
|
|
|
|
|
return "DW_TAG_interface_type";
|
|
|
|
|
case DW_TAG_namespace:
|
|
|
|
|
return "DW_TAG_namespace";
|
|
|
|
|
case DW_TAG_imported_module:
|
|
|
|
|
return "DW_TAG_imported_module";
|
|
|
|
|
case DW_TAG_unspecified_type:
|
|
|
|
|
return "DW_TAG_unspecified_type";
|
|
|
|
|
case DW_TAG_partial_unit:
|
|
|
|
|
return "DW_TAG_partial_unit";
|
|
|
|
|
case DW_TAG_imported_unit:
|
|
|
|
|
return "DW_TAG_imported_unit";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_TAG_MIPS_loop:
|
|
|
|
|
return "DW_TAG_MIPS_loop";
|
|
|
|
|
case DW_TAG_format_label:
|
|
|
|
|
return "DW_TAG_format_label";
|
|
|
|
|
case DW_TAG_function_template:
|
|
|
|
|
return "DW_TAG_function_template";
|
|
|
|
|
case DW_TAG_class_template:
|
|
|
|
|
return "DW_TAG_class_template";
|
|
|
|
|
default:
|
|
|
|
|
return "DW_TAG_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a DWARF attribute code into its string name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_attr_name (unsigned attr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (attr)
|
|
|
|
|
{
|
|
|
|
|
case DW_AT_sibling:
|
|
|
|
|
return "DW_AT_sibling";
|
|
|
|
|
case DW_AT_location:
|
|
|
|
|
return "DW_AT_location";
|
|
|
|
|
case DW_AT_name:
|
|
|
|
|
return "DW_AT_name";
|
|
|
|
|
case DW_AT_ordering:
|
|
|
|
|
return "DW_AT_ordering";
|
|
|
|
|
case DW_AT_subscr_data:
|
|
|
|
|
return "DW_AT_subscr_data";
|
|
|
|
|
case DW_AT_byte_size:
|
|
|
|
|
return "DW_AT_byte_size";
|
|
|
|
|
case DW_AT_bit_offset:
|
|
|
|
|
return "DW_AT_bit_offset";
|
|
|
|
|
case DW_AT_bit_size:
|
|
|
|
|
return "DW_AT_bit_size";
|
|
|
|
|
case DW_AT_element_list:
|
|
|
|
|
return "DW_AT_element_list";
|
|
|
|
|
case DW_AT_stmt_list:
|
|
|
|
|
return "DW_AT_stmt_list";
|
|
|
|
|
case DW_AT_low_pc:
|
|
|
|
|
return "DW_AT_low_pc";
|
|
|
|
|
case DW_AT_high_pc:
|
|
|
|
|
return "DW_AT_high_pc";
|
|
|
|
|
case DW_AT_language:
|
|
|
|
|
return "DW_AT_language";
|
|
|
|
|
case DW_AT_member:
|
|
|
|
|
return "DW_AT_member";
|
|
|
|
|
case DW_AT_discr:
|
|
|
|
|
return "DW_AT_discr";
|
|
|
|
|
case DW_AT_discr_value:
|
|
|
|
|
return "DW_AT_discr_value";
|
|
|
|
|
case DW_AT_visibility:
|
|
|
|
|
return "DW_AT_visibility";
|
|
|
|
|
case DW_AT_import:
|
|
|
|
|
return "DW_AT_import";
|
|
|
|
|
case DW_AT_string_length:
|
|
|
|
|
return "DW_AT_string_length";
|
|
|
|
|
case DW_AT_common_reference:
|
|
|
|
|
return "DW_AT_common_reference";
|
|
|
|
|
case DW_AT_comp_dir:
|
|
|
|
|
return "DW_AT_comp_dir";
|
|
|
|
|
case DW_AT_const_value:
|
|
|
|
|
return "DW_AT_const_value";
|
|
|
|
|
case DW_AT_containing_type:
|
|
|
|
|
return "DW_AT_containing_type";
|
|
|
|
|
case DW_AT_default_value:
|
|
|
|
|
return "DW_AT_default_value";
|
|
|
|
|
case DW_AT_inline:
|
|
|
|
|
return "DW_AT_inline";
|
|
|
|
|
case DW_AT_is_optional:
|
|
|
|
|
return "DW_AT_is_optional";
|
|
|
|
|
case DW_AT_lower_bound:
|
|
|
|
|
return "DW_AT_lower_bound";
|
|
|
|
|
case DW_AT_producer:
|
|
|
|
|
return "DW_AT_producer";
|
|
|
|
|
case DW_AT_prototyped:
|
|
|
|
|
return "DW_AT_prototyped";
|
|
|
|
|
case DW_AT_return_addr:
|
|
|
|
|
return "DW_AT_return_addr";
|
|
|
|
|
case DW_AT_start_scope:
|
|
|
|
|
return "DW_AT_start_scope";
|
|
|
|
|
case DW_AT_stride_size:
|
|
|
|
|
return "DW_AT_stride_size";
|
|
|
|
|
case DW_AT_upper_bound:
|
|
|
|
|
return "DW_AT_upper_bound";
|
|
|
|
|
case DW_AT_abstract_origin:
|
|
|
|
|
return "DW_AT_abstract_origin";
|
|
|
|
|
case DW_AT_accessibility:
|
|
|
|
|
return "DW_AT_accessibility";
|
|
|
|
|
case DW_AT_address_class:
|
|
|
|
|
return "DW_AT_address_class";
|
|
|
|
|
case DW_AT_artificial:
|
|
|
|
|
return "DW_AT_artificial";
|
|
|
|
|
case DW_AT_base_types:
|
|
|
|
|
return "DW_AT_base_types";
|
|
|
|
|
case DW_AT_calling_convention:
|
|
|
|
|
return "DW_AT_calling_convention";
|
|
|
|
|
case DW_AT_count:
|
|
|
|
|
return "DW_AT_count";
|
|
|
|
|
case DW_AT_data_member_location:
|
|
|
|
|
return "DW_AT_data_member_location";
|
|
|
|
|
case DW_AT_decl_column:
|
|
|
|
|
return "DW_AT_decl_column";
|
|
|
|
|
case DW_AT_decl_file:
|
|
|
|
|
return "DW_AT_decl_file";
|
|
|
|
|
case DW_AT_decl_line:
|
|
|
|
|
return "DW_AT_decl_line";
|
|
|
|
|
case DW_AT_declaration:
|
|
|
|
|
return "DW_AT_declaration";
|
|
|
|
|
case DW_AT_discr_list:
|
|
|
|
|
return "DW_AT_discr_list";
|
|
|
|
|
case DW_AT_encoding:
|
|
|
|
|
return "DW_AT_encoding";
|
|
|
|
|
case DW_AT_external:
|
|
|
|
|
return "DW_AT_external";
|
|
|
|
|
case DW_AT_frame_base:
|
|
|
|
|
return "DW_AT_frame_base";
|
|
|
|
|
case DW_AT_friend:
|
|
|
|
|
return "DW_AT_friend";
|
|
|
|
|
case DW_AT_identifier_case:
|
|
|
|
|
return "DW_AT_identifier_case";
|
|
|
|
|
case DW_AT_macro_info:
|
|
|
|
|
return "DW_AT_macro_info";
|
|
|
|
|
case DW_AT_namelist_items:
|
|
|
|
|
return "DW_AT_namelist_items";
|
|
|
|
|
case DW_AT_priority:
|
|
|
|
|
return "DW_AT_priority";
|
|
|
|
|
case DW_AT_segment:
|
|
|
|
|
return "DW_AT_segment";
|
|
|
|
|
case DW_AT_specification:
|
|
|
|
|
return "DW_AT_specification";
|
|
|
|
|
case DW_AT_static_link:
|
|
|
|
|
return "DW_AT_static_link";
|
|
|
|
|
case DW_AT_type:
|
|
|
|
|
return "DW_AT_type";
|
|
|
|
|
case DW_AT_use_location:
|
|
|
|
|
return "DW_AT_use_location";
|
|
|
|
|
case DW_AT_variable_parameter:
|
|
|
|
|
return "DW_AT_variable_parameter";
|
|
|
|
|
case DW_AT_virtuality:
|
|
|
|
|
return "DW_AT_virtuality";
|
|
|
|
|
case DW_AT_vtable_elem_location:
|
|
|
|
|
return "DW_AT_vtable_elem_location";
|
2002-10-23 18:40:55 +02:00
|
|
|
|
case DW_AT_allocated:
|
|
|
|
|
return "DW_AT_allocated";
|
|
|
|
|
case DW_AT_associated:
|
|
|
|
|
return "DW_AT_associated";
|
|
|
|
|
case DW_AT_data_location:
|
|
|
|
|
return "DW_AT_data_location";
|
|
|
|
|
case DW_AT_stride:
|
|
|
|
|
return "DW_AT_stride";
|
|
|
|
|
case DW_AT_entry_pc:
|
|
|
|
|
return "DW_AT_entry_pc";
|
|
|
|
|
case DW_AT_use_UTF8:
|
|
|
|
|
return "DW_AT_use_UTF8";
|
|
|
|
|
case DW_AT_extension:
|
|
|
|
|
return "DW_AT_extension";
|
|
|
|
|
case DW_AT_ranges:
|
|
|
|
|
return "DW_AT_ranges";
|
|
|
|
|
case DW_AT_trampoline:
|
|
|
|
|
return "DW_AT_trampoline";
|
|
|
|
|
case DW_AT_call_column:
|
|
|
|
|
return "DW_AT_call_column";
|
|
|
|
|
case DW_AT_call_file:
|
|
|
|
|
return "DW_AT_call_file";
|
|
|
|
|
case DW_AT_call_line:
|
|
|
|
|
return "DW_AT_call_line";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#ifdef MIPS
|
|
|
|
|
case DW_AT_MIPS_fde:
|
|
|
|
|
return "DW_AT_MIPS_fde";
|
|
|
|
|
case DW_AT_MIPS_loop_begin:
|
|
|
|
|
return "DW_AT_MIPS_loop_begin";
|
|
|
|
|
case DW_AT_MIPS_tail_loop_begin:
|
|
|
|
|
return "DW_AT_MIPS_tail_loop_begin";
|
|
|
|
|
case DW_AT_MIPS_epilog_begin:
|
|
|
|
|
return "DW_AT_MIPS_epilog_begin";
|
|
|
|
|
case DW_AT_MIPS_loop_unroll_factor:
|
|
|
|
|
return "DW_AT_MIPS_loop_unroll_factor";
|
|
|
|
|
case DW_AT_MIPS_software_pipeline_depth:
|
|
|
|
|
return "DW_AT_MIPS_software_pipeline_depth";
|
2003-08-26 07:28:38 +02:00
|
|
|
|
#endif
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_AT_MIPS_linkage_name:
|
|
|
|
|
return "DW_AT_MIPS_linkage_name";
|
|
|
|
|
|
|
|
|
|
case DW_AT_sf_names:
|
|
|
|
|
return "DW_AT_sf_names";
|
|
|
|
|
case DW_AT_src_info:
|
|
|
|
|
return "DW_AT_src_info";
|
|
|
|
|
case DW_AT_mac_info:
|
|
|
|
|
return "DW_AT_mac_info";
|
|
|
|
|
case DW_AT_src_coords:
|
|
|
|
|
return "DW_AT_src_coords";
|
|
|
|
|
case DW_AT_body_begin:
|
|
|
|
|
return "DW_AT_body_begin";
|
|
|
|
|
case DW_AT_body_end:
|
|
|
|
|
return "DW_AT_body_end";
|
2002-04-26 22:08:19 +02:00
|
|
|
|
case DW_AT_GNU_vector:
|
|
|
|
|
return "DW_AT_GNU_vector";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
return "DW_AT_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a DWARF value form code into its string name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_form_name (unsigned form)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (form)
|
|
|
|
|
{
|
|
|
|
|
case DW_FORM_addr:
|
|
|
|
|
return "DW_FORM_addr";
|
|
|
|
|
case DW_FORM_block2:
|
|
|
|
|
return "DW_FORM_block2";
|
|
|
|
|
case DW_FORM_block4:
|
|
|
|
|
return "DW_FORM_block4";
|
|
|
|
|
case DW_FORM_data2:
|
|
|
|
|
return "DW_FORM_data2";
|
|
|
|
|
case DW_FORM_data4:
|
|
|
|
|
return "DW_FORM_data4";
|
|
|
|
|
case DW_FORM_data8:
|
|
|
|
|
return "DW_FORM_data8";
|
|
|
|
|
case DW_FORM_string:
|
|
|
|
|
return "DW_FORM_string";
|
|
|
|
|
case DW_FORM_block:
|
|
|
|
|
return "DW_FORM_block";
|
|
|
|
|
case DW_FORM_block1:
|
|
|
|
|
return "DW_FORM_block1";
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
|
return "DW_FORM_data1";
|
|
|
|
|
case DW_FORM_flag:
|
|
|
|
|
return "DW_FORM_flag";
|
|
|
|
|
case DW_FORM_sdata:
|
|
|
|
|
return "DW_FORM_sdata";
|
|
|
|
|
case DW_FORM_strp:
|
|
|
|
|
return "DW_FORM_strp";
|
|
|
|
|
case DW_FORM_udata:
|
|
|
|
|
return "DW_FORM_udata";
|
|
|
|
|
case DW_FORM_ref_addr:
|
|
|
|
|
return "DW_FORM_ref_addr";
|
|
|
|
|
case DW_FORM_ref1:
|
|
|
|
|
return "DW_FORM_ref1";
|
|
|
|
|
case DW_FORM_ref2:
|
|
|
|
|
return "DW_FORM_ref2";
|
|
|
|
|
case DW_FORM_ref4:
|
|
|
|
|
return "DW_FORM_ref4";
|
|
|
|
|
case DW_FORM_ref8:
|
|
|
|
|
return "DW_FORM_ref8";
|
|
|
|
|
case DW_FORM_ref_udata:
|
|
|
|
|
return "DW_FORM_ref_udata";
|
|
|
|
|
case DW_FORM_indirect:
|
|
|
|
|
return "DW_FORM_indirect";
|
|
|
|
|
default:
|
|
|
|
|
return "DW_FORM_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a DWARF stack opcode into its string name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_stack_op_name (unsigned op)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
case DW_OP_addr:
|
|
|
|
|
return "DW_OP_addr";
|
|
|
|
|
case DW_OP_deref:
|
|
|
|
|
return "DW_OP_deref";
|
|
|
|
|
case DW_OP_const1u:
|
|
|
|
|
return "DW_OP_const1u";
|
|
|
|
|
case DW_OP_const1s:
|
|
|
|
|
return "DW_OP_const1s";
|
|
|
|
|
case DW_OP_const2u:
|
|
|
|
|
return "DW_OP_const2u";
|
|
|
|
|
case DW_OP_const2s:
|
|
|
|
|
return "DW_OP_const2s";
|
|
|
|
|
case DW_OP_const4u:
|
|
|
|
|
return "DW_OP_const4u";
|
|
|
|
|
case DW_OP_const4s:
|
|
|
|
|
return "DW_OP_const4s";
|
|
|
|
|
case DW_OP_const8u:
|
|
|
|
|
return "DW_OP_const8u";
|
|
|
|
|
case DW_OP_const8s:
|
|
|
|
|
return "DW_OP_const8s";
|
|
|
|
|
case DW_OP_constu:
|
|
|
|
|
return "DW_OP_constu";
|
|
|
|
|
case DW_OP_consts:
|
|
|
|
|
return "DW_OP_consts";
|
|
|
|
|
case DW_OP_dup:
|
|
|
|
|
return "DW_OP_dup";
|
|
|
|
|
case DW_OP_drop:
|
|
|
|
|
return "DW_OP_drop";
|
|
|
|
|
case DW_OP_over:
|
|
|
|
|
return "DW_OP_over";
|
|
|
|
|
case DW_OP_pick:
|
|
|
|
|
return "DW_OP_pick";
|
|
|
|
|
case DW_OP_swap:
|
|
|
|
|
return "DW_OP_swap";
|
|
|
|
|
case DW_OP_rot:
|
|
|
|
|
return "DW_OP_rot";
|
|
|
|
|
case DW_OP_xderef:
|
|
|
|
|
return "DW_OP_xderef";
|
|
|
|
|
case DW_OP_abs:
|
|
|
|
|
return "DW_OP_abs";
|
|
|
|
|
case DW_OP_and:
|
|
|
|
|
return "DW_OP_and";
|
|
|
|
|
case DW_OP_div:
|
|
|
|
|
return "DW_OP_div";
|
|
|
|
|
case DW_OP_minus:
|
|
|
|
|
return "DW_OP_minus";
|
|
|
|
|
case DW_OP_mod:
|
|
|
|
|
return "DW_OP_mod";
|
|
|
|
|
case DW_OP_mul:
|
|
|
|
|
return "DW_OP_mul";
|
|
|
|
|
case DW_OP_neg:
|
|
|
|
|
return "DW_OP_neg";
|
|
|
|
|
case DW_OP_not:
|
|
|
|
|
return "DW_OP_not";
|
|
|
|
|
case DW_OP_or:
|
|
|
|
|
return "DW_OP_or";
|
|
|
|
|
case DW_OP_plus:
|
|
|
|
|
return "DW_OP_plus";
|
|
|
|
|
case DW_OP_plus_uconst:
|
|
|
|
|
return "DW_OP_plus_uconst";
|
|
|
|
|
case DW_OP_shl:
|
|
|
|
|
return "DW_OP_shl";
|
|
|
|
|
case DW_OP_shr:
|
|
|
|
|
return "DW_OP_shr";
|
|
|
|
|
case DW_OP_shra:
|
|
|
|
|
return "DW_OP_shra";
|
|
|
|
|
case DW_OP_xor:
|
|
|
|
|
return "DW_OP_xor";
|
|
|
|
|
case DW_OP_bra:
|
|
|
|
|
return "DW_OP_bra";
|
|
|
|
|
case DW_OP_eq:
|
|
|
|
|
return "DW_OP_eq";
|
|
|
|
|
case DW_OP_ge:
|
|
|
|
|
return "DW_OP_ge";
|
|
|
|
|
case DW_OP_gt:
|
|
|
|
|
return "DW_OP_gt";
|
|
|
|
|
case DW_OP_le:
|
|
|
|
|
return "DW_OP_le";
|
|
|
|
|
case DW_OP_lt:
|
|
|
|
|
return "DW_OP_lt";
|
|
|
|
|
case DW_OP_ne:
|
|
|
|
|
return "DW_OP_ne";
|
|
|
|
|
case DW_OP_skip:
|
|
|
|
|
return "DW_OP_skip";
|
|
|
|
|
case DW_OP_lit0:
|
|
|
|
|
return "DW_OP_lit0";
|
|
|
|
|
case DW_OP_lit1:
|
|
|
|
|
return "DW_OP_lit1";
|
|
|
|
|
case DW_OP_lit2:
|
|
|
|
|
return "DW_OP_lit2";
|
|
|
|
|
case DW_OP_lit3:
|
|
|
|
|
return "DW_OP_lit3";
|
|
|
|
|
case DW_OP_lit4:
|
|
|
|
|
return "DW_OP_lit4";
|
|
|
|
|
case DW_OP_lit5:
|
|
|
|
|
return "DW_OP_lit5";
|
|
|
|
|
case DW_OP_lit6:
|
|
|
|
|
return "DW_OP_lit6";
|
|
|
|
|
case DW_OP_lit7:
|
|
|
|
|
return "DW_OP_lit7";
|
|
|
|
|
case DW_OP_lit8:
|
|
|
|
|
return "DW_OP_lit8";
|
|
|
|
|
case DW_OP_lit9:
|
|
|
|
|
return "DW_OP_lit9";
|
|
|
|
|
case DW_OP_lit10:
|
|
|
|
|
return "DW_OP_lit10";
|
|
|
|
|
case DW_OP_lit11:
|
|
|
|
|
return "DW_OP_lit11";
|
|
|
|
|
case DW_OP_lit12:
|
|
|
|
|
return "DW_OP_lit12";
|
|
|
|
|
case DW_OP_lit13:
|
|
|
|
|
return "DW_OP_lit13";
|
|
|
|
|
case DW_OP_lit14:
|
|
|
|
|
return "DW_OP_lit14";
|
|
|
|
|
case DW_OP_lit15:
|
|
|
|
|
return "DW_OP_lit15";
|
|
|
|
|
case DW_OP_lit16:
|
|
|
|
|
return "DW_OP_lit16";
|
|
|
|
|
case DW_OP_lit17:
|
|
|
|
|
return "DW_OP_lit17";
|
|
|
|
|
case DW_OP_lit18:
|
|
|
|
|
return "DW_OP_lit18";
|
|
|
|
|
case DW_OP_lit19:
|
|
|
|
|
return "DW_OP_lit19";
|
|
|
|
|
case DW_OP_lit20:
|
|
|
|
|
return "DW_OP_lit20";
|
|
|
|
|
case DW_OP_lit21:
|
|
|
|
|
return "DW_OP_lit21";
|
|
|
|
|
case DW_OP_lit22:
|
|
|
|
|
return "DW_OP_lit22";
|
|
|
|
|
case DW_OP_lit23:
|
|
|
|
|
return "DW_OP_lit23";
|
|
|
|
|
case DW_OP_lit24:
|
|
|
|
|
return "DW_OP_lit24";
|
|
|
|
|
case DW_OP_lit25:
|
|
|
|
|
return "DW_OP_lit25";
|
|
|
|
|
case DW_OP_lit26:
|
|
|
|
|
return "DW_OP_lit26";
|
|
|
|
|
case DW_OP_lit27:
|
|
|
|
|
return "DW_OP_lit27";
|
|
|
|
|
case DW_OP_lit28:
|
|
|
|
|
return "DW_OP_lit28";
|
|
|
|
|
case DW_OP_lit29:
|
|
|
|
|
return "DW_OP_lit29";
|
|
|
|
|
case DW_OP_lit30:
|
|
|
|
|
return "DW_OP_lit30";
|
|
|
|
|
case DW_OP_lit31:
|
|
|
|
|
return "DW_OP_lit31";
|
|
|
|
|
case DW_OP_reg0:
|
|
|
|
|
return "DW_OP_reg0";
|
|
|
|
|
case DW_OP_reg1:
|
|
|
|
|
return "DW_OP_reg1";
|
|
|
|
|
case DW_OP_reg2:
|
|
|
|
|
return "DW_OP_reg2";
|
|
|
|
|
case DW_OP_reg3:
|
|
|
|
|
return "DW_OP_reg3";
|
|
|
|
|
case DW_OP_reg4:
|
|
|
|
|
return "DW_OP_reg4";
|
|
|
|
|
case DW_OP_reg5:
|
|
|
|
|
return "DW_OP_reg5";
|
|
|
|
|
case DW_OP_reg6:
|
|
|
|
|
return "DW_OP_reg6";
|
|
|
|
|
case DW_OP_reg7:
|
|
|
|
|
return "DW_OP_reg7";
|
|
|
|
|
case DW_OP_reg8:
|
|
|
|
|
return "DW_OP_reg8";
|
|
|
|
|
case DW_OP_reg9:
|
|
|
|
|
return "DW_OP_reg9";
|
|
|
|
|
case DW_OP_reg10:
|
|
|
|
|
return "DW_OP_reg10";
|
|
|
|
|
case DW_OP_reg11:
|
|
|
|
|
return "DW_OP_reg11";
|
|
|
|
|
case DW_OP_reg12:
|
|
|
|
|
return "DW_OP_reg12";
|
|
|
|
|
case DW_OP_reg13:
|
|
|
|
|
return "DW_OP_reg13";
|
|
|
|
|
case DW_OP_reg14:
|
|
|
|
|
return "DW_OP_reg14";
|
|
|
|
|
case DW_OP_reg15:
|
|
|
|
|
return "DW_OP_reg15";
|
|
|
|
|
case DW_OP_reg16:
|
|
|
|
|
return "DW_OP_reg16";
|
|
|
|
|
case DW_OP_reg17:
|
|
|
|
|
return "DW_OP_reg17";
|
|
|
|
|
case DW_OP_reg18:
|
|
|
|
|
return "DW_OP_reg18";
|
|
|
|
|
case DW_OP_reg19:
|
|
|
|
|
return "DW_OP_reg19";
|
|
|
|
|
case DW_OP_reg20:
|
|
|
|
|
return "DW_OP_reg20";
|
|
|
|
|
case DW_OP_reg21:
|
|
|
|
|
return "DW_OP_reg21";
|
|
|
|
|
case DW_OP_reg22:
|
|
|
|
|
return "DW_OP_reg22";
|
|
|
|
|
case DW_OP_reg23:
|
|
|
|
|
return "DW_OP_reg23";
|
|
|
|
|
case DW_OP_reg24:
|
|
|
|
|
return "DW_OP_reg24";
|
|
|
|
|
case DW_OP_reg25:
|
|
|
|
|
return "DW_OP_reg25";
|
|
|
|
|
case DW_OP_reg26:
|
|
|
|
|
return "DW_OP_reg26";
|
|
|
|
|
case DW_OP_reg27:
|
|
|
|
|
return "DW_OP_reg27";
|
|
|
|
|
case DW_OP_reg28:
|
|
|
|
|
return "DW_OP_reg28";
|
|
|
|
|
case DW_OP_reg29:
|
|
|
|
|
return "DW_OP_reg29";
|
|
|
|
|
case DW_OP_reg30:
|
|
|
|
|
return "DW_OP_reg30";
|
|
|
|
|
case DW_OP_reg31:
|
|
|
|
|
return "DW_OP_reg31";
|
|
|
|
|
case DW_OP_breg0:
|
|
|
|
|
return "DW_OP_breg0";
|
|
|
|
|
case DW_OP_breg1:
|
|
|
|
|
return "DW_OP_breg1";
|
|
|
|
|
case DW_OP_breg2:
|
|
|
|
|
return "DW_OP_breg2";
|
|
|
|
|
case DW_OP_breg3:
|
|
|
|
|
return "DW_OP_breg3";
|
|
|
|
|
case DW_OP_breg4:
|
|
|
|
|
return "DW_OP_breg4";
|
|
|
|
|
case DW_OP_breg5:
|
|
|
|
|
return "DW_OP_breg5";
|
|
|
|
|
case DW_OP_breg6:
|
|
|
|
|
return "DW_OP_breg6";
|
|
|
|
|
case DW_OP_breg7:
|
|
|
|
|
return "DW_OP_breg7";
|
|
|
|
|
case DW_OP_breg8:
|
|
|
|
|
return "DW_OP_breg8";
|
|
|
|
|
case DW_OP_breg9:
|
|
|
|
|
return "DW_OP_breg9";
|
|
|
|
|
case DW_OP_breg10:
|
|
|
|
|
return "DW_OP_breg10";
|
|
|
|
|
case DW_OP_breg11:
|
|
|
|
|
return "DW_OP_breg11";
|
|
|
|
|
case DW_OP_breg12:
|
|
|
|
|
return "DW_OP_breg12";
|
|
|
|
|
case DW_OP_breg13:
|
|
|
|
|
return "DW_OP_breg13";
|
|
|
|
|
case DW_OP_breg14:
|
|
|
|
|
return "DW_OP_breg14";
|
|
|
|
|
case DW_OP_breg15:
|
|
|
|
|
return "DW_OP_breg15";
|
|
|
|
|
case DW_OP_breg16:
|
|
|
|
|
return "DW_OP_breg16";
|
|
|
|
|
case DW_OP_breg17:
|
|
|
|
|
return "DW_OP_breg17";
|
|
|
|
|
case DW_OP_breg18:
|
|
|
|
|
return "DW_OP_breg18";
|
|
|
|
|
case DW_OP_breg19:
|
|
|
|
|
return "DW_OP_breg19";
|
|
|
|
|
case DW_OP_breg20:
|
|
|
|
|
return "DW_OP_breg20";
|
|
|
|
|
case DW_OP_breg21:
|
|
|
|
|
return "DW_OP_breg21";
|
|
|
|
|
case DW_OP_breg22:
|
|
|
|
|
return "DW_OP_breg22";
|
|
|
|
|
case DW_OP_breg23:
|
|
|
|
|
return "DW_OP_breg23";
|
|
|
|
|
case DW_OP_breg24:
|
|
|
|
|
return "DW_OP_breg24";
|
|
|
|
|
case DW_OP_breg25:
|
|
|
|
|
return "DW_OP_breg25";
|
|
|
|
|
case DW_OP_breg26:
|
|
|
|
|
return "DW_OP_breg26";
|
|
|
|
|
case DW_OP_breg27:
|
|
|
|
|
return "DW_OP_breg27";
|
|
|
|
|
case DW_OP_breg28:
|
|
|
|
|
return "DW_OP_breg28";
|
|
|
|
|
case DW_OP_breg29:
|
|
|
|
|
return "DW_OP_breg29";
|
|
|
|
|
case DW_OP_breg30:
|
|
|
|
|
return "DW_OP_breg30";
|
|
|
|
|
case DW_OP_breg31:
|
|
|
|
|
return "DW_OP_breg31";
|
|
|
|
|
case DW_OP_regx:
|
|
|
|
|
return "DW_OP_regx";
|
|
|
|
|
case DW_OP_fbreg:
|
|
|
|
|
return "DW_OP_fbreg";
|
|
|
|
|
case DW_OP_bregx:
|
|
|
|
|
return "DW_OP_bregx";
|
|
|
|
|
case DW_OP_piece:
|
|
|
|
|
return "DW_OP_piece";
|
|
|
|
|
case DW_OP_deref_size:
|
|
|
|
|
return "DW_OP_deref_size";
|
|
|
|
|
case DW_OP_xderef_size:
|
|
|
|
|
return "DW_OP_xderef_size";
|
|
|
|
|
case DW_OP_nop:
|
|
|
|
|
return "DW_OP_nop";
|
2002-10-02 01:51:43 +02:00
|
|
|
|
/* DWARF 3 extensions. */
|
|
|
|
|
case DW_OP_push_object_address:
|
|
|
|
|
return "DW_OP_push_object_address";
|
|
|
|
|
case DW_OP_call2:
|
|
|
|
|
return "DW_OP_call2";
|
|
|
|
|
case DW_OP_call4:
|
|
|
|
|
return "DW_OP_call4";
|
|
|
|
|
case DW_OP_call_ref:
|
|
|
|
|
return "DW_OP_call_ref";
|
|
|
|
|
/* GNU extensions. */
|
|
|
|
|
case DW_OP_GNU_push_tls_address:
|
|
|
|
|
return "DW_OP_GNU_push_tls_address";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
return "OP_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf_bool_name (unsigned mybool)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (mybool)
|
|
|
|
|
return "TRUE";
|
|
|
|
|
else
|
|
|
|
|
return "FALSE";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a DWARF type code into its string name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_type_encoding_name (unsigned enc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (enc)
|
|
|
|
|
{
|
|
|
|
|
case DW_ATE_address:
|
|
|
|
|
return "DW_ATE_address";
|
|
|
|
|
case DW_ATE_boolean:
|
|
|
|
|
return "DW_ATE_boolean";
|
|
|
|
|
case DW_ATE_complex_float:
|
|
|
|
|
return "DW_ATE_complex_float";
|
|
|
|
|
case DW_ATE_float:
|
|
|
|
|
return "DW_ATE_float";
|
|
|
|
|
case DW_ATE_signed:
|
|
|
|
|
return "DW_ATE_signed";
|
|
|
|
|
case DW_ATE_signed_char:
|
|
|
|
|
return "DW_ATE_signed_char";
|
|
|
|
|
case DW_ATE_unsigned:
|
|
|
|
|
return "DW_ATE_unsigned";
|
|
|
|
|
case DW_ATE_unsigned_char:
|
|
|
|
|
return "DW_ATE_unsigned_char";
|
2002-10-23 18:40:55 +02:00
|
|
|
|
case DW_ATE_imaginary_float:
|
|
|
|
|
return "DW_ATE_imaginary_float";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
return "DW_ATE_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert a DWARF call frame info operation to its string name. */
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
static char *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
dwarf_cfi_name (unsigned cfi_opc)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (cfi_opc)
|
|
|
|
|
{
|
|
|
|
|
case DW_CFA_advance_loc:
|
|
|
|
|
return "DW_CFA_advance_loc";
|
|
|
|
|
case DW_CFA_offset:
|
|
|
|
|
return "DW_CFA_offset";
|
|
|
|
|
case DW_CFA_restore:
|
|
|
|
|
return "DW_CFA_restore";
|
|
|
|
|
case DW_CFA_nop:
|
|
|
|
|
return "DW_CFA_nop";
|
|
|
|
|
case DW_CFA_set_loc:
|
|
|
|
|
return "DW_CFA_set_loc";
|
|
|
|
|
case DW_CFA_advance_loc1:
|
|
|
|
|
return "DW_CFA_advance_loc1";
|
|
|
|
|
case DW_CFA_advance_loc2:
|
|
|
|
|
return "DW_CFA_advance_loc2";
|
|
|
|
|
case DW_CFA_advance_loc4:
|
|
|
|
|
return "DW_CFA_advance_loc4";
|
|
|
|
|
case DW_CFA_offset_extended:
|
|
|
|
|
return "DW_CFA_offset_extended";
|
|
|
|
|
case DW_CFA_restore_extended:
|
|
|
|
|
return "DW_CFA_restore_extended";
|
|
|
|
|
case DW_CFA_undefined:
|
|
|
|
|
return "DW_CFA_undefined";
|
|
|
|
|
case DW_CFA_same_value:
|
|
|
|
|
return "DW_CFA_same_value";
|
|
|
|
|
case DW_CFA_register:
|
|
|
|
|
return "DW_CFA_register";
|
|
|
|
|
case DW_CFA_remember_state:
|
|
|
|
|
return "DW_CFA_remember_state";
|
|
|
|
|
case DW_CFA_restore_state:
|
|
|
|
|
return "DW_CFA_restore_state";
|
|
|
|
|
case DW_CFA_def_cfa:
|
|
|
|
|
return "DW_CFA_def_cfa";
|
|
|
|
|
case DW_CFA_def_cfa_register:
|
|
|
|
|
return "DW_CFA_def_cfa_register";
|
|
|
|
|
case DW_CFA_def_cfa_offset:
|
|
|
|
|
return "DW_CFA_def_cfa_offset";
|
2002-02-28 12:21:16 +01:00
|
|
|
|
|
|
|
|
|
/* DWARF 3 */
|
|
|
|
|
case DW_CFA_def_cfa_expression:
|
|
|
|
|
return "DW_CFA_def_cfa_expression";
|
|
|
|
|
case DW_CFA_expression:
|
|
|
|
|
return "DW_CFA_expression";
|
|
|
|
|
case DW_CFA_offset_extended_sf:
|
|
|
|
|
return "DW_CFA_offset_extended_sf";
|
|
|
|
|
case DW_CFA_def_cfa_sf:
|
|
|
|
|
return "DW_CFA_def_cfa_sf";
|
|
|
|
|
case DW_CFA_def_cfa_offset_sf:
|
|
|
|
|
return "DW_CFA_def_cfa_offset_sf";
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* SGI/MIPS specific */
|
|
|
|
|
case DW_CFA_MIPS_advance_loc8:
|
|
|
|
|
return "DW_CFA_MIPS_advance_loc8";
|
2002-02-28 12:21:16 +01:00
|
|
|
|
|
|
|
|
|
/* GNU extensions */
|
|
|
|
|
case DW_CFA_GNU_window_save:
|
|
|
|
|
return "DW_CFA_GNU_window_save";
|
|
|
|
|
case DW_CFA_GNU_args_size:
|
|
|
|
|
return "DW_CFA_GNU_args_size";
|
|
|
|
|
case DW_CFA_GNU_negative_offset_extended:
|
|
|
|
|
return "DW_CFA_GNU_negative_offset_extended";
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
|
|
|
|
return "DW_CFA_<unknown>";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dump_die (struct die_info *die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "Die: %s (abbrev = %d, offset = %d)\n",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
dwarf_tag_name (die->tag), die->abbrev, die->offset);
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "\thas children: %s\n",
|
2003-10-01 00:29:28 +02:00
|
|
|
|
dwarf_bool_name (die->child != NULL));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "\tattributes:\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
for (i = 0; i < die->num_attrs; ++i)
|
|
|
|
|
{
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "\t\t%s (%s) ",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
dwarf_attr_name (die->attrs[i].name),
|
|
|
|
|
dwarf_form_name (die->attrs[i].form));
|
|
|
|
|
switch (die->attrs[i].form)
|
|
|
|
|
{
|
|
|
|
|
case DW_FORM_ref_addr:
|
|
|
|
|
case DW_FORM_addr:
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "address: ");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
print_address_numeric (DW_ADDR (&die->attrs[i]), 1, gdb_stderr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_block2:
|
|
|
|
|
case DW_FORM_block4:
|
|
|
|
|
case DW_FORM_block:
|
|
|
|
|
case DW_FORM_block1:
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "block: size %d", DW_BLOCK (&die->attrs[i])->size);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
|
case DW_FORM_data2:
|
|
|
|
|
case DW_FORM_data4:
|
2000-06-15 01:29:06 +02:00
|
|
|
|
case DW_FORM_data8:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_ref1:
|
|
|
|
|
case DW_FORM_ref2:
|
|
|
|
|
case DW_FORM_ref4:
|
|
|
|
|
case DW_FORM_udata:
|
|
|
|
|
case DW_FORM_sdata:
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "constant: %ld", DW_UNSND (&die->attrs[i]));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_string:
|
2001-11-17 01:08:10 +01:00
|
|
|
|
case DW_FORM_strp:
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "string: \"%s\"",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
DW_STRING (&die->attrs[i])
|
1999-07-07 22:19:36 +02:00
|
|
|
|
? DW_STRING (&die->attrs[i]) : "");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_flag:
|
|
|
|
|
if (DW_UNSND (&die->attrs[i]))
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "flag: TRUE");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "flag: FALSE");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
2001-11-29 14:19:06 +01:00
|
|
|
|
case DW_FORM_indirect:
|
|
|
|
|
/* the reader will have reduced the indirect form to
|
|
|
|
|
the "base form" so this form should not occur */
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "unexpected attribute form: DW_FORM_indirect");
|
2001-11-29 14:19:06 +01:00
|
|
|
|
break;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "unsupported attribute form: %d.",
|
1999-07-07 22:19:36 +02:00
|
|
|
|
die->attrs[i].form);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-02-15 23:42:33 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dump_die_list (struct die_info *die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
while (die)
|
|
|
|
|
{
|
|
|
|
|
dump_die (die);
|
2003-10-01 00:29:28 +02:00
|
|
|
|
if (die->child != NULL)
|
|
|
|
|
dump_die_list (die->child);
|
|
|
|
|
if (die->sibling != NULL)
|
|
|
|
|
dump_die_list (die->sibling);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
store_in_ref_table (unsigned int offset, struct die_info *die)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int h;
|
|
|
|
|
struct die_info *old;
|
|
|
|
|
|
|
|
|
|
h = (offset % REF_HASH_SIZE);
|
|
|
|
|
old = die_ref_table[h];
|
|
|
|
|
die->next_ref = old;
|
|
|
|
|
die_ref_table[h] = die;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf2_empty_hash_tables (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
memset (die_ref_table, 0, sizeof (die_ref_table));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_get_ref_die_offset (struct attribute *attr, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int result = 0;
|
|
|
|
|
|
|
|
|
|
switch (attr->form)
|
|
|
|
|
{
|
|
|
|
|
case DW_FORM_ref_addr:
|
|
|
|
|
result = DW_ADDR (attr);
|
|
|
|
|
break;
|
|
|
|
|
case DW_FORM_ref1:
|
|
|
|
|
case DW_FORM_ref2:
|
|
|
|
|
case DW_FORM_ref4:
|
2000-08-04 18:25:30 +02:00
|
|
|
|
case DW_FORM_ref8:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_FORM_ref_udata:
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
result = cu->header.offset + DW_UNSND (attr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"unsupported die ref attribute form: '%s'",
|
|
|
|
|
dwarf_form_name (attr->form));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-17 06:35:47 +01:00
|
|
|
|
/* Return the constant value held by the given attribute. Return -1
|
|
|
|
|
if the value held by the attribute is not constant. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dwarf2_get_attr_constant_value (struct attribute *attr, int default_value)
|
|
|
|
|
{
|
|
|
|
|
if (attr->form == DW_FORM_sdata)
|
|
|
|
|
return DW_SND (attr);
|
|
|
|
|
else if (attr->form == DW_FORM_udata
|
|
|
|
|
|| attr->form == DW_FORM_data1
|
|
|
|
|
|| attr->form == DW_FORM_data2
|
|
|
|
|
|| attr->form == DW_FORM_data4
|
|
|
|
|
|| attr->form == DW_FORM_data8)
|
|
|
|
|
return DW_UNSND (attr);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
complaint (&symfile_complaints, "Attribute value is not a constant (%s)",
|
|
|
|
|
dwarf_form_name (attr->form));
|
|
|
|
|
return default_value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-02 19:43:07 +02:00
|
|
|
|
static struct die_info *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
follow_die_ref (unsigned int offset)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *die;
|
|
|
|
|
int h;
|
|
|
|
|
|
|
|
|
|
h = (offset % REF_HASH_SIZE);
|
|
|
|
|
die = die_ref_table[h];
|
|
|
|
|
while (die)
|
|
|
|
|
{
|
|
|
|
|
if (die->offset == offset)
|
|
|
|
|
{
|
|
|
|
|
return die;
|
|
|
|
|
}
|
|
|
|
|
die = die->next_ref;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct type *
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
dwarf2_fundamental_type (struct objfile *objfile, int typeid,
|
|
|
|
|
struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (typeid < 0 || typeid >= FT_NUM_MEMBERS)
|
|
|
|
|
{
|
2003-02-03 15:33:20 +01:00
|
|
|
|
error ("Dwarf Error: internal error - invalid fundamental type id %d [in module %s]",
|
|
|
|
|
typeid, objfile->name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look for this particular type in the fundamental type vector. If
|
|
|
|
|
one is not found, create and install one appropriate for the
|
|
|
|
|
current language and the current target machine. */
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
if (cu->ftypes[typeid] == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
cu->ftypes[typeid] = cu->language_defn->la_fund_type (objfile, typeid);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c: Update calls to changed and renamed functions, and
references to moved variables.
(struct dwarf2_cu): Add first_fn, last_fn, cached_fn,
language, language_defn, list_in_scope, and ftypes members.
(cu_first_fn, cu_last_fn, cu_cached_fn, cu_language)
(cu_language_defn, list_in_scope, ftypes, cu_header_offset)
(baseaddr): Remove globals.
(dwarf_attr): Renamed to dwarf2_attr. Add CU argument.
(set_cu_language, die_is_declaration, die_specification)
(determine_prefix, determin_prefix_aux, class_name, namespace_name)
(dwarf2_linkage_name, dwarf2_name, dwarf2_extension)
(dwarf2_get_ref_die_offset, dwarf2_fundamental_type)
(initialize_cu_func_list, add_to_cu_func_list): Add CU argument.
(dwarf2_build_psymtabs_hard): Add local baseaddr. Initialize
cu.list_in_scope. Don't initialize cu_header_offset.
(add_partial_symbol): Add local baseaddr.
(psymtab_to_symtab_1): Add local baseaddr. Use
objfile->section_offsets for consistency. Don't initialize
cu_header_offset; do initialize cu.header.offset and
cu.list_in_scope.
(read_file_scope, read_func_scope, read_lexical_block_scope)
(dwarf_decode_lines, new_symbol): Add local baseaddr.
2004-01-27 21:47:20 +01:00
|
|
|
|
return (cu->ftypes[typeid]);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Decode simple location descriptions.
|
|
|
|
|
Given a pointer to a dwarf block that defines a location, compute
|
|
|
|
|
the location and return the value.
|
|
|
|
|
|
2003-11-19 16:08:01 +01:00
|
|
|
|
NOTE drow/2003-11-18: This function is called in two situations
|
|
|
|
|
now: for the address of static or global variables (partial symbols
|
|
|
|
|
only) and for offsets into structures which are expected to be
|
|
|
|
|
(more or less) constant. The partial symbol case should go away,
|
|
|
|
|
and only the constant case should remain. That will let this
|
|
|
|
|
function complain more accurately. A few special modes are allowed
|
|
|
|
|
without complaint for global variables (for instance, global
|
|
|
|
|
register values and thread-local values).
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
A location description containing no operations indicates that the
|
2003-11-19 16:08:01 +01:00
|
|
|
|
object is optimized out. The return value is 0 for that case.
|
2003-11-18 22:51:38 +01:00
|
|
|
|
FIXME drow/2003-11-16: No callers check for this case any more; soon all
|
|
|
|
|
callers will only want a very basic result and this can become a
|
|
|
|
|
complaint.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
When the result is a register number, the global isreg flag is set,
|
|
|
|
|
otherwise it is cleared.
|
|
|
|
|
|
|
|
|
|
Note that stack[0] is unused except as a default error return.
|
|
|
|
|
Note that stack overflow is not yet handled. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct objfile *objfile = cu->objfile;
|
|
|
|
|
struct comp_unit_head *cu_header = &cu->header;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int i;
|
|
|
|
|
int size = blk->size;
|
|
|
|
|
char *data = blk->data;
|
|
|
|
|
CORE_ADDR stack[64];
|
|
|
|
|
int stacki;
|
|
|
|
|
unsigned int bytes_read, unsnd;
|
|
|
|
|
unsigned char op;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
stacki = 0;
|
|
|
|
|
stack[stacki] = 0;
|
|
|
|
|
isreg = 0;
|
|
|
|
|
|
|
|
|
|
while (i < size)
|
|
|
|
|
{
|
|
|
|
|
op = data[i++];
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
2002-01-11 10:32:50 +01:00
|
|
|
|
case DW_OP_lit0:
|
|
|
|
|
case DW_OP_lit1:
|
|
|
|
|
case DW_OP_lit2:
|
|
|
|
|
case DW_OP_lit3:
|
|
|
|
|
case DW_OP_lit4:
|
|
|
|
|
case DW_OP_lit5:
|
|
|
|
|
case DW_OP_lit6:
|
|
|
|
|
case DW_OP_lit7:
|
|
|
|
|
case DW_OP_lit8:
|
|
|
|
|
case DW_OP_lit9:
|
|
|
|
|
case DW_OP_lit10:
|
|
|
|
|
case DW_OP_lit11:
|
|
|
|
|
case DW_OP_lit12:
|
|
|
|
|
case DW_OP_lit13:
|
|
|
|
|
case DW_OP_lit14:
|
|
|
|
|
case DW_OP_lit15:
|
|
|
|
|
case DW_OP_lit16:
|
|
|
|
|
case DW_OP_lit17:
|
|
|
|
|
case DW_OP_lit18:
|
|
|
|
|
case DW_OP_lit19:
|
|
|
|
|
case DW_OP_lit20:
|
|
|
|
|
case DW_OP_lit21:
|
|
|
|
|
case DW_OP_lit22:
|
|
|
|
|
case DW_OP_lit23:
|
|
|
|
|
case DW_OP_lit24:
|
|
|
|
|
case DW_OP_lit25:
|
|
|
|
|
case DW_OP_lit26:
|
|
|
|
|
case DW_OP_lit27:
|
|
|
|
|
case DW_OP_lit28:
|
|
|
|
|
case DW_OP_lit29:
|
|
|
|
|
case DW_OP_lit30:
|
|
|
|
|
case DW_OP_lit31:
|
|
|
|
|
stack[++stacki] = op - DW_OP_lit0;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_OP_reg0:
|
|
|
|
|
case DW_OP_reg1:
|
|
|
|
|
case DW_OP_reg2:
|
|
|
|
|
case DW_OP_reg3:
|
|
|
|
|
case DW_OP_reg4:
|
|
|
|
|
case DW_OP_reg5:
|
|
|
|
|
case DW_OP_reg6:
|
|
|
|
|
case DW_OP_reg7:
|
|
|
|
|
case DW_OP_reg8:
|
|
|
|
|
case DW_OP_reg9:
|
|
|
|
|
case DW_OP_reg10:
|
|
|
|
|
case DW_OP_reg11:
|
|
|
|
|
case DW_OP_reg12:
|
|
|
|
|
case DW_OP_reg13:
|
|
|
|
|
case DW_OP_reg14:
|
|
|
|
|
case DW_OP_reg15:
|
|
|
|
|
case DW_OP_reg16:
|
|
|
|
|
case DW_OP_reg17:
|
|
|
|
|
case DW_OP_reg18:
|
|
|
|
|
case DW_OP_reg19:
|
|
|
|
|
case DW_OP_reg20:
|
|
|
|
|
case DW_OP_reg21:
|
|
|
|
|
case DW_OP_reg22:
|
|
|
|
|
case DW_OP_reg23:
|
|
|
|
|
case DW_OP_reg24:
|
|
|
|
|
case DW_OP_reg25:
|
|
|
|
|
case DW_OP_reg26:
|
|
|
|
|
case DW_OP_reg27:
|
|
|
|
|
case DW_OP_reg28:
|
|
|
|
|
case DW_OP_reg29:
|
|
|
|
|
case DW_OP_reg30:
|
|
|
|
|
case DW_OP_reg31:
|
|
|
|
|
isreg = 1;
|
|
|
|
|
stack[++stacki] = op - DW_OP_reg0;
|
2003-11-19 16:08:01 +01:00
|
|
|
|
if (i < size)
|
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_regx:
|
|
|
|
|
isreg = 1;
|
|
|
|
|
unsnd = read_unsigned_leb128 (NULL, (data + i), &bytes_read);
|
|
|
|
|
i += bytes_read;
|
|
|
|
|
stack[++stacki] = unsnd;
|
2003-11-19 16:08:01 +01:00
|
|
|
|
if (i < size)
|
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_addr:
|
2000-07-24 03:26:10 +02:00
|
|
|
|
stack[++stacki] = read_address (objfile->obfd, &data[i],
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
cu, &bytes_read);
|
2000-07-24 03:26:10 +02:00
|
|
|
|
i += bytes_read;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const1u:
|
|
|
|
|
stack[++stacki] = read_1_byte (objfile->obfd, &data[i]);
|
|
|
|
|
i += 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const1s:
|
|
|
|
|
stack[++stacki] = read_1_signed_byte (objfile->obfd, &data[i]);
|
|
|
|
|
i += 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const2u:
|
|
|
|
|
stack[++stacki] = read_2_bytes (objfile->obfd, &data[i]);
|
|
|
|
|
i += 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const2s:
|
|
|
|
|
stack[++stacki] = read_2_signed_bytes (objfile->obfd, &data[i]);
|
|
|
|
|
i += 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const4u:
|
|
|
|
|
stack[++stacki] = read_4_bytes (objfile->obfd, &data[i]);
|
|
|
|
|
i += 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_const4s:
|
|
|
|
|
stack[++stacki] = read_4_signed_bytes (objfile->obfd, &data[i]);
|
|
|
|
|
i += 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_constu:
|
|
|
|
|
stack[++stacki] = read_unsigned_leb128 (NULL, (data + i),
|
1999-07-07 22:19:36 +02:00
|
|
|
|
&bytes_read);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
i += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_consts:
|
|
|
|
|
stack[++stacki] = read_signed_leb128 (NULL, (data + i), &bytes_read);
|
|
|
|
|
i += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
|
2002-01-11 10:32:50 +01:00
|
|
|
|
case DW_OP_dup:
|
|
|
|
|
stack[stacki + 1] = stack[stacki];
|
|
|
|
|
stacki++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
case DW_OP_plus:
|
|
|
|
|
stack[stacki - 1] += stack[stacki];
|
|
|
|
|
stacki--;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_plus_uconst:
|
|
|
|
|
stack[stacki] += read_unsigned_leb128 (NULL, (data + i), &bytes_read);
|
|
|
|
|
i += bytes_read;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_OP_minus:
|
2002-01-11 10:32:50 +01:00
|
|
|
|
stack[stacki - 1] -= stack[stacki];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
stacki--;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-04-26 20:34:20 +02:00
|
|
|
|
case DW_OP_deref:
|
|
|
|
|
/* If we're not the last op, then we definitely can't encode
|
2003-11-19 16:08:01 +01:00
|
|
|
|
this using GDB's address_class enum. This is valid for partial
|
|
|
|
|
global symbols, although the variable's address will be bogus
|
|
|
|
|
in the psymtab. */
|
1999-04-26 20:34:20 +02:00
|
|
|
|
if (i < size)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
1999-04-26 20:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-10-21 21:11:50 +02:00
|
|
|
|
case DW_OP_GNU_push_tls_address:
|
|
|
|
|
/* The top of the stack has the offset from the beginning
|
|
|
|
|
of the thread control block at which the variable is located. */
|
|
|
|
|
/* Nothing should follow this operator, so the top of stack would
|
|
|
|
|
be returned. */
|
2003-11-19 16:08:01 +01:00
|
|
|
|
/* This is valid for partial global symbols, but the variable's
|
|
|
|
|
address will be bogus in the psymtab. */
|
2002-10-21 21:11:50 +02:00
|
|
|
|
if (i < size)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_complex_location_expr_complaint ();
|
2002-10-21 21:11:50 +02:00
|
|
|
|
break;
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
default:
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "unsupported stack op: '%s'",
|
|
|
|
|
dwarf_stack_op_name (op));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return (stack[stacki]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (stack[stacki]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* memory allocation interface */
|
|
|
|
|
|
|
|
|
|
static struct dwarf_block *
|
2004-04-19 20:20:50 +02:00
|
|
|
|
dwarf_alloc_block (struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dwarf_block *blk;
|
|
|
|
|
|
|
|
|
|
blk = (struct dwarf_block *)
|
2004-04-19 20:20:50 +02:00
|
|
|
|
obstack_alloc (&cu->comp_unit_obstack, sizeof (struct dwarf_block));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return (blk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct abbrev_info *
|
2004-03-09 17:57:44 +01:00
|
|
|
|
dwarf_alloc_abbrev (struct dwarf2_cu *cu)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
|
2004-03-09 17:57:44 +01:00
|
|
|
|
abbrev = (struct abbrev_info *)
|
|
|
|
|
obstack_alloc (&cu->abbrev_obstack, sizeof (struct abbrev_info));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
memset (abbrev, 0, sizeof (struct abbrev_info));
|
|
|
|
|
return (abbrev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct die_info *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
dwarf_alloc_die (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct die_info *die;
|
|
|
|
|
|
|
|
|
|
die = (struct die_info *) xmalloc (sizeof (struct die_info));
|
|
|
|
|
memset (die, 0, sizeof (struct die_info));
|
|
|
|
|
return (die);
|
|
|
|
|
}
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Macro support. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the full name of file number I in *LH's file name table.
|
|
|
|
|
Use COMP_DIR as the name of the current directory of the
|
|
|
|
|
compilation. The result is allocated using xmalloc; the caller is
|
|
|
|
|
responsible for freeing it. */
|
|
|
|
|
static char *
|
|
|
|
|
file_full_name (int file, struct line_header *lh, const char *comp_dir)
|
|
|
|
|
{
|
|
|
|
|
struct file_entry *fe = &lh->file_names[file - 1];
|
|
|
|
|
|
|
|
|
|
if (IS_ABSOLUTE_PATH (fe->name))
|
|
|
|
|
return xstrdup (fe->name);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const char *dir;
|
|
|
|
|
int dir_len;
|
|
|
|
|
char *full_name;
|
|
|
|
|
|
|
|
|
|
if (fe->dir_index)
|
|
|
|
|
dir = lh->include_dirs[fe->dir_index - 1];
|
|
|
|
|
else
|
|
|
|
|
dir = comp_dir;
|
|
|
|
|
|
|
|
|
|
if (dir)
|
|
|
|
|
{
|
|
|
|
|
dir_len = strlen (dir);
|
|
|
|
|
full_name = xmalloc (dir_len + 1 + strlen (fe->name) + 1);
|
|
|
|
|
strcpy (full_name, dir);
|
|
|
|
|
full_name[dir_len] = '/';
|
|
|
|
|
strcpy (full_name + dir_len + 1, fe->name);
|
|
|
|
|
return full_name;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return xstrdup (fe->name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct macro_source_file *
|
|
|
|
|
macro_start_file (int file, int line,
|
|
|
|
|
struct macro_source_file *current_file,
|
|
|
|
|
const char *comp_dir,
|
|
|
|
|
struct line_header *lh, struct objfile *objfile)
|
|
|
|
|
{
|
|
|
|
|
/* The full name of this source file. */
|
|
|
|
|
char *full_name = file_full_name (file, lh, comp_dir);
|
|
|
|
|
|
|
|
|
|
/* We don't create a macro table for this compilation unit
|
|
|
|
|
at all until we actually get a filename. */
|
|
|
|
|
if (! pending_macros)
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
pending_macros = new_macro_table (&objfile->objfile_obstack,
|
2002-07-12 17:23:10 +02:00
|
|
|
|
objfile->macro_cache);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
if (! current_file)
|
|
|
|
|
/* If we have no current file, then this must be the start_file
|
|
|
|
|
directive for the compilation unit's main source file. */
|
|
|
|
|
current_file = macro_set_main (pending_macros, full_name);
|
|
|
|
|
else
|
|
|
|
|
current_file = macro_include (current_file, line, full_name);
|
|
|
|
|
|
|
|
|
|
xfree (full_name);
|
|
|
|
|
|
|
|
|
|
return current_file;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Copy the LEN characters at BUF to a xmalloc'ed block of memory,
|
|
|
|
|
followed by a null byte. */
|
|
|
|
|
static char *
|
|
|
|
|
copy_string (const char *buf, int len)
|
|
|
|
|
{
|
|
|
|
|
char *s = xmalloc (len + 1);
|
|
|
|
|
memcpy (s, buf, len);
|
|
|
|
|
s[len] = '\0';
|
|
|
|
|
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
consume_improper_spaces (const char *p, const char *body)
|
|
|
|
|
{
|
|
|
|
|
if (*p == ' ')
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"macro definition contains spaces in formal argument list:\n`%s'",
|
|
|
|
|
body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
while (*p == ' ')
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
parse_macro_definition (struct macro_source_file *file, int line,
|
|
|
|
|
const char *body)
|
|
|
|
|
{
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
/* The body string takes one of two forms. For object-like macro
|
|
|
|
|
definitions, it should be:
|
|
|
|
|
|
|
|
|
|
<macro name> " " <definition>
|
|
|
|
|
|
|
|
|
|
For function-like macro definitions, it should be:
|
|
|
|
|
|
|
|
|
|
<macro name> "() " <definition>
|
|
|
|
|
or
|
|
|
|
|
<macro name> "(" <arg name> ( "," <arg name> ) * ") " <definition>
|
|
|
|
|
|
|
|
|
|
Spaces may appear only where explicitly indicated, and in the
|
|
|
|
|
<definition>.
|
|
|
|
|
|
|
|
|
|
The Dwarf 2 spec says that an object-like macro's name is always
|
|
|
|
|
followed by a space, but versions of GCC around March 2002 omit
|
|
|
|
|
the space when the macro's definition is the empty string.
|
|
|
|
|
|
|
|
|
|
The Dwarf 2 spec says that there should be no spaces between the
|
|
|
|
|
formal arguments in a function-like macro's formal argument list,
|
|
|
|
|
but versions of GCC around March 2002 include spaces after the
|
|
|
|
|
commas. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the extent of the macro name. The macro name is terminated
|
|
|
|
|
by either a space or null character (for an object-like macro) or
|
|
|
|
|
an opening paren (for a function-like macro). */
|
|
|
|
|
for (p = body; *p; p++)
|
|
|
|
|
if (*p == ' ' || *p == '(')
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (*p == ' ' || *p == '\0')
|
|
|
|
|
{
|
|
|
|
|
/* It's an object-like macro. */
|
|
|
|
|
int name_len = p - body;
|
|
|
|
|
char *name = copy_string (body, name_len);
|
|
|
|
|
const char *replacement;
|
|
|
|
|
|
|
|
|
|
if (*p == ' ')
|
|
|
|
|
replacement = body + name_len + 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
replacement = body + name_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
macro_define_object (file, line, name, replacement);
|
|
|
|
|
|
|
|
|
|
xfree (name);
|
|
|
|
|
}
|
|
|
|
|
else if (*p == '(')
|
|
|
|
|
{
|
|
|
|
|
/* It's a function-like macro. */
|
|
|
|
|
char *name = copy_string (body, p - body);
|
|
|
|
|
int argc = 0;
|
|
|
|
|
int argv_size = 1;
|
|
|
|
|
char **argv = xmalloc (argv_size * sizeof (*argv));
|
|
|
|
|
|
|
|
|
|
p++;
|
|
|
|
|
|
|
|
|
|
p = consume_improper_spaces (p, body);
|
|
|
|
|
|
|
|
|
|
/* Parse the formal argument list. */
|
|
|
|
|
while (*p && *p != ')')
|
|
|
|
|
{
|
|
|
|
|
/* Find the extent of the current argument name. */
|
|
|
|
|
const char *arg_start = p;
|
|
|
|
|
|
|
|
|
|
while (*p && *p != ',' && *p != ')' && *p != ' ')
|
|
|
|
|
p++;
|
|
|
|
|
|
|
|
|
|
if (! *p || p == arg_start)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Make sure argv has room for the new argument. */
|
|
|
|
|
if (argc >= argv_size)
|
|
|
|
|
{
|
|
|
|
|
argv_size *= 2;
|
|
|
|
|
argv = xrealloc (argv, argv_size * sizeof (*argv));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
argv[argc++] = copy_string (arg_start, p - arg_start);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = consume_improper_spaces (p, body);
|
|
|
|
|
|
|
|
|
|
/* Consume the comma, if present. */
|
|
|
|
|
if (*p == ',')
|
|
|
|
|
{
|
|
|
|
|
p++;
|
|
|
|
|
|
|
|
|
|
p = consume_improper_spaces (p, body);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*p == ')')
|
|
|
|
|
{
|
|
|
|
|
p++;
|
|
|
|
|
|
|
|
|
|
if (*p == ' ')
|
|
|
|
|
/* Perfectly formed definition, no complaints. */
|
|
|
|
|
macro_define_function (file, line, name,
|
|
|
|
|
argc, (const char **) argv,
|
|
|
|
|
p + 1);
|
|
|
|
|
else if (*p == '\0')
|
|
|
|
|
{
|
|
|
|
|
/* Complain, but do define it. */
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
macro_define_function (file, line, name,
|
|
|
|
|
argc, (const char **) argv,
|
|
|
|
|
p);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Just complain. */
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Just complain. */
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
xfree (name);
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
|
xfree (argv[i]);
|
|
|
|
|
}
|
|
|
|
|
xfree (argv);
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macro_malformed_definition_complaint (body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf_decode_macros (struct line_header *lh, unsigned int offset,
|
|
|
|
|
char *comp_dir, bfd *abfd,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
|
|
|
|
char *mac_ptr, *mac_end;
|
|
|
|
|
struct macro_source_file *current_file = 0;
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
if (dwarf2_per_objfile->macinfo_buffer == NULL)
|
2002-05-16 23:00:14 +02:00
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints, "missing .debug_macinfo section");
|
2002-05-16 23:00:14 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
mac_ptr = dwarf2_per_objfile->macinfo_buffer + offset;
|
|
|
|
|
mac_end = dwarf2_per_objfile->macinfo_buffer
|
|
|
|
|
+ dwarf2_per_objfile->macinfo_size;
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
enum dwarf_macinfo_record_type macinfo_type;
|
|
|
|
|
|
|
|
|
|
/* Do we at least have room for a macinfo type byte? */
|
|
|
|
|
if (mac_ptr >= mac_end)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macros_too_long_complaint ();
|
2002-05-16 23:00:14 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
macinfo_type = read_1_byte (abfd, mac_ptr);
|
|
|
|
|
mac_ptr++;
|
|
|
|
|
|
|
|
|
|
switch (macinfo_type)
|
|
|
|
|
{
|
|
|
|
|
/* A zero macinfo type indicates the end of the macro
|
|
|
|
|
information. */
|
|
|
|
|
case 0:
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case DW_MACINFO_define:
|
|
|
|
|
case DW_MACINFO_undef:
|
|
|
|
|
{
|
|
|
|
|
int bytes_read;
|
|
|
|
|
int line;
|
|
|
|
|
char *body;
|
|
|
|
|
|
|
|
|
|
line = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
body = read_string (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
|
|
|
|
|
if (! current_file)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"debug info gives macro %s outside of any file: %s",
|
|
|
|
|
macinfo_type ==
|
|
|
|
|
DW_MACINFO_define ? "definition" : macinfo_type ==
|
|
|
|
|
DW_MACINFO_undef ? "undefinition" :
|
|
|
|
|
"something-or-other", body);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (macinfo_type == DW_MACINFO_define)
|
|
|
|
|
parse_macro_definition (current_file, line, body);
|
|
|
|
|
else if (macinfo_type == DW_MACINFO_undef)
|
|
|
|
|
macro_undef (current_file, line, body);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_MACINFO_start_file:
|
|
|
|
|
{
|
|
|
|
|
int bytes_read;
|
|
|
|
|
int line, file;
|
|
|
|
|
|
|
|
|
|
line = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
file = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
|
|
|
|
|
current_file = macro_start_file (file, line,
|
|
|
|
|
current_file, comp_dir,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
lh, cu->objfile);
|
2002-05-16 23:00:14 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_MACINFO_end_file:
|
|
|
|
|
if (! current_file)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"macro debug info has an unmatched `close_file' directive");
|
2002-05-16 23:00:14 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
current_file = current_file->included_by;
|
|
|
|
|
if (! current_file)
|
|
|
|
|
{
|
|
|
|
|
enum dwarf_macinfo_record_type next_type;
|
|
|
|
|
|
|
|
|
|
/* GCC circa March 2002 doesn't produce the zero
|
|
|
|
|
type byte marking the end of the compilation
|
|
|
|
|
unit. Complain if it's not there, but exit no
|
|
|
|
|
matter what. */
|
|
|
|
|
|
|
|
|
|
/* Do we at least have room for a macinfo type byte? */
|
|
|
|
|
if (mac_ptr >= mac_end)
|
|
|
|
|
{
|
2002-12-11 21:55:37 +01:00
|
|
|
|
dwarf2_macros_too_long_complaint ();
|
2002-05-16 23:00:14 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We don't increment mac_ptr here, so this is just
|
|
|
|
|
a look-ahead. */
|
|
|
|
|
next_type = read_1_byte (abfd, mac_ptr);
|
|
|
|
|
if (next_type != 0)
|
2002-12-11 21:55:37 +01:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"no terminating 0-type entry for macros in `.debug_macinfo' section");
|
2002-05-16 23:00:14 +02:00
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DW_MACINFO_vendor_ext:
|
|
|
|
|
{
|
|
|
|
|
int bytes_read;
|
|
|
|
|
int constant;
|
|
|
|
|
char *string;
|
|
|
|
|
|
|
|
|
|
constant = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
string = read_string (abfd, mac_ptr, &bytes_read);
|
|
|
|
|
mac_ptr += bytes_read;
|
|
|
|
|
|
|
|
|
|
/* We don't recognize any vendor extensions. */
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-07-12 21:55:10 +02:00
|
|
|
|
|
|
|
|
|
/* Check if the attribute's form is a DW_FORM_block*
|
|
|
|
|
if so return true else false. */
|
|
|
|
|
static int
|
|
|
|
|
attr_form_is_block (struct attribute *attr)
|
|
|
|
|
{
|
|
|
|
|
return (attr == NULL ? 0 :
|
|
|
|
|
attr->form == DW_FORM_block1
|
|
|
|
|
|| attr->form == DW_FORM_block2
|
|
|
|
|
|| attr->form == DW_FORM_block4
|
|
|
|
|
|| attr->form == DW_FORM_block);
|
|
|
|
|
}
|
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 16:24:18 +01:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
struct dwarf2_cu *cu)
|
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 16:24:18 +01:00
|
|
|
|
{
|
2003-04-13 17:43:35 +02:00
|
|
|
|
if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
|
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 16:24:18 +01:00
|
|
|
|
{
|
2003-04-13 17:43:35 +02:00
|
|
|
|
struct dwarf2_loclist_baton *baton;
|
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 16:24:18 +01:00
|
|
|
|
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
baton = obstack_alloc (&cu->objfile->objfile_obstack,
|
2003-04-13 17:43:35 +02:00
|
|
|
|
sizeof (struct dwarf2_loclist_baton));
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
baton->objfile = cu->objfile;
|
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 16:24:18 +01:00
|
|
|
|
|
2003-04-13 17:43:35 +02:00
|
|
|
|
/* We don't know how long the location list is, but make sure we
|
|
|
|
|
don't run off the edge of the section. */
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
baton->size = dwarf2_per_objfile->loc_size - DW_UNSND (attr);
|
|
|
|
|
baton->data = dwarf2_per_objfile->loc_buffer + DW_UNSND (attr);
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
baton->base_address = cu->header.base_address;
|
|
|
|
|
if (cu->header.base_known == 0)
|
2003-04-13 17:43:35 +02:00
|
|
|
|
complaint (&symfile_complaints,
|
|
|
|
|
"Location list used without specifying the CU base address.");
|
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 16:24:18 +01:00
|
|
|
|
|
2004-01-26 21:36:32 +01:00
|
|
|
|
SYMBOL_OPS (sym) = &dwarf2_loclist_funcs;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
SYMBOL_LOCATION_BATON (sym) = baton;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct dwarf2_locexpr_baton *baton;
|
|
|
|
|
|
2004-02-07 Elena Zannoni <ezannoni@redhat.com>
* buildsym.c (free_pending_blocks, finish_block)
(record_pending_block, make_blockvector, end_symtab): Replace
symbol_obstack with objfile_obstack.
* coffread.c (process_coff_symbol, coff_read_struct_type)
(coff_read_enum_type): Ditto.
* cp-namespace.c (initialize_namespace_symtab)
(check_one_possible_namespace_symbol): Ditto.
* dwarf2read.c (new_symbol, dwarf2_const_value, macro_start_file)
(dwarf2_symbol_mark_computed): Ditto.
* dwarfread.c (enum_type, new_symbol, synthesize_typedef): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* hpread.c (hpread_symfile_init, hpread_symfile_init)
(hpread_read_enum_type, hpread_read_function_type)
(hpread_read_doc_function_type, hpread_process_one_debug_symbol):
Ditto.
* jv-lang.c (get_java_class_symtab, add_class_symbol)
(java_link_class_type): Ditto.
* mdebugread.c (parse_symbol, psymtab_to_symtab_1, new_symtab)
(new_symbol): Ditto.
* minsyms.c (install_minimal_symbols): Ditto.
* objfiles.c (allocate_objfile): Remove init of symbol_obstack.
(terminate_minimal_symbol_table): Replace symbol_obstack with
objfile_obstack.
(free_objfile): Remove freeing of symbol_obstack.
* objfiles.h: Remove symbol_obstack field.
* pa64solib.c (add_to_solist): Replace symbol_obstack with
objfile_obstack.
* solib-sunos.c (allocate_rt_common_objfile): Remove init of
symbol_obstack.
(solib_add_common_symbols): Replace symbol_obstack with
objfile_obstack.
* somsolib.c (som_solib_add): Ditto.
* stabsread.c (patch_block_stabs, define_symbol, read_enum_type)
(common_block_start, common_block_end): Ditto.
* symfile.c (reread_symbols): Remove freeing and init of
symbol_obstack.
(allocate_symtab): Rename symbol_obstack to objfile_obstack.
* symfile.h: Update comment.
* symmisc.c (print_objfile_statistics): Remove symbol_obstack
stats printing.
* symtab.c (symbol_set_names): Replace symbol_obstack with
objfile_obstack.
* symtab.h (struct general_symbol_info, struct minimal_symbol):
Update comments.
* xcoffread.c (read_xcoff_symtab, SYMBOL_DUP, SYMNAME_ALLOC)
(init_stringtab, xcoff_initial_scan): Replace symbol_obstack with
objfile_obstack.
2004-02-08 00:13:47 +01:00
|
|
|
|
baton = obstack_alloc (&cu->objfile->objfile_obstack,
|
2003-04-13 17:43:35 +02:00
|
|
|
|
sizeof (struct dwarf2_locexpr_baton));
|
* dwarf2read.c (struct dwarf2_cu): New type.
(dwarf2_build_psymtabs_hard, psymtab_to_symtab_1): Create a
dwarf2_cu structure to pass down.
(scan_partial_symbols, add_partial_symbol, add_partial_namespace)
(add_partial_enumeration, locate_pdi_sibling, process_die)
(read_file_scope, read_func_scope)
(read_lexical_block_scope, dwarf2_get_pc_bounds)
(dwarf2_add_field, dwarf2_attach_fields_to_type)
(dwarf2_add_member_fn, dwarf2_attach_fn_fields_to_type)
(read_structure_scope, read_enumeration, read_array_type)
(read_common_block, read_namespace, read_tag_pointer_type)
(read_tag_ptr_to_member_type, read_tag_reference_type)
(read_tag_const_type, read_tag_volatile_type, read_tag_string_type)
(read_subroutine_type, read_typedef, read_base_type, read_comp_unit)
(read_die_and_children, read_die_and_siblings, dwarf2_read_section)
(dwarf2_read_abbrevs, dwarf2_lookup_abbrev, read_partial_die)
(read_full_die. read_attribute_value, read_attribute)
(read_address, dwarf_decode_line_header, dwarf_decode_lines)
(var_decode_location, new_symbol, dwarf2_const_value, die_type)
(die_containing_type, type_at_offset, tag_type_to_type)
(read_type_die, dwarf_base_type, decode_locdesc, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Accept and use a dwarf2_cu object.
2003-11-12 18:10:55 +01:00
|
|
|
|
baton->objfile = cu->objfile;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
|
|
|
|
|
if (attr_form_is_block (attr))
|
|
|
|
|
{
|
|
|
|
|
/* Note that we're just copying the block's data pointer
|
|
|
|
|
here, not the actual data. We're still pointing into the
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
info_buffer for SYM's objfile; right now we never release
|
|
|
|
|
that buffer, but when we do clean up properly this may
|
|
|
|
|
need to change. */
|
2003-04-13 17:43:35 +02:00
|
|
|
|
baton->size = DW_BLOCK (attr)->size;
|
|
|
|
|
baton->data = DW_BLOCK (attr)->data;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
dwarf2_invalid_attrib_class_complaint ("location description",
|
|
|
|
|
SYMBOL_NATURAL_NAME (sym));
|
|
|
|
|
baton->size = 0;
|
|
|
|
|
baton->data = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-26 21:36:32 +01:00
|
|
|
|
SYMBOL_OPS (sym) = &dwarf2_locexpr_funcs;
|
2003-04-13 17:43:35 +02:00
|
|
|
|
SYMBOL_LOCATION_BATON (sym) = baton;
|
|
|
|
|
}
|
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 16:24:18 +01:00
|
|
|
|
}
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
|
* dwarf2read.c: Include "hashtab.h".
(struct dwarf2_cu): Add partial_dies, comp_unit_obstack,
has_namespace_info.
(struct partial_die_info): Add comments. Use bitfields to reduce
memory footprint. Add scope, scope_set, has_specification,
spec_offset, die_parent, die_child, and die_sibling.
(peek_die_abbrev): Add prototype.
(partial_read_comp_unit_head): New function, broken out from
dwarf2_build_psymtabs_hard.
(dwarf2_build_psymtabs_hard): Remove unused variable abbrev_ptr.
Use partial_read_comp_unit_head. Initialize the CU and
comp_unit_obstack. Update calls to read_partial_die and
scan_partial_symbols. Use free_stack_comp_unit and
load_partial_dies.
(scan_partial_symbols): Change PDI to a pointer. Use the child and
sibling pointers to walk partial DIEs. Call fixup_partial_die.
Update calls to helper functions. Remove NAMESPACE argument.
Update comments.
(partial_die_parent_scope, partial_die_full_name): New functions.
(add_partial_symbol): Remove namespace argument. Update call to
pdi_needs_namespace. Use partial_die_full_name. Handle
DW_TAG_namespace. Check has_namespace_info flag.
(pdi_needs_namespace): Remove NAMESPACE argument. Just check the
tag. Handle namespaces.
(add_partial_namespace, add_partial_enumeration): Simplify.
(guess_structure_name): New function, derived from
add_partial_structure.
(add_partial_structure): Remove.
(determine_class_name): Update comment.
(dwarf2_read_abbrevs): Set has_namespace_info flag.
(is_type_tag_for_partial, load_partial_dies): New functions.
(read_partial_die): Pass abbrev and abbrev_len as arguments.
Record specifications instead of following them immediately.
(find_partial_die_in_comp_unit, find_partial_die)
(fixup_partial_die, free_stack_comp_unit)
(hashtab_obstack_allocate, dummy_obstack_deallocate)
(partial_die_hash, partial_die_eq): New functions.
* Makefile.in (hashtab_h): Define.
(dwarf2read.o): Update dependencies.
(observer_inc, observer_h): Move to the correct section.
2004-04-16 17:18:23 +02:00
|
|
|
|
/* This cleanup function is passed the address of a dwarf2_cu on the stack
|
|
|
|
|
when we're finished with it. We can't free the pointer itself, but
|
|
|
|
|
release any associated storage.
|
|
|
|
|
|
|
|
|
|
Only used during partial symbol parsing. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
free_stack_comp_unit (void *data)
|
|
|
|
|
{
|
|
|
|
|
struct dwarf2_cu *cu = data;
|
|
|
|
|
|
|
|
|
|
obstack_free (&cu->comp_unit_obstack, NULL);
|
|
|
|
|
cu->partial_dies = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocation function for the libiberty hash table which uses an
|
|
|
|
|
obstack. */
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
hashtab_obstack_allocate (void *data, size_t size, size_t count)
|
|
|
|
|
{
|
|
|
|
|
unsigned int total = size * count;
|
|
|
|
|
void *ptr = obstack_alloc ((struct obstack *) data, total);
|
|
|
|
|
memset (ptr, 0, total);
|
|
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Trivial deallocation function for the libiberty splay tree and hash
|
|
|
|
|
table - don't deallocate anything. Rely on later deletion of the
|
|
|
|
|
obstack. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dummy_obstack_deallocate (void *object, void *data)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Trivial hash function for partial_die_info: the hash value of a DIE
|
|
|
|
|
is its offset in .debug_info for this objfile. */
|
|
|
|
|
|
|
|
|
|
static hashval_t
|
|
|
|
|
partial_die_hash (const void *item)
|
|
|
|
|
{
|
|
|
|
|
const struct partial_die_info *part_die = item;
|
|
|
|
|
return part_die->offset;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Trivial comparison function for partial_die_info structures: two DIEs
|
|
|
|
|
are equal if they have the same offset. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
partial_die_eq (const void *item_lhs, const void *item_rhs)
|
|
|
|
|
{
|
|
|
|
|
const struct partial_die_info *part_die_lhs = item_lhs;
|
|
|
|
|
const struct partial_die_info *part_die_rhs = item_rhs;
|
|
|
|
|
return part_die_lhs->offset == part_die_rhs->offset;
|
|
|
|
|
}
|
|
|
|
|
|
* dwarf2read.c (dwarf2_objfile_data_key): New.
(struct dwarf2_per_objfile, dwarf2_per_objfile): New.
(dwarf_info_size, dwarf_abbrev_size, dwarf_line_size)
(dwarf_pubnames_size, dwarf_aranges_size, dwarf_loc_size)
(dwarf_macinfo_size, dwarf_str_size, dwarf_ranges_size)
(dwarf_frame_size, dwarf_eh_frame_size, dwarf_info_buffer)
(dwarf_abbrev_buffer, dwarf_line_buffer, dwarf_str_buffer)
(dwarf_macinfo_buffer, dwarf_ranges_buffer, dwarf_loc_buffer):
Remove variables.
(struct dwarf2_pinfo): Remove per-objfile members. Update comments.
(DWARF_ABBREV_SIZE, DWARF_LINE_SIZE)
(DWARF_LOC_SIZE, DWARF_MACINFO_SIZE, DWARF_STR_SIZE)
(DWARF_RANGES_SIZE, DWARF_INFO_BUFFER)
(DWARF_ABBREV_BUFFER, DWARF_LINE_BUFFER, DWARF_STR_BUFFER)
(DWARF_MACINFO_BUFFER, DWARF_RANGES_BUFFER, DWARF_LOC_BUFFER):
Remove macros.
(dwarf2_has_info): Take an objfile argument. Allocate per-objfile
data.
(dwarf2_locate_sections, dwarf2_build_psymtabs)
(dwarf2_build_psymtabs_easy, dwarf2_build_psymtabs_hard)
(skip_one_die, dwarf2_get_pc_bounds, dwarf2_read_abbrevs)
(read_partial_die, read_full_die, read_indirect_string)
(dwarf_decode_line_header, dwarf_decode_macros)
(dwarf2_symbol_mark_computed): Remove use of removed macros.
Update uses of removed variables.
(psymtab_to_symtab_1): Restore per-objfile data pointer. Remove use
of removed macros.
(_initialize_dwarf2_read): New function.
* symfile.h (dwarf2_has_info): Update prototype.
* coffread.c (coff_symfile_read): Update call to dwarf2_has_info.
* elfread.c (elf_symfile_read): Likewise.
2004-04-02 06:35:46 +02:00
|
|
|
|
void _initialize_dwarf2_read (void);
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_initialize_dwarf2_read (void)
|
|
|
|
|
{
|
|
|
|
|
dwarf2_objfile_data_key = register_objfile_data ();
|
|
|
|
|
}
|