/* DWARF 2 debugging format support for GDB.
- Copyright (C) 1994-2017 Free Software Foundation, Inc.
+ Copyright (C) 1994-2018 Free Software Foundation, Inc.
Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
Inc. with support from Florida State University (under contract
E.g., load_partial_dies, read_partial_die. */
#include "defs.h"
+#include "dwarf2read.h"
+#include "dwarf-index-common.h"
#include "bfd.h"
#include "elf-bfd.h"
#include "symtab.h"
#include "common/gdb_optional.h"
#include "common/underlying.h"
#include "common/byte-vector.h"
+#include "common/hash_enum.h"
#include "filename-seen-cache.h"
#include "producer.h"
#include <fcntl.h>
#include <cmath>
#include <set>
#include <forward_list>
-
-typedef struct symbol *symbolp;
-DEF_VEC_P (symbolp);
+#include "rust-lang.h"
+#include "common/pathstuff.h"
/* When == 1, print basic high level tracing messages.
When > 1, be more verbose.
static int dwarf2_locexpr_block_index;
static int dwarf2_loclist_block_index;
-/* A descriptor for dwarf sections.
-
- S.ASECTION, SIZE are typically initialized when the objfile is first
- scanned. BUFFER, READIN are filled in later when the section is read.
- If the section contained compressed data then SIZE is updated to record
- the uncompressed size of the section.
-
- DWP file format V2 introduces a wrinkle that is easiest to handle by
- creating the concept of virtual sections contained within a real section.
- In DWP V2 the sections of the input DWO files are concatenated together
- into one section, but section offsets are kept relative to the original
- input section.
- If this is a virtual dwp-v2 section, S.CONTAINING_SECTION is a backlink to
- the real section this "virtual" section is contained in, and BUFFER,SIZE
- describe the virtual section. */
-
-struct dwarf2_section_info
-{
- union
- {
- /* If this is a real section, the bfd section. */
- asection *section;
- /* If this is a virtual section, pointer to the containing ("real")
- section. */
- struct dwarf2_section_info *containing_section;
- } s;
- /* Pointer to section data, only valid if readin. */
- const gdb_byte *buffer;
- /* The size of the section, real or virtual. */
- bfd_size_type size;
- /* If this is a virtual section, the offset in the real section.
- Only valid if is_virtual. */
- bfd_size_type virtual_offset;
- /* True if we have tried to read this section. */
- char readin;
- /* True if this is a virtual section, False otherwise.
- This specifies which of s.section and s.containing_section to use. */
- char is_virtual;
-};
-
-typedef struct dwarf2_section_info dwarf2_section_info_def;
-DEF_VEC_O (dwarf2_section_info_def);
-
-/* All offsets in the index are of this type. It must be
- architecture-independent. */
-typedef uint32_t offset_type;
-
-DEF_VEC_I (offset_type);
-
-/* Ensure only legit values are used. */
-#define DW2_GDB_INDEX_SYMBOL_STATIC_SET_VALUE(cu_index, value) \
- do { \
- gdb_assert ((unsigned int) (value) <= 1); \
- GDB_INDEX_SYMBOL_STATIC_SET_VALUE((cu_index), (value)); \
- } while (0)
-
-/* Ensure only legit values are used. */
-#define DW2_GDB_INDEX_SYMBOL_KIND_SET_VALUE(cu_index, value) \
- do { \
- gdb_assert ((value) >= GDB_INDEX_SYMBOL_KIND_TYPE \
- && (value) <= GDB_INDEX_SYMBOL_KIND_OTHER); \
- GDB_INDEX_SYMBOL_KIND_SET_VALUE((cu_index), (value)); \
- } while (0)
-
-/* Ensure we don't use more than the alloted nuber of bits for the CU. */
-#define DW2_GDB_INDEX_CU_SET_VALUE(cu_index, value) \
- do { \
- gdb_assert (((value) & ~GDB_INDEX_CU_MASK) == 0); \
- GDB_INDEX_CU_SET_VALUE((cu_index), (value)); \
- } while (0)
-
-#if WORDS_BIGENDIAN
-
-/* Convert VALUE between big- and little-endian. */
-
-static offset_type
-byte_swap (offset_type value)
-{
- offset_type result;
-
- result = (value & 0xff) << 24;
- result |= (value & 0xff00) << 8;
- result |= (value & 0xff0000) >> 8;
- result |= (value & 0xff000000) >> 24;
- return result;
-}
-
-#define MAYBE_SWAP(V) byte_swap (V)
-
-#else
-#define MAYBE_SWAP(V) static_cast<offset_type> (V)
-#endif /* WORDS_BIGENDIAN */
-
/* An index into a (C++) symbol name component in a symbol name as
recorded in the mapped_index's symbol table. For each C++ symbol
in the symbol table, we record one entry for the start of each
offset_type idx;
};
-/* A description of the mapped index. The file format is described in
- a comment by the code that writes the index. */
-struct mapped_index
-{
- /* Index data format version. */
- int version;
-
- /* The total length of the buffer. */
- off_t total_size;
-
- /* A pointer to the address table data. */
- const gdb_byte *address_table;
+/* Base class containing bits shared by both .gdb_index and
+ .debug_name indexes. */
- /* Size of the address table data in bytes. */
- offset_type address_table_size;
-
- /* The symbol table, implemented as a hash table. */
- const offset_type *symbol_table;
-
- /* Size in slots, each slot is 2 offset_types. */
- offset_type symbol_table_slots;
-
- /* A pointer to the constant pool. */
- const char *constant_pool;
+struct mapped_index_base
+{
+ mapped_index_base () = default;
+ DISABLE_COPY_AND_ASSIGN (mapped_index_base);
/* The name_component table (a sorted vector). See name_component's
description above. */
/* How NAME_COMPONENTS is sorted. */
enum case_sensitivity name_components_casing;
- /* Convenience method to get at the name of the symbol at IDX in the
- symbol table. */
- const char *symbol_name_at (offset_type idx) const
- { return this->constant_pool + MAYBE_SWAP (this->symbol_table[idx]); }
+ /* Return the number of names in the symbol table. */
+ virtual size_t symbol_name_count () const = 0;
+
+ /* Get the name of the symbol at IDX in the symbol table. */
+ virtual const char *symbol_name_at (offset_type idx) const = 0;
+
+ /* Return whether the name at IDX in the symbol table should be
+ ignored. */
+ virtual bool symbol_name_slot_invalid (offset_type idx) const
+ {
+ return false;
+ }
/* Build the symbol name component sorted vector, if we haven't
yet. */
std::pair<std::vector<name_component>::const_iterator,
std::vector<name_component>::const_iterator>
find_name_components_bounds (const lookup_name_info &ln_no_params) const;
-};
-typedef struct dwarf2_per_cu_data *dwarf2_per_cu_ptr;
-DEF_VEC_P (dwarf2_per_cu_ptr);
+ /* Prevent deleting/destroying via a base class pointer. */
+protected:
+ ~mapped_index_base() = default;
+};
-struct tu_stats
+/* A description of the mapped index. The file format is described in
+ a comment by the code that writes the index. */
+struct mapped_index final : public mapped_index_base
{
- int nr_uniq_abbrev_tables;
- int nr_symtabs;
- int nr_symtab_sharers;
- int nr_stmt_less_type_units;
- int nr_all_type_units_reallocs;
-};
+ /* A slot/bucket in the symbol table hash. */
+ struct symbol_table_slot
+ {
+ const offset_type name;
+ const offset_type vec;
+ };
+
+ /* Index data format version. */
+ int version = 0;
+
+ /* The address table data. */
+ gdb::array_view<const gdb_byte> address_table;
+
+ /* The symbol table, implemented as a hash table. */
+ gdb::array_view<symbol_table_slot> symbol_table;
+
+ /* A pointer to the constant pool. */
+ const char *constant_pool = nullptr;
+
+ bool symbol_name_slot_invalid (offset_type idx) const override
+ {
+ const auto &bucket = this->symbol_table[idx];
+ return bucket.name == 0 && bucket.vec;
+ }
+
+ /* Convenience method to get at the name of the symbol at IDX in the
+ symbol table. */
+ const char *symbol_name_at (offset_type idx) const override
+ { return this->constant_pool + MAYBE_SWAP (this->symbol_table[idx].name); }
-/* Collection of data recorded per objfile.
- This hangs off of dwarf2_objfile_data_key. */
+ size_t symbol_name_count () const override
+ { return this->symbol_table.size (); }
+};
-struct dwarf2_per_objfile
+/* A description of the mapped .debug_names.
+ Uninitialized map has CU_COUNT 0. */
+struct mapped_debug_names final : public mapped_index_base
{
- /* Construct a dwarf2_per_objfile for OBJFILE. NAMES points to the
- dwarf2 section names, or is NULL if the standard ELF names are
- used. */
- dwarf2_per_objfile (struct objfile *objfile,
- const dwarf2_debug_sections *names);
+ mapped_debug_names (struct dwarf2_per_objfile *dwarf2_per_objfile_)
+ : dwarf2_per_objfile (dwarf2_per_objfile_)
+ {}
- ~dwarf2_per_objfile ();
+ struct dwarf2_per_objfile *dwarf2_per_objfile;
+ bfd_endian dwarf5_byte_order;
+ bool dwarf5_is_dwarf64;
+ bool augmentation_is_gdb;
+ uint8_t offset_size;
+ uint32_t cu_count = 0;
+ uint32_t tu_count, bucket_count, name_count;
+ const gdb_byte *cu_table_reordered, *tu_table_reordered;
+ const uint32_t *bucket_table_reordered, *hash_table_reordered;
+ const gdb_byte *name_table_string_offs_reordered;
+ const gdb_byte *name_table_entry_offs_reordered;
+ const gdb_byte *entry_pool;
+
+ struct index_val
+ {
+ ULONGEST dwarf_tag;
+ struct attr
+ {
+ /* Attribute name DW_IDX_*. */
+ ULONGEST dw_idx;
- DISABLE_COPY_AND_ASSIGN (dwarf2_per_objfile);
+ /* Attribute form DW_FORM_*. */
+ ULONGEST form;
- /* Free all cached compilation units. */
- void free_cached_comp_units ();
-private:
- /* This function is mapped across the sections and remembers the
- offset and size of each of the debugging sections we are
- interested in. */
- void locate_sections (bfd *abfd, asection *sectp,
- const dwarf2_debug_sections &names);
+ /* Value if FORM is DW_FORM_implicit_const. */
+ LONGEST implicit_const;
+ };
+ std::vector<attr> attr_vec;
+ };
-public:
- dwarf2_section_info info {};
- dwarf2_section_info abbrev {};
- dwarf2_section_info line {};
- dwarf2_section_info loc {};
- dwarf2_section_info loclists {};
- dwarf2_section_info macinfo {};
- dwarf2_section_info macro {};
- dwarf2_section_info str {};
- dwarf2_section_info line_str {};
- dwarf2_section_info ranges {};
- dwarf2_section_info rnglists {};
- dwarf2_section_info addr {};
- dwarf2_section_info frame {};
- dwarf2_section_info eh_frame {};
- dwarf2_section_info gdb_index {};
-
- VEC (dwarf2_section_info_def) *types = NULL;
-
- /* Back link. */
- struct objfile *objfile = NULL;
-
- /* Table of all the compilation units. This is used to locate
- the target compilation unit of a particular reference. */
- struct dwarf2_per_cu_data **all_comp_units = NULL;
-
- /* The number of compilation units in ALL_COMP_UNITS. */
- int n_comp_units = 0;
-
- /* The number of .debug_types-related CUs. */
- int n_type_units = 0;
-
- /* The number of elements allocated in all_type_units.
- If there are skeleton-less TUs, we add them to all_type_units lazily. */
- int n_allocated_type_units = 0;
-
- /* The .debug_types-related CUs (TUs).
- This is stored in malloc space because we may realloc it. */
- struct signatured_type **all_type_units = NULL;
-
- /* Table of struct type_unit_group objects.
- The hash key is the DW_AT_stmt_list value. */
- htab_t type_unit_groups {};
-
- /* A table mapping .debug_types signatures to its signatured_type entry.
- This is NULL if the .debug_types section hasn't been read in yet. */
- htab_t signatured_types {};
-
- /* Type unit statistics, to see how well the scaling improvements
- are doing. */
- struct tu_stats tu_stats {};
-
- /* A chain of compilation units that are currently read in, so that
- they can be freed later. */
- dwarf2_per_cu_data *read_in_chain = NULL;
-
- /* A table mapping DW_AT_dwo_name values to struct dwo_file objects.
- This is NULL if the table hasn't been allocated yet. */
- htab_t dwo_files {};
-
- /* True if we've checked for whether there is a DWP file. */
- bool dwp_checked = false;
-
- /* The DWP file if there is one, or NULL. */
- struct dwp_file *dwp_file = NULL;
-
- /* The shared '.dwz' file, if one exists. This is used when the
- original data was compressed using 'dwz -m'. */
- struct dwz_file *dwz_file = NULL;
-
- /* A flag indicating whether this objfile has a section loaded at a
- VMA of 0. */
- bool has_section_at_zero = false;
-
- /* True if we are using the mapped index,
- or we are faking it for OBJF_READNOW's sake. */
- bool using_index = false;
-
- /* The mapped index, or NULL if .gdb_index is missing or not being used. */
- mapped_index *index_table = NULL;
-
- /* When using index_table, this keeps track of all quick_file_names entries.
- TUs typically share line table entries with a CU, so we maintain a
- separate table of all line table entries to support the sharing.
- Note that while there can be way more TUs than CUs, we've already
- sorted all the TUs into "type unit groups", grouped by their
- DW_AT_stmt_list value. Therefore the only sharing done here is with a
- CU and its associated TU group if there is one. */
- htab_t quick_file_names_table {};
-
- /* Set during partial symbol reading, to prevent queueing of full
- symbols. */
- bool reading_partial_symbols = false;
-
- /* Table mapping type DIEs to their struct type *.
- This is NULL if not allocated yet.
- The mapping is done via (CU/TU + DIE offset) -> type. */
- htab_t die_type_hash {};
-
- /* The CUs we recently read. */
- VEC (dwarf2_per_cu_ptr) *just_read_cus = NULL;
-
- /* Table containing line_header indexed by offset and offset_in_dwz. */
- htab_t line_header_hash {};
-
- /* Table containing all filenames. This is an optional because the
- table is lazily constructed on first access. */
- gdb::optional<filename_seen_cache> filenames_cache;
+ std::unordered_map<ULONGEST, index_val> abbrev_map;
+
+ const char *namei_to_name (uint32_t namei) const;
+
+ /* Implementation of the mapped_index_base virtual interface, for
+ the name_components cache. */
+
+ const char *symbol_name_at (offset_type idx) const override
+ { return namei_to_name (idx); }
+
+ size_t symbol_name_count () const override
+ { return this->name_count; }
};
-static struct dwarf2_per_objfile *dwarf2_per_objfile;
+/* See dwarf2read.h. */
+
+dwarf2_per_objfile *
+get_dwarf2_per_objfile (struct objfile *objfile)
+{
+ return ((struct dwarf2_per_objfile *)
+ objfile_data (objfile, dwarf2_objfile_data_key));
+}
+
+/* Set the dwarf2_per_objfile associated to OBJFILE. */
+
+void
+set_dwarf2_per_objfile (struct objfile *objfile,
+ struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ gdb_assert (get_dwarf2_per_objfile (objfile) == NULL);
+ set_objfile_data (objfile, dwarf2_objfile_data_key, dwarf2_per_objfile);
+}
/* Default names of the debugging sections. */
{ ".debug_frame", ".zdebug_frame" },
{ ".eh_frame", NULL },
{ ".gdb_index", ".zgdb_index" },
+ { ".debug_names", ".zdebug_names" },
+ { ".debug_aranges", ".zdebug_aranges" },
23
};
struct die_info *die;
};
-typedef struct delayed_method_info delayed_method_info;
-DEF_VEC_O (delayed_method_info);
-
/* Internal state when decoding a particular compilation unit. */
struct dwarf2_cu
{
- /* The objfile containing this compilation unit. */
- struct objfile *objfile;
+ explicit dwarf2_cu (struct dwarf2_per_cu_data *per_cu);
+ ~dwarf2_cu ();
+
+ DISABLE_COPY_AND_ASSIGN (dwarf2_cu);
/* The header of the compilation unit. */
- struct comp_unit_head header;
+ struct comp_unit_head header {};
/* Base address of this compilation unit. */
- CORE_ADDR base_address;
+ CORE_ADDR base_address = 0;
/* Non-zero if base_address has been set. */
- int base_known;
+ int base_known = 0;
/* The language we are debugging. */
- enum language language;
- const struct language_defn *language_defn;
+ enum language language = language_unknown;
+ const struct language_defn *language_defn = nullptr;
- const char *producer;
+ const char *producer = nullptr;
/* The generic symbol table building routines have separate lists for
file scope symbols and all all other scopes (local scopes). So
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;
-
- /* The abbrev table for this CU.
- Normally this points to the abbrev table in the objfile.
- But if DWO_UNIT is non-NULL this is the abbrev table in the DWO file. */
- struct abbrev_table *abbrev_table;
+ struct pending **list_in_scope = nullptr;
/* Hash table holding all the loaded partial DIEs
with partial_die->offset.SECT_OFF as hash. */
- htab_t partial_dies;
+ htab_t partial_dies = nullptr;
/* Storage for things with the same lifetime as this read-in compilation
unit, including partial DIEs. */
- struct obstack comp_unit_obstack;
+ auto_obstack comp_unit_obstack;
/* When multiple dwarf2_cu structures are living in memory, this field
chains them all together, so that they can be released efficiently.
We will probably also want a generation counter so that most-recently-used
compilation units are cached... */
- struct dwarf2_per_cu_data *read_in_chain;
+ struct dwarf2_per_cu_data *read_in_chain = nullptr;
/* Backlink to our per_cu entry. */
struct dwarf2_per_cu_data *per_cu;
/* How many compilation units ago was this CU last referenced? */
- int last_used;
+ int last_used = 0;
/* A hash table of DIE cu_offset for following references with
die_info->offset.sect_off as hash. */
- htab_t die_hash;
+ htab_t die_hash = nullptr;
/* Full DIEs if read in. */
- struct die_info *dies;
+ struct die_info *dies = nullptr;
/* A set of pointers to dwarf2_per_cu_data objects for compilation
units referenced by this one. Only set during full symbol processing;
partial symbol tables do not have dependencies. */
- htab_t dependencies;
+ htab_t dependencies = nullptr;
/* Header data from the line table, during full symbol processing. */
- struct line_header *line_header;
+ struct line_header *line_header = nullptr;
/* Non-NULL if LINE_HEADER is owned by this DWARF_CU. Otherwise,
it's owned by dwarf2_per_objfile::line_header_hash. If non-NULL,
this is the DW_TAG_compile_unit die for this CU. We'll hold on
to the line header as long as this DIE is being processed. See
process_die_scope. */
- die_info *line_header_die_owner;
+ die_info *line_header_die_owner = nullptr;
/* A list of methods which need to have physnames computed
after all type information has been read. */
- VEC (delayed_method_info) *method_list;
+ std::vector<delayed_method_info> method_list;
/* To be copied to symtab->call_site_htab. */
- htab_t call_site_htab;
+ htab_t call_site_htab = nullptr;
/* Non-NULL if this CU came from a DWO file.
There is an invariant here that is important to remember:
is moot), or there is and either we're not going to read it (in which
case this is NULL) or there is and we are reading it (in which case this
is non-NULL). */
- struct dwo_unit *dwo_unit;
+ struct dwo_unit *dwo_unit = nullptr;
/* The DW_AT_addr_base attribute if present, zero otherwise
(zero is a valid value though).
Note this value comes from the Fission stub CU/TU's DIE. */
- ULONGEST addr_base;
+ ULONGEST addr_base = 0;
/* The DW_AT_ranges_base attribute if present, zero otherwise
(zero is a valid value though).
DW_AT_ranges appeared in the DW_TAG_compile_unit of DWO DIEs: then
DW_AT_ranges_base *would* have to be applied, and we'd have to care
whether the DW_AT_ranges attribute came from the skeleton or DWO. */
- ULONGEST ranges_base;
+ ULONGEST ranges_base = 0;
+
+ /* When reading debug info generated by older versions of rustc, we
+ have to rewrite some union types to be struct types with a
+ variant part. This rewriting must be done after the CU is fully
+ read in, because otherwise at the point of rewriting some struct
+ type might not have been fully processed. So, we keep a list of
+ all such types here and process them after expansion. */
+ std::vector<struct type *> rust_unions;
/* Mark used when releasing cached dies. */
unsigned int mark : 1;
this information, but later versions do. */
unsigned int processing_has_namespace_info : 1;
-};
-
-/* Persistent data held for a compilation unit, even when not
- processing it. We put a pointer to this structure in the
- read_symtab_private field of the psymtab. */
-
-struct dwarf2_per_cu_data
-{
- /* The start offset and length of this compilation unit.
- NOTE: Unlike comp_unit_head.length, this length includes
- initial_length_size.
- If the DIE refers to a DWO file, this is always of the original die,
- not the DWO file. */
- sect_offset sect_off;
- unsigned int length;
-
- /* DWARF standard version this data has been read from (such as 4 or 5). */
- short dwarf_version;
-
- /* Flag indicating this compilation unit will be read in before
- any of the current compilation units are processed. */
- unsigned int queued : 1;
-
- /* This flag will be set when reading partial DIEs if we need to load
- absolutely all DIEs for this compilation unit, instead of just the ones
- we think are interesting. It gets set if we look for a DIE in the
- hash table and don't find it. */
- unsigned int load_all_dies : 1;
-
- /* Non-zero if this CU is from .debug_types.
- Struct dwarf2_per_cu_data is contained in struct signatured_type iff
- this is non-zero. */
- unsigned int is_debug_types : 1;
-
- /* Non-zero if this CU is from the .dwz file. */
- unsigned int is_dwz : 1;
-
- /* Non-zero if reading a TU directly from a DWO file, bypassing the stub.
- This flag is only valid if is_debug_types is true.
- We can't read a CU directly from a DWO file: There are required
- attributes in the stub. */
- unsigned int reading_dwo_directly : 1;
-
- /* Non-zero if the TU has been read.
- This is used to assist the "Stay in DWO Optimization" for Fission:
- When reading a DWO, it's faster to read TUs from the DWO instead of
- fetching them from random other DWOs (due to comdat folding).
- If the TU has already been read, the optimization is unnecessary
- (and unwise - we don't want to change where gdb thinks the TU lives
- "midflight").
- This flag is only valid if is_debug_types is true. */
- unsigned int tu_read : 1;
-
- /* The section this CU/TU lives in.
- If the DIE refers to a DWO file, this is always the original die,
- not the DWO file. */
- struct dwarf2_section_info *section;
-
- /* Set to non-NULL iff this CU is currently loaded. When it gets freed out
- of the CU cache it gets reset to NULL again. This is left as NULL for
- dummy CUs (a CU header, but nothing else). */
- struct dwarf2_cu *cu;
-
- /* The corresponding objfile.
- Normally we can get the objfile from dwarf2_per_objfile.
- However we can enter this file with just a "per_cu" handle. */
- struct objfile *objfile;
-
- /* When dwarf2_per_objfile->using_index is true, the 'quick' field
- is active. Otherwise, the 'psymtab' field is active. */
- union
- {
- /* The partial symbol table associated with this compilation unit,
- or NULL for unread partial units. */
- struct partial_symtab *psymtab;
-
- /* Data needed by the "quick" functions. */
- struct dwarf2_per_cu_quick_data *quick;
- } v;
-
- /* The CUs we import using DW_TAG_imported_unit. This is filled in
- while reading psymtabs, used to compute the psymtab dependencies,
- and then cleared. Then it is filled in again while reading full
- symbols, and only deleted when the objfile is destroyed.
-
- This is also used to work around a difference between the way gold
- generates .gdb_index version <=7 and the way gdb does. Arguably this
- is a gold bug. For symbols coming from TUs, gold records in the index
- the CU that includes the TU instead of the TU itself. This breaks
- dw2_lookup_symbol: It assumes that if the index says symbol X lives
- in CU/TU Y, then one need only expand Y and a subsequent lookup in Y
- will find X. Alas TUs live in their own symtab, so after expanding CU Y
- we need to look in TU Z to find X. Fortunately, this is akin to
- DW_TAG_imported_unit, so we just use the same mechanism: For
- .gdb_index version <=7 this also records the TUs that the CU referred
- to. Concurrently with this change gdb was modified to emit version 8
- indices so we only pay a price for gold generated indices.
- http://sourceware.org/bugzilla/show_bug.cgi?id=15021. */
- VEC (dwarf2_per_cu_ptr) *imported_symtabs;
-};
-
-/* Entry in the signatured_types hash table. */
-
-struct signatured_type
-{
- /* The "per_cu" object of this type.
- This struct is used iff per_cu.is_debug_types.
- N.B.: This is the first member so that it's easy to convert pointers
- between them. */
- struct dwarf2_per_cu_data per_cu;
- /* The type's signature. */
- ULONGEST signature;
-
- /* Offset in the TU of the type's DIE, as read from the TU header.
- If this TU is a DWO stub and the definition lives in a DWO file
- (specified by DW_AT_GNU_dwo_name), this value is unusable. */
- cu_offset type_offset_in_tu;
-
- /* Offset in the section of the type's DIE.
- If the definition lives in a DWO file, this is the offset in the
- .debug_types.dwo section.
- The value is zero until the actual value is known.
- Zero is otherwise not a valid section offset. */
- sect_offset type_offset_in_section;
-
- /* Type units are grouped by their DW_AT_stmt_list entry so that they
- can share them. This points to the containing symtab. */
- struct type_unit_group *type_unit_group;
-
- /* The type.
- The first time we encounter this type we fully read it in and install it
- in the symbol tables. Subsequent times we only need the type. */
- struct type *type;
-
- /* Containing DWO unit.
- This field is valid iff per_cu.reading_dwo_directly. */
- struct dwo_unit *dwo_unit;
+ struct partial_die_info *find_partial_die (sect_offset sect_off);
};
-typedef struct signatured_type *sig_type_ptr;
-DEF_VEC_P (sig_type_ptr);
-
/* A struct that can be used as a hash key for tables based on DW_AT_stmt_list.
This includes type_unit_group and quick_file_names. */
struct dwp_file
{
+ dwp_file (const char *name_, gdb_bfd_ref_ptr &&abfd)
+ : name (name_),
+ dbfd (std::move (abfd))
+ {
+ }
+
/* Name of the file. */
const char *name;
/* File format version. */
- int version;
+ int version = 0;
/* The bfd. */
- bfd *dbfd;
+ gdb_bfd_ref_ptr dbfd;
/* Section info for this file. */
- struct dwp_sections sections;
+ struct dwp_sections sections {};
/* Table of CUs in the file. */
- const struct dwp_hash_table *cus;
+ const struct dwp_hash_table *cus = nullptr;
/* Table of TUs in the file. */
- const struct dwp_hash_table *tus;
+ const struct dwp_hash_table *tus = nullptr;
/* Tables of loaded CUs/TUs. Each entry is a struct dwo_unit *. */
- htab_t loaded_cus;
- htab_t loaded_tus;
+ htab_t loaded_cus {};
+ htab_t loaded_tus {};
/* Table to map ELF section numbers to their sections.
This is only needed for the DWP V1 file format. */
- unsigned int num_sections;
- asection **elf_sections;
+ unsigned int num_sections = 0;
+ asection **elf_sections = nullptr;
};
/* This represents a '.dwz' file. */
struct dwz_file
{
+ dwz_file (gdb_bfd_ref_ptr &&bfd)
+ : dwz_bfd (std::move (bfd))
+ {
+ }
+
/* A dwz file can only contain a few sections. */
- struct dwarf2_section_info abbrev;
- struct dwarf2_section_info info;
- struct dwarf2_section_info str;
- struct dwarf2_section_info line;
- struct dwarf2_section_info macro;
- struct dwarf2_section_info gdb_index;
+ struct dwarf2_section_info abbrev {};
+ struct dwarf2_section_info info {};
+ struct dwarf2_section_info str {};
+ struct dwarf2_section_info line {};
+ struct dwarf2_section_info macro {};
+ struct dwarf2_section_info gdb_index {};
+ struct dwarf2_section_info debug_names {};
/* The dwz's BFD. */
- bfd *dwz_bfd;
+ gdb_bfd_ref_ptr dwz_bfd;
};
/* Struct used to pass misc. parameters to read_die_and_children, et
/* The value of the DW_AT_comp_dir attribute. */
const char *comp_dir;
+
+ /* The abbreviation table to use when reading the DIEs. */
+ struct abbrev_table *abbrev_table;
};
/* Type of function passed to init_cutu_and_read_dies, et.al. */
/* When we construct a partial symbol table entry we only
need this much information. */
-struct partial_die_info
+struct partial_die_info : public allocate_on_obstack
{
+ partial_die_info (sect_offset sect_off, struct abbrev_info *abbrev);
+
+ /* Disable assign but still keep copy ctor, which is needed
+ load_partial_dies. */
+ partial_die_info& operator=(const partial_die_info& rhs) = delete;
+
+ /* Adjust the partial die before generating a symbol for it. This
+ function may set the is_external flag or change the DIE's
+ name. */
+ void fixup (struct dwarf2_cu *cu);
+
+ /* Read a minimal amount of information into the minimal die
+ structure. */
+ const gdb_byte *read (const struct die_reader_specs *reader,
+ const struct abbrev_info &abbrev,
+ const gdb_byte *info_ptr);
+
/* Offset of this DIE. */
- sect_offset sect_off;
+ const sect_offset sect_off;
/* DWARF-2 tag for this DIE. */
- ENUM_BITFIELD(dwarf_tag) tag : 16;
+ const ENUM_BITFIELD(dwarf_tag) tag : 16;
/* Assorted flags describing the data found in this DIE. */
- unsigned int has_children : 1;
+ const unsigned int has_children : 1;
+
unsigned int is_external : 1;
unsigned int is_declaration : 1;
unsigned int has_type : 1;
/* Flag set if any of the DIE's children are template arguments. */
unsigned int has_template_arguments : 1;
- /* Flag set if fixup_partial_die has been called on this die. */
+ /* Flag set if fixup has been called on this die. */
unsigned int fixup_called : 1;
/* Flag set if DW_TAG_imported_unit uses DW_FORM_GNU_ref_alt. */
/* The name of this DIE. Normally the value of DW_AT_name, but
sometimes a default name for unnamed DIEs. */
- const char *name;
+ const char *name = nullptr;
/* The linkage name, if present. */
- const char *linkage_name;
+ const char *linkage_name = nullptr;
/* 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. */
- const char *scope;
+ const char *scope = nullptr;
/* Some data associated with the partial DIE. The tag determines
which field is live. */
struct dwarf_block *locdesc;
/* The offset of an import, for DW_TAG_imported_unit. */
sect_offset sect_off;
- } d;
+ } d {};
/* If HAS_PC_INFO, the PC range associated with this DIE. */
- CORE_ADDR lowpc;
- CORE_ADDR highpc;
+ CORE_ADDR lowpc = 0;
+ CORE_ADDR highpc = 0;
/* Pointer into the info_buffer (or types_buffer) pointing at the target of
DW_AT_sibling, if any. */
- /* NOTE: This member isn't strictly necessary, read_partial_die could
- return DW_AT_sibling values to its caller load_partial_dies. */
- const gdb_byte *sibling;
+ /* NOTE: This member isn't strictly necessary, partial_die_info::read
+ could return DW_AT_sibling values to its caller load_partial_dies. */
+ const gdb_byte *sibling = nullptr;
/* If HAS_SPECIFICATION, the offset of the DIE referred to by
DW_AT_specification (or DW_AT_abstract_origin or
DW_AT_extension). */
- sect_offset spec_offset;
+ sect_offset spec_offset {};
/* Pointers to this DIE's parent, first child, and next sibling,
if any. */
- struct partial_die_info *die_parent, *die_child, *die_sibling;
+ struct partial_die_info *die_parent = nullptr;
+ struct partial_die_info *die_child = nullptr;
+ struct partial_die_info *die_sibling = nullptr;
+
+ friend struct partial_die_info *
+ dwarf2_cu::find_partial_die (sect_offset sect_off);
+
+ private:
+ /* Only need to do look up in dwarf2_cu::find_partial_die. */
+ partial_die_info (sect_offset sect_off)
+ : partial_die_info (sect_off, DW_TAG_padding, 0)
+ {
+ }
+
+ partial_die_info (sect_offset sect_off_, enum dwarf_tag tag_,
+ int has_children_)
+ : sect_off (sect_off_), tag (tag_), has_children (has_children_)
+ {
+ is_external = 0;
+ is_declaration = 0;
+ has_type = 0;
+ has_specification = 0;
+ has_pc_info = 0;
+ may_be_inlined = 0;
+ main_subprogram = 0;
+ scope_set = 0;
+ has_byte_size = 0;
+ has_const_value = 0;
+ has_template_arguments = 0;
+ fixup_called = 0;
+ is_dwz = 0;
+ spec_is_dwz = 0;
+ }
};
/* This data structure holds the information of an abbrev. */
struct abbrev_table
{
+ explicit abbrev_table (sect_offset off)
+ : sect_off (off)
+ {
+ m_abbrevs =
+ XOBNEWVEC (&abbrev_obstack, struct abbrev_info *, ABBREV_HASH_SIZE);
+ memset (m_abbrevs, 0, ABBREV_HASH_SIZE * sizeof (struct abbrev_info *));
+ }
+
+ DISABLE_COPY_AND_ASSIGN (abbrev_table);
+
+ /* Allocate space for a struct abbrev_info object in
+ ABBREV_TABLE. */
+ struct abbrev_info *alloc_abbrev ();
+
+ /* Add an abbreviation to the table. */
+ void add_abbrev (unsigned int abbrev_number, struct abbrev_info *abbrev);
+
+ /* Look up an abbrev in the table.
+ Returns NULL if the abbrev is not found. */
+
+ struct abbrev_info *lookup_abbrev (unsigned int abbrev_number);
+
+
/* Where the abbrev table came from.
This is used as a sanity check when the table is used. */
- sect_offset sect_off;
+ const sect_offset sect_off;
/* Storage for the abbrev table. */
- struct obstack abbrev_obstack;
+ auto_obstack abbrev_obstack;
+
+private:
/* Hash table of abbrevs.
This is an array of size ABBREV_HASH_SIZE allocated in abbrev_obstack.
It could be statically allocated, but the previous code didn't so we
don't either. */
- struct abbrev_info **abbrevs;
+ struct abbrev_info **m_abbrevs;
};
+typedef std::unique_ptr<struct abbrev_table> abbrev_table_up;
+
/* Attributes have a name and a value. */
struct attribute
{
and friends. */
static int bits_per_byte = 8;
-struct nextfield
-{
- struct nextfield *next;
- int accessibility;
- int virtuality;
- struct field field;
-};
+/* When reading a variant or variant part, we track a bit more
+ information about the field, and store it in an object of this
+ type. */
-struct nextfnfield
-{
- struct nextfnfield *next;
- struct fn_field fnfield;
+struct variant_field
+{
+ /* If we see a DW_TAG_variant, then this will be the discriminant
+ value. */
+ ULONGEST discriminant_value;
+ /* If we see a DW_TAG_variant, then this will be set if this is the
+ default branch. */
+ bool default_branch;
+ /* While reading a DW_TAG_variant_part, this will be set if this
+ field is the discriminant. */
+ bool is_discriminant;
};
-struct fnfieldlist
+struct nextfield
{
- const char *name;
- int length;
- struct nextfnfield *head;
+ int accessibility = 0;
+ int virtuality = 0;
+ /* Extra information to describe a variant or variant part. */
+ struct variant_field variant {};
+ struct field field {};
};
-struct decl_field_list
+struct fnfieldlist
{
- struct decl_field field;
- struct decl_field_list *next;
+ const char *name = nullptr;
+ std::vector<struct fn_field> fnfields;
};
/* The routines that read and process dies for a C struct or C++ class
struct field_info
{
/* List of data member and baseclasses fields. */
- struct nextfield *fields, *baseclasses;
+ std::vector<struct nextfield> fields;
+ std::vector<struct nextfield> baseclasses;
/* Number of fields (including baseclasses). */
- int nfields;
-
- /* Number of baseclasses. */
- int nbaseclasses;
+ int nfields = 0;
/* Set if the accesibility of one of the fields is not public. */
- int non_public_fields;
+ int non_public_fields = 0;
/* 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 *fnfieldlists;
-
- /* Number of entries in the fnfieldlists array. */
- int nfnfields;
+ std::vector<struct fnfieldlist> fnfieldlists;
/* typedefs defined inside this class. TYPEDEF_FIELD_LIST contains head of
a NULL terminated list of TYPEDEF_FIELD_LIST_COUNT elements. */
- struct decl_field_list *typedef_field_list;
- unsigned typedef_field_list_count;
+ std::vector<struct decl_field> typedef_field_list;
/* Nested types defined by this class and the number of elements in this
list. */
- struct decl_field_list *nested_types_list;
- unsigned nested_types_list_count;
+ std::vector<struct decl_field> nested_types_list;
};
/* One item on the queue of compilation units to read in full symbols
struct die_info *type_unit_die,
int has_children, void *data);
-static void dwarf2_build_psymtabs_hard (struct objfile *);
+static void dwarf2_build_psymtabs_hard
+ (struct dwarf2_per_objfile *dwarf2_per_objfile);
static void scan_partial_symbols (struct partial_die_info *,
CORE_ADDR *, CORE_ADDR *,
static void psymtab_to_symtab_1 (struct partial_symtab *);
-static struct abbrev_info *abbrev_table_lookup_abbrev
- (const struct abbrev_table *, unsigned int);
-
-static struct abbrev_table *abbrev_table_read_table
- (struct dwarf2_section_info *, sect_offset);
-
-static void abbrev_table_free (struct abbrev_table *);
-
-static void abbrev_table_free_cleanup (void *);
-
-static void dwarf2_read_abbrevs (struct dwarf2_cu *,
- struct dwarf2_section_info *);
-
-static void dwarf2_free_abbrev_table (void *);
+static abbrev_table_up abbrev_table_read_table
+ (struct dwarf2_per_objfile *dwarf2_per_objfile, struct dwarf2_section_info *,
+ sect_offset);
static unsigned int peek_abbrev_code (bfd *, const gdb_byte *);
static struct partial_die_info *load_partial_dies
(const struct die_reader_specs *, const gdb_byte *, int);
-static const gdb_byte *read_partial_die (const struct die_reader_specs *,
- struct partial_die_info *,
- struct abbrev_info *,
- unsigned int,
- const gdb_byte *);
-
static struct partial_die_info *find_partial_die (sect_offset, int,
struct dwarf2_cu *);
-static void fixup_partial_die (struct partial_die_info *,
- struct dwarf2_cu *);
-
static const gdb_byte *read_attribute (const struct die_reader_specs *,
struct attribute *, struct attr_abbrev *,
const gdb_byte *);
static LONGEST read_offset_1 (bfd *, const gdb_byte *, unsigned int);
-static sect_offset read_abbrev_offset (struct dwarf2_section_info *,
- sect_offset);
+static sect_offset read_abbrev_offset
+ (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *, sect_offset);
static const gdb_byte *read_n_bytes (bfd *, const gdb_byte *, unsigned int);
static const char *read_direct_string (bfd *, const gdb_byte *, unsigned int *);
-static const char *read_indirect_string (bfd *, const gdb_byte *,
- const struct comp_unit_head *,
- unsigned int *);
+static const char *read_indirect_string
+ (struct dwarf2_per_objfile *dwarf2_per_objfile, bfd *, const gdb_byte *,
+ const struct comp_unit_head *, unsigned int *);
-static const char *read_indirect_line_string (bfd *, const gdb_byte *,
- const struct comp_unit_head *,
- unsigned int *);
+static const char *read_indirect_line_string
+ (struct dwarf2_per_objfile *dwarf2_per_objfile, bfd *, const gdb_byte *,
+ const struct comp_unit_head *, unsigned int *);
+
+static const char *read_indirect_string_at_offset
+ (struct dwarf2_per_objfile *dwarf2_per_objfile, bfd *abfd,
+ LONGEST str_offset);
-static const char *read_indirect_string_from_dwz (struct dwz_file *, LONGEST);
+static const char *read_indirect_string_from_dwz
+ (struct objfile *objfile, struct dwz_file *, LONGEST);
static LONGEST read_signed_leb128 (bfd *, const gdb_byte *, unsigned int *);
CORE_ADDR);
static struct symbol *new_symbol (struct die_info *, struct type *,
- struct dwarf2_cu *);
-
-static struct symbol *new_symbol_full (struct die_info *, struct type *,
- struct dwarf2_cu *, struct symbol *);
+ struct dwarf2_cu *, struct symbol * = NULL);
static void dwarf2_const_value (const struct attribute *, struct symbol *,
struct dwarf2_cu *);
const gdb_byte *info_ptr,
struct abbrev_info *abbrev);
-static void free_stack_comp_unit (void *);
-
static hashval_t partial_die_hash (const void *item);
static int partial_die_eq (const void *item_lhs, const void *item_rhs);
static struct dwarf2_per_cu_data *dwarf2_find_containing_comp_unit
- (sect_offset sect_off, unsigned int offset_in_dwz, struct objfile *objfile);
-
-static void init_one_comp_unit (struct dwarf2_cu *cu,
- struct dwarf2_per_cu_data *per_cu);
+ (sect_offset sect_off, unsigned int offset_in_dwz,
+ struct dwarf2_per_objfile *dwarf2_per_objfile);
static void prepare_one_comp_unit (struct dwarf2_cu *cu,
struct die_info *comp_unit_die,
enum language pretend_language);
-static void free_heap_comp_unit (void *);
-
-static void free_cached_comp_units (void *);
-
-static void age_cached_comp_units (void);
+static void age_cached_comp_units (struct dwarf2_per_objfile *dwarf2_per_objfile);
static void free_one_cached_comp_unit (struct dwarf2_per_cu_data *);
static struct type *set_die_type (struct die_info *, struct type *,
struct dwarf2_cu *);
-static void create_all_comp_units (struct objfile *);
+static void create_all_comp_units (struct dwarf2_per_objfile *dwarf2_per_objfile);
-static int create_all_type_units (struct objfile *);
+static int create_all_type_units (struct dwarf2_per_objfile *dwarf2_per_objfile);
-static void load_full_comp_unit (struct dwarf2_per_cu_data *,
+static void load_full_comp_unit (struct dwarf2_per_cu_data *, bool,
enum language);
static void process_full_comp_unit (struct dwarf2_per_cu_data *,
static struct type *get_die_type (struct die_info *die, struct dwarf2_cu *cu);
-static void dwarf2_release_queue (void *dummy);
-
static void queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
enum language pretend_language);
-static void process_queue (void);
+static void process_queue (struct dwarf2_per_objfile *dwarf2_per_objfile);
+
+/* Class, the destructor of which frees all allocated queue entries. This
+ will only have work to do if an error was thrown while processing the
+ dwarf. If no error was thrown then the queue entries should have all
+ been processed, and freed, as we went along. */
+
+class dwarf2_queue_guard
+{
+public:
+ dwarf2_queue_guard () = default;
+
+ /* Free any entries remaining on the queue. There should only be
+ entries left if we hit an error while processing the dwarf. */
+ ~dwarf2_queue_guard ()
+ {
+ struct dwarf2_queue_item *item, *last;
+
+ item = dwarf2_queue;
+ while (item)
+ {
+ /* Anything still marked queued is likely to be in an
+ inconsistent state, so discard it. */
+ if (item->per_cu->queued)
+ {
+ if (item->per_cu->cu != NULL)
+ free_one_cached_comp_unit (item->per_cu);
+ item->per_cu->queued = 0;
+ }
+
+ last = item;
+ item = item->next;
+ xfree (last);
+ }
+
+ dwarf2_queue = dwarf2_queue_tail = NULL;
+ }
+};
/* The return type of find_file_and_directory. Note, the enclosed
string pointers are only valid while this object is valid. */
enum class rcuh_kind { COMPILE, TYPE };
static const gdb_byte *read_and_check_comp_unit_head
- (struct comp_unit_head *header,
+ (struct dwarf2_per_objfile* dwarf2_per_objfile,
+ struct comp_unit_head *header,
struct dwarf2_section_info *section,
struct dwarf2_section_info *abbrev_section, const gdb_byte *info_ptr,
rcuh_kind section_kind);
static void init_cutu_and_read_dies
(struct dwarf2_per_cu_data *this_cu, struct abbrev_table *abbrev_table,
- int use_existing_cu, int keep,
+ int use_existing_cu, int keep, bool skip_partial,
die_reader_func_ftype *die_reader_func, void *data);
static void init_cutu_and_read_dies_simple
static htab_t allocate_dwo_unit_table (struct objfile *objfile);
static struct dwo_unit *lookup_dwo_unit_in_dwp
- (struct dwp_file *dwp_file, const char *comp_dir,
+ (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwp_file *dwp_file, const char *comp_dir,
ULONGEST signature, int is_debug_types);
-static struct dwp_file *get_dwp_file (void);
+static struct dwp_file *get_dwp_file
+ (struct dwarf2_per_objfile *dwarf2_per_objfile);
static struct dwo_unit *lookup_dwo_comp_unit
(struct dwarf2_per_cu_data *, const char *, const char *, ULONGEST);
static void queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *);
-static void free_dwo_file_cleanup (void *);
+static void free_dwo_file (struct dwo_file *);
+
+/* A unique_ptr helper to free a dwo_file. */
+
+struct dwo_file_deleter
+{
+ void operator() (struct dwo_file *df) const
+ {
+ free_dwo_file (df);
+ }
+};
+
+/* A unique pointer to a dwo_file. */
+
+typedef std::unique_ptr<struct dwo_file, dwo_file_deleter> dwo_file_up;
-static void process_cu_includes (void);
+static void process_cu_includes (struct dwarf2_per_objfile *dwarf2_per_objfile);
static void check_producer (struct dwarf2_cu *cu);
static void
dwarf2_statement_list_fits_in_line_number_section_complaint (void)
{
- complaint (&symfile_complaints,
- _("statement list doesn't fit in .debug_line section"));
+ complaint (_("statement list doesn't fit in .debug_line section"));
}
static void
dwarf2_debug_line_missing_file_complaint (void)
{
- complaint (&symfile_complaints,
- _(".debug_line section has line data without a file"));
+ complaint (_(".debug_line section has line data without a file"));
}
static void
dwarf2_debug_line_missing_end_sequence_complaint (void)
{
- complaint (&symfile_complaints,
- _(".debug_line section has line "
+ complaint (_(".debug_line section has line "
"program sequence without an end"));
}
static void
dwarf2_complex_location_expr_complaint (void)
{
- complaint (&symfile_complaints, _("location expression too complex"));
+ complaint (_("location expression too complex"));
}
static void
dwarf2_const_value_length_mismatch_complaint (const char *arg1, int arg2,
int arg3)
{
- complaint (&symfile_complaints,
- _("const value length mismatch for '%s', got %d, expected %d"),
+ complaint (_("const value length mismatch for '%s', got %d, expected %d"),
arg1, arg2, arg3);
}
static void
dwarf2_section_buffer_overflow_complaint (struct dwarf2_section_info *section)
{
- complaint (&symfile_complaints,
- _("debug info runs off end of %s section"
+ complaint (_("debug info runs off end of %s section"
" [in module %s]"),
get_section_name (section),
get_section_file_name (section));
static void
dwarf2_macro_malformed_definition_complaint (const char *arg1)
{
- complaint (&symfile_complaints,
- _("macro debug info contains a "
+ complaint (_("macro debug info contains a "
"malformed macro definition:\n`%s'"),
arg1);
}
static void
dwarf2_invalid_attrib_class_complaint (const char *arg1, const char *arg2)
{
- complaint (&symfile_complaints,
- _("invalid attribute class or form for '%s' in '%s'"),
+ complaint (_("invalid attribute class or form for '%s' in '%s'"),
arg1, arg2);
}
return addr;
}
-/* The suffix for an index file. */
-#define INDEX4_SUFFIX ".gdb-index"
-#define INDEX5_SUFFIX ".debug_names"
-#define DEBUG_STR_SUFFIX ".debug_str"
-
/* See declaration. */
dwarf2_per_objfile::dwarf2_per_objfile (struct objfile *objfile_,
locate_sections (obfd, sec, *names);
}
+static void free_dwo_files (htab_t dwo_files, struct objfile *objfile);
+
dwarf2_per_objfile::~dwarf2_per_objfile ()
{
/* Cached DIE trees use xmalloc and the comp_unit_obstack. */
if (line_header_hash)
htab_delete (line_header_hash);
+ for (dwarf2_per_cu_data *per_cu : all_comp_units)
+ VEC_free (dwarf2_per_cu_ptr, per_cu->imported_symtabs);
+
+ for (signatured_type *sig_type : all_type_units)
+ VEC_free (dwarf2_per_cu_ptr, sig_type->per_cu.imported_symtabs);
+
+ VEC_free (dwarf2_section_info_def, types);
+
+ if (dwo_files != NULL)
+ free_dwo_files (dwo_files, objfile);
+
/* Everything else should be on the objfile obstack. */
}
{
dwarf2_per_cu_data *next_cu = per_cu->cu->read_in_chain;
- free_heap_comp_unit (per_cu->cu);
+ delete per_cu->cu;
*last_chain = next_cu;
per_cu = next_cu;
}
}
+/* A helper class that calls free_cached_comp_units on
+ destruction. */
+
+class free_cached_comp_units
+{
+public:
+
+ explicit free_cached_comp_units (dwarf2_per_objfile *per_objfile)
+ : m_per_objfile (per_objfile)
+ {
+ }
+
+ ~free_cached_comp_units ()
+ {
+ m_per_objfile->free_cached_comp_units ();
+ }
+
+ DISABLE_COPY_AND_ASSIGN (free_cached_comp_units);
+
+private:
+
+ dwarf2_per_objfile *m_per_objfile;
+};
+
/* Try to locate the sections we need for DWARF 2 debugging
information and return true if we have enough to do something.
NAMES points to the dwarf2 section names, or is NULL if the standard
if (objfile->flags & OBJF_READNEVER)
return 0;
- dwarf2_per_objfile = ((struct dwarf2_per_objfile *)
- objfile_data (objfile, dwarf2_objfile_data_key));
- if (!dwarf2_per_objfile)
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
+
+ if (dwarf2_per_objfile == NULL)
{
/* Initialize per-objfile state. */
- struct dwarf2_per_objfile *data
- = XOBNEW (&objfile->objfile_obstack, struct dwarf2_per_objfile);
-
- dwarf2_per_objfile = new (data) struct dwarf2_per_objfile (objfile, names);
- set_objfile_data (objfile, dwarf2_objfile_data_key, dwarf2_per_objfile);
+ dwarf2_per_objfile
+ = new (&objfile->objfile_obstack) struct dwarf2_per_objfile (objfile,
+ names);
+ set_dwarf2_per_objfile (objfile, dwarf2_per_objfile);
}
return (!dwarf2_per_objfile->info.is_virtual
&& dwarf2_per_objfile->info.s.section != NULL
this->gdb_index.s.section = sectp;
this->gdb_index.size = bfd_get_section_size (sectp);
}
+ else if (section_is_p (sectp->name, &names.debug_names))
+ {
+ this->debug_names.s.section = sectp;
+ this->debug_names.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names.debug_aranges))
+ {
+ this->debug_aranges.s.section = sectp;
+ this->debug_aranges.size = bfd_get_section_size (sectp);
+ }
if ((bfd_get_section_flags (abfd, sectp) & (SEC_LOAD | SEC_ALLOC))
&& bfd_section_vma (abfd, sectp) == 0)
return section->s.section == NULL || section->size == 0;
}
-/* Read the contents of the section INFO.
- OBJFILE is the main object file, but not necessarily the file where
- the section comes from. E.g., for DWO files the bfd of INFO is the bfd
- of the DWO file.
- If the section is compressed, uncompress it before returning. */
+/* See dwarf2read.h. */
-static void
-dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+void
+dwarf2_read_section (struct objfile *objfile, dwarf2_section_info *info)
{
asection *sectp;
bfd *abfd;
dwz_file->gdb_index.s.section = sectp;
dwz_file->gdb_index.size = bfd_get_section_size (sectp);
}
+ else if (section_is_p (sectp->name, &dwarf2_elf_names.debug_names))
+ {
+ dwz_file->debug_names.s.section = sectp;
+ dwz_file->debug_names.size = bfd_get_section_size (sectp);
+ }
}
/* Open the separate '.dwz' debug file, if needed. Return NULL if
is such a section but the file cannot be found. */
static struct dwz_file *
-dwarf2_get_dwz_file (void)
+dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
const char *filename;
- struct dwz_file *result;
bfd_size_type buildid_len_arg;
size_t buildid_len;
bfd_byte *buildid;
if (dwarf2_per_objfile->dwz_file != NULL)
- return dwarf2_per_objfile->dwz_file;
+ return dwarf2_per_objfile->dwz_file.get ();
bfd_set_error (bfd_error_no_error);
gdb::unique_xmalloc_ptr<char> data
error (_("could not find '.gnu_debugaltlink' file for %s"),
objfile_name (dwarf2_per_objfile->objfile));
- result = OBSTACK_ZALLOC (&dwarf2_per_objfile->objfile->objfile_obstack,
- struct dwz_file);
- result->dwz_bfd = dwz_bfd.release ();
+ std::unique_ptr<struct dwz_file> result
+ (new struct dwz_file (std::move (dwz_bfd)));
- bfd_map_over_sections (result->dwz_bfd, locate_dwz_sections, result);
+ bfd_map_over_sections (result->dwz_bfd.get (), locate_dwz_sections,
+ result.get ());
- gdb_bfd_record_inclusion (dwarf2_per_objfile->objfile->obfd, result->dwz_bfd);
- dwarf2_per_objfile->dwz_file = result;
- return result;
+ gdb_bfd_record_inclusion (dwarf2_per_objfile->objfile->obfd,
+ result->dwz_bfd.get ());
+ dwarf2_per_objfile->dwz_file = std::move (result);
+ return dwarf2_per_objfile->dwz_file.get ();
}
\f
/* DWARF quick_symbols_functions support. */
processing PER_CU->CU. dw2_setup must have been already called. */
static void
-load_cu (struct dwarf2_per_cu_data *per_cu)
+load_cu (struct dwarf2_per_cu_data *per_cu, bool skip_partial)
{
if (per_cu->is_debug_types)
load_full_type_unit (per_cu);
else
- load_full_comp_unit (per_cu, language_minimal);
+ load_full_comp_unit (per_cu, skip_partial, language_minimal);
if (per_cu->cu == NULL)
return; /* Dummy CU. */
/* Read in the symbols for PER_CU. */
static void
-dw2_do_instantiate_symtab (struct dwarf2_per_cu_data *per_cu)
+dw2_do_instantiate_symtab (struct dwarf2_per_cu_data *per_cu, bool skip_partial)
{
- struct cleanup *back_to;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
/* Skip type_unit_groups, reading the type units they contain
is handled elsewhere. */
if (IS_TYPE_UNIT_GROUP (per_cu))
return;
- back_to = make_cleanup (dwarf2_release_queue, NULL);
+ /* The destructor of dwarf2_queue_guard frees any entries left on
+ the queue. After this point we're guaranteed to leave this function
+ with the dwarf queue empty. */
+ dwarf2_queue_guard q_guard;
if (dwarf2_per_objfile->using_index
? per_cu->v.quick->compunit_symtab == NULL
: (per_cu->v.psymtab == NULL || !per_cu->v.psymtab->readin))
{
queue_comp_unit (per_cu, language_minimal);
- load_cu (per_cu);
+ load_cu (per_cu, skip_partial);
/* If we just loaded a CU from a DWO, and we're working with an index
that may badly handle TUs, load all the TUs in that DWO as well.
&& dwarf2_per_objfile->index_table != NULL
&& dwarf2_per_objfile->index_table->version <= 7
/* DWP files aren't supported yet. */
- && get_dwp_file () == NULL)
+ && get_dwp_file (dwarf2_per_objfile) == NULL)
queue_and_load_all_dwo_tus (per_cu);
}
- process_queue ();
+ process_queue (dwarf2_per_objfile);
/* Age the cache, releasing compilation units that have not
been used recently. */
- age_cached_comp_units ();
-
- do_cleanups (back_to);
+ age_cached_comp_units (dwarf2_per_objfile);
}
/* Ensure that the symbols for PER_CU have been read in. OBJFILE is
table. */
static struct compunit_symtab *
-dw2_instantiate_symtab (struct dwarf2_per_cu_data *per_cu)
+dw2_instantiate_symtab (struct dwarf2_per_cu_data *per_cu, bool skip_partial)
{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
+
gdb_assert (dwarf2_per_objfile->using_index);
if (!per_cu->v.quick->compunit_symtab)
{
- struct cleanup *back_to = make_cleanup (free_cached_comp_units, NULL);
+ free_cached_comp_units freer (dwarf2_per_objfile);
scoped_restore decrementer = increment_reading_symtab ();
- dw2_do_instantiate_symtab (per_cu);
- process_cu_includes ();
- do_cleanups (back_to);
+ dw2_do_instantiate_symtab (per_cu, skip_partial);
+ process_cu_includes (dwarf2_per_objfile);
}
return per_cu->v.quick->compunit_symtab;
}
-/* Return the CU/TU given its index.
-
- This is intended for loops like:
-
- for (i = 0; i < (dwarf2_per_objfile->n_comp_units
- + dwarf2_per_objfile->n_type_units); ++i)
- {
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
-
- ...;
- }
-*/
+/* See declaration. */
-static struct dwarf2_per_cu_data *
-dw2_get_cutu (int index)
+dwarf2_per_cu_data *
+dwarf2_per_objfile::get_cutu (int index)
{
- if (index >= dwarf2_per_objfile->n_comp_units)
+ if (index >= this->all_comp_units.size ())
{
- index -= dwarf2_per_objfile->n_comp_units;
- gdb_assert (index < dwarf2_per_objfile->n_type_units);
- return &dwarf2_per_objfile->all_type_units[index]->per_cu;
+ index -= this->all_comp_units.size ();
+ gdb_assert (index < this->all_type_units.size ());
+ return &this->all_type_units[index]->per_cu;
}
- return dwarf2_per_objfile->all_comp_units[index];
+ return this->all_comp_units[index];
}
-/* Return the CU given its index.
- This differs from dw2_get_cutu in that it's for when you know INDEX
- refers to a CU. */
+/* See declaration. */
-static struct dwarf2_per_cu_data *
-dw2_get_cu (int index)
+dwarf2_per_cu_data *
+dwarf2_per_objfile::get_cu (int index)
+{
+ gdb_assert (index >= 0 && index < this->all_comp_units.size ());
+
+ return this->all_comp_units[index];
+}
+
+/* See declaration. */
+
+signatured_type *
+dwarf2_per_objfile::get_tu (int index)
{
- gdb_assert (index >= 0 && index < dwarf2_per_objfile->n_comp_units);
+ gdb_assert (index >= 0 && index < this->all_type_units.size ());
- return dwarf2_per_objfile->all_comp_units[index];
+ return this->all_type_units[index];
+}
+
+/* Return a new dwarf2_per_cu_data allocated on OBJFILE's
+ objfile_obstack, and constructed with the specified field
+ values. */
+
+static dwarf2_per_cu_data *
+create_cu_from_index_list (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ int is_dwz,
+ sect_offset sect_off, ULONGEST length)
+{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ dwarf2_per_cu_data *the_cu
+ = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_data);
+ the_cu->sect_off = sect_off;
+ the_cu->length = length;
+ the_cu->dwarf2_per_objfile = dwarf2_per_objfile;
+ the_cu->section = section;
+ the_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_quick_data);
+ the_cu->is_dwz = is_dwz;
+ return the_cu;
}
/* A helper for create_cus_from_index that handles a given list of
CUs. */
static void
-create_cus_from_index_list (struct objfile *objfile,
+create_cus_from_index_list (struct dwarf2_per_objfile *dwarf2_per_objfile,
const gdb_byte *cu_list, offset_type n_elements,
struct dwarf2_section_info *section,
- int is_dwz,
- int base_offset)
+ int is_dwz)
{
- offset_type i;
-
- for (i = 0; i < n_elements; i += 2)
+ for (offset_type i = 0; i < n_elements; i += 2)
{
gdb_static_assert (sizeof (ULONGEST) >= 8);
ULONGEST length = extract_unsigned_integer (cu_list + 8, 8, BFD_ENDIAN_LITTLE);
cu_list += 2 * 8;
- dwarf2_per_cu_data *the_cu
- = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_data);
- the_cu->sect_off = sect_off;
- the_cu->length = length;
- the_cu->objfile = objfile;
- the_cu->section = section;
- the_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_quick_data);
- the_cu->is_dwz = is_dwz;
- dwarf2_per_objfile->all_comp_units[base_offset + i / 2] = the_cu;
+ dwarf2_per_cu_data *per_cu
+ = create_cu_from_index_list (dwarf2_per_objfile, section, is_dwz,
+ sect_off, length);
+ dwarf2_per_objfile->all_comp_units.push_back (per_cu);
}
}
the CU objects for this objfile. */
static void
-create_cus_from_index (struct objfile *objfile,
+create_cus_from_index (struct dwarf2_per_objfile *dwarf2_per_objfile,
const gdb_byte *cu_list, offset_type cu_list_elements,
const gdb_byte *dwz_list, offset_type dwz_elements)
{
- struct dwz_file *dwz;
+ gdb_assert (dwarf2_per_objfile->all_comp_units.empty ());
+ dwarf2_per_objfile->all_comp_units.reserve
+ ((cu_list_elements + dwz_elements) / 2);
- dwarf2_per_objfile->n_comp_units = (cu_list_elements + dwz_elements) / 2;
- dwarf2_per_objfile->all_comp_units =
- XOBNEWVEC (&objfile->objfile_obstack, struct dwarf2_per_cu_data *,
- dwarf2_per_objfile->n_comp_units);
-
- create_cus_from_index_list (objfile, cu_list, cu_list_elements,
- &dwarf2_per_objfile->info, 0, 0);
+ create_cus_from_index_list (dwarf2_per_objfile, cu_list, cu_list_elements,
+ &dwarf2_per_objfile->info, 0);
if (dwz_elements == 0)
return;
- dwz = dwarf2_get_dwz_file ();
- create_cus_from_index_list (objfile, dwz_list, dwz_elements, &dwz->info, 1,
- cu_list_elements / 2);
+ dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+ create_cus_from_index_list (dwarf2_per_objfile, dwz_list, dwz_elements,
+ &dwz->info, 1);
}
/* Create the signatured type hash table from the index. */
static void
-create_signatured_type_table_from_index (struct objfile *objfile,
- struct dwarf2_section_info *section,
- const gdb_byte *bytes,
- offset_type elements)
+create_signatured_type_table_from_index
+ (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ const gdb_byte *bytes,
+ offset_type elements)
{
- offset_type i;
- htab_t sig_types_hash;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- dwarf2_per_objfile->n_type_units
- = dwarf2_per_objfile->n_allocated_type_units
- = elements / 3;
- dwarf2_per_objfile->all_type_units =
- XNEWVEC (struct signatured_type *, dwarf2_per_objfile->n_type_units);
+ gdb_assert (dwarf2_per_objfile->all_type_units.empty ());
+ dwarf2_per_objfile->all_type_units.reserve (elements / 3);
- sig_types_hash = allocate_signatured_type_table (objfile);
+ htab_t sig_types_hash = allocate_signatured_type_table (objfile);
- for (i = 0; i < elements; i += 3)
+ for (offset_type i = 0; i < elements; i += 3)
{
struct signatured_type *sig_type;
ULONGEST signature;
sig_type->per_cu.is_debug_types = 1;
sig_type->per_cu.section = section;
sig_type->per_cu.sect_off = sect_off;
- sig_type->per_cu.objfile = objfile;
+ sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
+ sig_type->per_cu.v.quick
+ = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_quick_data);
+
+ slot = htab_find_slot (sig_types_hash, sig_type, INSERT);
+ *slot = sig_type;
+
+ dwarf2_per_objfile->all_type_units.push_back (sig_type);
+ }
+
+ dwarf2_per_objfile->signatured_types = sig_types_hash;
+}
+
+/* Create the signatured type hash table from .debug_names. */
+
+static void
+create_signatured_type_table_from_debug_names
+ (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const mapped_debug_names &map,
+ struct dwarf2_section_info *section,
+ struct dwarf2_section_info *abbrev_section)
+{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+
+ dwarf2_read_section (objfile, section);
+ dwarf2_read_section (objfile, abbrev_section);
+
+ gdb_assert (dwarf2_per_objfile->all_type_units.empty ());
+ dwarf2_per_objfile->all_type_units.reserve (map.tu_count);
+
+ htab_t sig_types_hash = allocate_signatured_type_table (objfile);
+
+ for (uint32_t i = 0; i < map.tu_count; ++i)
+ {
+ struct signatured_type *sig_type;
+ void **slot;
+
+ sect_offset sect_off
+ = (sect_offset) (extract_unsigned_integer
+ (map.tu_table_reordered + i * map.offset_size,
+ map.offset_size,
+ map.dwarf5_byte_order));
+
+ comp_unit_head cu_header;
+ read_and_check_comp_unit_head (dwarf2_per_objfile, &cu_header, section,
+ abbrev_section,
+ section->buffer + to_underlying (sect_off),
+ rcuh_kind::TYPE);
+
+ sig_type = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct signatured_type);
+ sig_type->signature = cu_header.signature;
+ sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
+ sig_type->per_cu.is_debug_types = 1;
+ sig_type->per_cu.section = section;
+ sig_type->per_cu.sect_off = sect_off;
+ sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
sig_type->per_cu.v.quick
= OBSTACK_ZALLOC (&objfile->objfile_obstack,
struct dwarf2_per_cu_quick_data);
slot = htab_find_slot (sig_types_hash, sig_type, INSERT);
*slot = sig_type;
- dwarf2_per_objfile->all_type_units[i / 3] = sig_type;
+ dwarf2_per_objfile->all_type_units.push_back (sig_type);
}
dwarf2_per_objfile->signatured_types = sig_types_hash;
populate the objfile's psymtabs_addrmap. */
static void
-create_addrmap_from_index (struct objfile *objfile, struct mapped_index *index)
+create_addrmap_from_index (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct mapped_index *index)
{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
struct gdbarch *gdbarch = get_objfile_arch (objfile);
const gdb_byte *iter, *end;
struct addrmap *mutable_map;
mutable_map = addrmap_create_mutable (&temp_obstack);
- iter = index->address_table;
- end = iter + index->address_table_size;
+ iter = index->address_table.data ();
+ end = iter + index->address_table.size ();
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
if (lo > hi)
{
- complaint (&symfile_complaints,
- _(".gdb_index address table has invalid range (%s - %s)"),
+ complaint (_(".gdb_index address table has invalid range (%s - %s)"),
hex_string (lo), hex_string (hi));
continue;
}
- if (cu_index >= dwarf2_per_objfile->n_comp_units)
+ if (cu_index >= dwarf2_per_objfile->all_comp_units.size ())
{
- complaint (&symfile_complaints,
- _(".gdb_index address table has invalid CU number %u"),
+ complaint (_(".gdb_index address table has invalid CU number %u"),
(unsigned) cu_index);
continue;
}
lo = gdbarch_adjust_dwarf2_addr (gdbarch, lo + baseaddr);
hi = gdbarch_adjust_dwarf2_addr (gdbarch, hi + baseaddr);
- addrmap_set_empty (mutable_map, lo, hi - 1, dw2_get_cutu (cu_index));
+ addrmap_set_empty (mutable_map, lo, hi - 1,
+ dwarf2_per_objfile->get_cu (cu_index));
}
objfile->psymtabs_addrmap = addrmap_create_fixed (mutable_map,
&objfile->objfile_obstack);
}
-/* The hash function for strings in the mapped index. This is the same as
- SYMBOL_HASH_NEXT, but we keep a separate copy to maintain control over the
- implementation. This is necessary because the hash function is tied to the
- format of the mapped index file. The hash values do not have to match with
- SYMBOL_HASH_NEXT.
-
- Use INT_MAX for INDEX_VERSION if you generate the current index format. */
+/* Read the address map data from DWARF-5 .debug_aranges, and use it to
+ populate the objfile's psymtabs_addrmap. */
-static hashval_t
-mapped_index_string_hash (int index_version, const void *p)
+static void
+create_addrmap_from_aranges (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section)
{
- const unsigned char *str = (const unsigned char *) p;
- hashval_t r = 0;
- unsigned char c;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *abfd = objfile->obfd;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ const CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
+ SECT_OFF_TEXT (objfile));
+
+ auto_obstack temp_obstack;
+ addrmap *mutable_map = addrmap_create_mutable (&temp_obstack);
+
+ std::unordered_map<sect_offset,
+ dwarf2_per_cu_data *,
+ gdb::hash_enum<sect_offset>>
+ debug_info_offset_to_per_cu;
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
+ {
+ const auto insertpair
+ = debug_info_offset_to_per_cu.emplace (per_cu->sect_off, per_cu);
+ if (!insertpair.second)
+ {
+ warning (_("Section .debug_aranges in %s has duplicate "
+ "debug_info_offset %s, ignoring .debug_aranges."),
+ objfile_name (objfile), sect_offset_str (per_cu->sect_off));
+ return;
+ }
+ }
+
+ dwarf2_read_section (objfile, section);
+
+ const bfd_endian dwarf5_byte_order = gdbarch_byte_order (gdbarch);
- while ((c = *str++) != 0)
+ const gdb_byte *addr = section->buffer;
+
+ while (addr < section->buffer + section->size)
{
- if (index_version >= 5)
- c = tolower (c);
- r = r * 67 + c - 113;
+ const gdb_byte *const entry_addr = addr;
+ unsigned int bytes_read;
+
+ const LONGEST entry_length = read_initial_length (abfd, addr,
+ &bytes_read);
+ addr += bytes_read;
+
+ const gdb_byte *const entry_end = addr + entry_length;
+ const bool dwarf5_is_dwarf64 = bytes_read != 4;
+ const uint8_t offset_size = dwarf5_is_dwarf64 ? 8 : 4;
+ if (addr + entry_length > section->buffer + section->size)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "length %s exceeds section length %s, "
+ "ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer,
+ plongest (bytes_read + entry_length),
+ pulongest (section->size));
+ return;
+ }
+
+ /* The version number. */
+ const uint16_t version = read_2_bytes (abfd, addr);
+ addr += 2;
+ if (version != 2)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "has unsupported version %d, ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer,
+ version);
+ return;
+ }
+
+ const uint64_t debug_info_offset
+ = extract_unsigned_integer (addr, offset_size, dwarf5_byte_order);
+ addr += offset_size;
+ const auto per_cu_it
+ = debug_info_offset_to_per_cu.find (sect_offset (debug_info_offset));
+ if (per_cu_it == debug_info_offset_to_per_cu.cend ())
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "debug_info_offset %s does not exists, "
+ "ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer,
+ pulongest (debug_info_offset));
+ return;
+ }
+ dwarf2_per_cu_data *const per_cu = per_cu_it->second;
+
+ const uint8_t address_size = *addr++;
+ if (address_size < 1 || address_size > 8)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "address_size %u is invalid, ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer,
+ address_size);
+ return;
+ }
+
+ const uint8_t segment_selector_size = *addr++;
+ if (segment_selector_size != 0)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "segment_selector_size %u is not supported, "
+ "ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer,
+ segment_selector_size);
+ return;
+ }
+
+ /* Must pad to an alignment boundary that is twice the address
+ size. It is undocumented by the DWARF standard but GCC does
+ use it. */
+ for (size_t padding = ((-(addr - section->buffer))
+ & (2 * address_size - 1));
+ padding > 0; padding--)
+ if (*addr++ != 0)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "padding is not zero, ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer);
+ return;
+ }
+
+ for (;;)
+ {
+ if (addr + 2 * address_size > entry_end)
+ {
+ warning (_("Section .debug_aranges in %s entry at offset %zu "
+ "address list is not properly terminated, "
+ "ignoring .debug_aranges."),
+ objfile_name (objfile), entry_addr - section->buffer);
+ return;
+ }
+ ULONGEST start = extract_unsigned_integer (addr, address_size,
+ dwarf5_byte_order);
+ addr += address_size;
+ ULONGEST length = extract_unsigned_integer (addr, address_size,
+ dwarf5_byte_order);
+ addr += address_size;
+ if (start == 0 && length == 0)
+ break;
+ if (start == 0 && !dwarf2_per_objfile->has_section_at_zero)
+ {
+ /* Symbol was eliminated due to a COMDAT group. */
+ continue;
+ }
+ ULONGEST end = start + length;
+ start = gdbarch_adjust_dwarf2_addr (gdbarch, start + baseaddr);
+ end = gdbarch_adjust_dwarf2_addr (gdbarch, end + baseaddr);
+ addrmap_set_empty (mutable_map, start, end - 1, per_cu);
+ }
}
- return r;
+ objfile->psymtabs_addrmap = addrmap_create_fixed (mutable_map,
+ &objfile->objfile_obstack);
}
/* Find a slot in the mapped index INDEX for the object named NAME.
? 5 : index->version),
name);
- slot = hash & (index->symbol_table_slots - 1);
- step = ((hash * 17) & (index->symbol_table_slots - 1)) | 1;
+ slot = hash & (index->symbol_table.size () - 1);
+ step = ((hash * 17) & (index->symbol_table.size () - 1)) | 1;
cmp = (case_sensitivity == case_sensitive_on ? strcmp : strcasecmp);
for (;;)
{
- /* Convert a slot number to an offset into the table. */
- offset_type i = 2 * slot;
const char *str;
- if (index->symbol_table[i] == 0 && index->symbol_table[i + 1] == 0)
+
+ const auto &bucket = index->symbol_table[slot];
+ if (bucket.name == 0 && bucket.vec == 0)
return false;
- str = index->constant_pool + MAYBE_SWAP (index->symbol_table[i]);
+ str = index->constant_pool + MAYBE_SWAP (bucket.name);
if (!cmp (name, str))
{
*vec_out = (offset_type *) (index->constant_pool
- + MAYBE_SWAP (index->symbol_table[i + 1]));
+ + MAYBE_SWAP (bucket.vec));
return true;
}
- slot = (slot + step) & (index->symbol_table_slots - 1);
+ slot = (slot + step) & (index->symbol_table.size () - 1);
}
}
/* A helper function that reads the .gdb_index from SECTION and fills
in MAP. FILENAME is the name of the file containing the section;
- it is used for error reporting. DEPRECATED_OK is nonzero if it is
+ it is used for error reporting. DEPRECATED_OK is true if it is
ok to use deprecated sections.
CU_LIST, CU_LIST_ELEMENTS, TYPES_LIST, and TYPES_LIST_ELEMENTS are
Returns 1 if all went well, 0 otherwise. */
-static int
+static bool
read_index_from_section (struct objfile *objfile,
const char *filename,
- int deprecated_ok,
+ bool deprecated_ok,
struct dwarf2_section_info *section,
struct mapped_index *map,
const gdb_byte **cu_list,
return 0;
map->version = version;
- map->total_size = section->size;
metadata = (offset_type *) (addr + sizeof (offset_type));
/ 8);
++i;
- map->address_table = addr + MAYBE_SWAP (metadata[i]);
- map->address_table_size = (MAYBE_SWAP (metadata[i + 1])
- - MAYBE_SWAP (metadata[i]));
+ const gdb_byte *address_table = addr + MAYBE_SWAP (metadata[i]);
+ const gdb_byte *address_table_end = addr + MAYBE_SWAP (metadata[i + 1]);
+ map->address_table
+ = gdb::array_view<const gdb_byte> (address_table, address_table_end);
++i;
- map->symbol_table = (offset_type *) (addr + MAYBE_SWAP (metadata[i]));
- map->symbol_table_slots = ((MAYBE_SWAP (metadata[i + 1])
- - MAYBE_SWAP (metadata[i]))
- / (2 * sizeof (offset_type)));
- ++i;
+ const gdb_byte *symbol_table = addr + MAYBE_SWAP (metadata[i]);
+ const gdb_byte *symbol_table_end = addr + MAYBE_SWAP (metadata[i + 1]);
+ map->symbol_table
+ = gdb::array_view<mapped_index::symbol_table_slot>
+ ((mapped_index::symbol_table_slot *) symbol_table,
+ (mapped_index::symbol_table_slot *) symbol_table_end);
+ ++i;
map->constant_pool = (char *) (addr + MAYBE_SWAP (metadata[i]));
return 1;
}
-
-/* Read the index file. If everything went ok, initialize the "quick"
+/* Read .gdb_index. If everything went ok, initialize the "quick"
elements of all the CUs and return 1. Otherwise, return 0. */
static int
-dwarf2_read_index (struct objfile *objfile)
+dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct mapped_index local_map, *map;
const gdb_byte *cu_list, *types_list, *dwz_list = NULL;
offset_type cu_list_elements, types_list_elements, dwz_list_elements = 0;
struct dwz_file *dwz;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ std::unique_ptr<struct mapped_index> map (new struct mapped_index);
if (!read_index_from_section (objfile, objfile_name (objfile),
use_deprecated_index_sections,
- &dwarf2_per_objfile->gdb_index, &local_map,
+ &dwarf2_per_objfile->gdb_index, map.get (),
&cu_list, &cu_list_elements,
&types_list, &types_list_elements))
return 0;
/* Don't use the index if it's empty. */
- if (local_map.symbol_table_slots == 0)
+ if (map->symbol_table.empty ())
return 0;
/* If there is a .dwz file, read it so we can get its CU list as
well. */
- dwz = dwarf2_get_dwz_file ();
+ dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
if (dwz != NULL)
{
struct mapped_index dwz_map;
}
}
- create_cus_from_index (objfile, cu_list, cu_list_elements, dwz_list,
- dwz_list_elements);
+ create_cus_from_index (dwarf2_per_objfile, cu_list, cu_list_elements,
+ dwz_list, dwz_list_elements);
if (types_list_elements)
{
section = VEC_index (dwarf2_section_info_def,
dwarf2_per_objfile->types, 0);
- create_signatured_type_table_from_index (objfile, section, types_list,
- types_list_elements);
+ create_signatured_type_table_from_index (dwarf2_per_objfile, section,
+ types_list, types_list_elements);
}
- create_addrmap_from_index (objfile, &local_map);
+ create_addrmap_from_index (dwarf2_per_objfile, map.get ());
- map = XOBNEW (&objfile->objfile_obstack, struct mapped_index);
- map = new (map) mapped_index ();
- *map = local_map;
-
- dwarf2_per_objfile->index_table = map;
+ dwarf2_per_objfile->index_table = std::move (map);
dwarf2_per_objfile->using_index = 1;
dwarf2_per_objfile->quick_file_names_table =
- create_quick_file_names_table (dwarf2_per_objfile->n_comp_units);
+ create_quick_file_names_table (dwarf2_per_objfile->all_comp_units.size ());
return 1;
}
-/* A helper for the "quick" functions which sets the global
- dwarf2_per_objfile according to OBJFILE. */
-
-static void
-dw2_setup (struct objfile *objfile)
-{
- dwarf2_per_objfile = ((struct dwarf2_per_objfile *)
- objfile_data (objfile, dwarf2_objfile_data_key));
- gdb_assert (dwarf2_per_objfile);
-}
-
/* die_reader_func for dw2_get_file_names. */
static void
void *data)
{
struct dwarf2_cu *cu = reader->cu;
- struct dwarf2_per_cu_data *this_cu = cu->per_cu;
+ struct dwarf2_per_cu_data *this_cu = cu->per_cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
struct objfile *objfile = dwarf2_per_objfile->objfile;
struct dwarf2_per_cu_data *lh_cu;
struct attribute *attr;
static struct symtab *
dw2_find_last_source_symtab (struct objfile *objfile)
{
- struct compunit_symtab *cust;
- int index;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
+ dwarf2_per_cu_data *dwarf_cu = dwarf2_per_objfile->all_comp_units.back ();
+ compunit_symtab *cust = dw2_instantiate_symtab (dwarf_cu, false);
- dw2_setup (objfile);
- index = dwarf2_per_objfile->n_comp_units - 1;
- cust = dw2_instantiate_symtab (dw2_get_cutu (index));
if (cust == NULL)
return NULL;
+
return compunit_primary_filetab (cust);
}
static void
dw2_forget_cached_source_info (struct objfile *objfile)
{
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
htab_traverse_noresize (dwarf2_per_objfile->quick_file_names_table,
dw2_free_cached_file_names, NULL);
/* This may expand more than one symtab, and we want to iterate over
all of them. */
- dw2_instantiate_symtab (per_cu);
+ dw2_instantiate_symtab (per_cu, false);
return iterate_over_some_symtabs (name, real_path, objfile->compunit_symtabs,
last_made, callback);
(struct objfile *objfile, const char *name, const char *real_path,
gdb::function_view<bool (symtab *)> callback)
{
- int i;
const char *name_basename = lbasename (name);
-
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
/* The rule is CUs specify all the files, including those used by
any TU, so there's no need to scan TUs here. */
- for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
{
- int j;
- struct dwarf2_per_cu_data *per_cu = dw2_get_cu (i);
- struct quick_file_names *file_data;
-
/* We only need to look at symtabs not already expanded. */
if (per_cu->v.quick->compunit_symtab)
continue;
- file_data = dw2_get_file_names (per_cu);
+ quick_file_names *file_data = dw2_get_file_names (per_cu);
if (file_data == NULL)
continue;
- for (j = 0; j < file_data->num_file_names; ++j)
+ for (int j = 0; j < file_data->num_file_names; ++j)
{
const char *this_name = file_data->file_names[j];
const char *this_real_name;
struct dw2_symtab_iterator
{
- /* The internalized form of .gdb_index. */
- struct mapped_index *index;
+ /* The dwarf2_per_objfile owning the CUs we are iterating on. */
+ struct dwarf2_per_objfile *dwarf2_per_objfile;
/* If non-zero, only look for symbols that match BLOCK_INDEX. */
int want_specific_block;
/* One of GLOBAL_BLOCK or STATIC_BLOCK.
static void
dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
- struct mapped_index *index,
+ struct dwarf2_per_objfile *dwarf2_per_objfile,
int want_specific_block,
int block_index,
domain_enum domain,
const char *name)
{
- iter->index = index;
+ iter->dwarf2_per_objfile = dwarf2_per_objfile;
iter->want_specific_block = want_specific_block;
iter->block_index = block_index;
iter->domain = domain;
iter->next = 0;
iter->global_seen = 0;
- if (find_slot_in_mapped_hash (index, name, &iter->vec))
+ mapped_index *index = dwarf2_per_objfile->index_table.get ();
+
+ /* index is NULL if OBJF_READNOW. */
+ if (index != NULL && find_slot_in_mapped_hash (index, name, &iter->vec))
iter->length = MAYBE_SWAP (*iter->vec);
else
{
static struct dwarf2_per_cu_data *
dw2_symtab_iter_next (struct dw2_symtab_iterator *iter)
{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = iter->dwarf2_per_objfile;
+
for ( ; iter->next < iter->length; ++iter->next)
{
offset_type cu_index_and_attrs =
MAYBE_SWAP (iter->vec[iter->next + 1]);
offset_type cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
- struct dwarf2_per_cu_data *per_cu;
int want_static = iter->block_index != GLOBAL_BLOCK;
/* This value is only valid for index versions >= 7. */
int is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
and indices >= 7 may elide them for certain symbols
(gold does this). */
int attrs_valid =
- (iter->index->version >= 7
+ (dwarf2_per_objfile->index_table->version >= 7
&& symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
/* Don't crash on bad data. */
- if (cu_index >= (dwarf2_per_objfile->n_comp_units
- + dwarf2_per_objfile->n_type_units))
+ if (cu_index >= (dwarf2_per_objfile->all_comp_units.size ()
+ + dwarf2_per_objfile->all_type_units.size ()))
{
- complaint (&symfile_complaints,
- _(".gdb_index entry has bad CU index"
+ complaint (_(".gdb_index entry has bad CU index"
" [in module %s]"),
objfile_name (dwarf2_per_objfile->objfile));
continue;
}
- per_cu = dw2_get_cutu (cu_index);
+ dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->get_cutu (cu_index);
/* Skip if already read in. */
if (per_cu->v.quick->compunit_symtab)
const char *name, domain_enum domain)
{
struct compunit_symtab *stab_best = NULL;
- struct mapped_index *index;
-
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
- index = dwarf2_per_objfile->index_table;
-
- /* index is NULL if OBJF_READNOW. */
- if (index)
- {
- struct dw2_symtab_iterator iter;
- struct dwarf2_per_cu_data *per_cu;
+ struct dw2_symtab_iterator iter;
+ struct dwarf2_per_cu_data *per_cu;
- dw2_symtab_iter_init (&iter, index, 1, block_index, domain, name);
+ dw2_symtab_iter_init (&iter, dwarf2_per_objfile, 1, block_index, domain, name);
- while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL)
- {
- struct symbol *sym, *with_opaque = NULL;
- struct compunit_symtab *stab = dw2_instantiate_symtab (per_cu);
- const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (stab);
- struct block *block = BLOCKVECTOR_BLOCK (bv, block_index);
+ while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL)
+ {
+ struct symbol *sym, *with_opaque = NULL;
+ struct compunit_symtab *stab = dw2_instantiate_symtab (per_cu, false);
+ const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (stab);
+ struct block *block = BLOCKVECTOR_BLOCK (bv, block_index);
- sym = block_find_symbol (block, name, domain,
- block_find_non_opaque_type_preferred,
- &with_opaque);
+ sym = block_find_symbol (block, name, domain,
+ block_find_non_opaque_type_preferred,
+ &with_opaque);
- /* Some caution must be observed with overloaded functions
- and methods, since the index will not contain any overload
- information (but NAME might contain it). */
+ /* Some caution must be observed with overloaded functions
+ and methods, since the index will not contain any overload
+ information (but NAME might contain it). */
- if (sym != NULL
- && SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name))
- return stab;
- if (with_opaque != NULL
- && SYMBOL_MATCHES_SEARCH_NAME (with_opaque, lookup_name))
- stab_best = stab;
+ if (sym != NULL
+ && SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name))
+ return stab;
+ if (with_opaque != NULL
+ && SYMBOL_MATCHES_SEARCH_NAME (with_opaque, lookup_name))
+ stab_best = stab;
- /* Keep looking through other CUs. */
- }
+ /* Keep looking through other CUs. */
}
return stab_best;
static void
dw2_print_stats (struct objfile *objfile)
{
- int i, total, count;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
+ int total = (dwarf2_per_objfile->all_comp_units.size ()
+ + dwarf2_per_objfile->all_type_units.size ());
+ int count = 0;
- dw2_setup (objfile);
- total = dwarf2_per_objfile->n_comp_units + dwarf2_per_objfile->n_type_units;
- count = 0;
- for (i = 0; i < total; ++i)
+ for (int i = 0; i < total; ++i)
{
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
+ dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->get_cutu (i);
if (!per_cu->v.quick->compunit_symtab)
++count;
static void
dw2_dump (struct objfile *objfile)
{
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
+
gdb_assert (dwarf2_per_objfile->using_index);
printf_filtered (".gdb_index:");
if (dwarf2_per_objfile->index_table != NULL)
dw2_expand_symtabs_for_function (struct objfile *objfile,
const char *func_name)
{
- struct mapped_index *index;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- dw2_setup (objfile);
-
- index = dwarf2_per_objfile->index_table;
+ struct dw2_symtab_iterator iter;
+ struct dwarf2_per_cu_data *per_cu;
- /* index is NULL if OBJF_READNOW. */
- if (index)
- {
- struct dw2_symtab_iterator iter;
- struct dwarf2_per_cu_data *per_cu;
+ /* Note: It doesn't matter what we pass for block_index here. */
+ dw2_symtab_iter_init (&iter, dwarf2_per_objfile, 0, GLOBAL_BLOCK, VAR_DOMAIN,
+ func_name);
- /* Note: It doesn't matter what we pass for block_index here. */
- dw2_symtab_iter_init (&iter, index, 0, GLOBAL_BLOCK, VAR_DOMAIN,
- func_name);
+ while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL)
+ dw2_instantiate_symtab (per_cu, false);
- while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL)
- dw2_instantiate_symtab (per_cu);
- }
}
static void
dw2_expand_all_symtabs (struct objfile *objfile)
{
- int i;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
+ int total_units = (dwarf2_per_objfile->all_comp_units.size ()
+ + dwarf2_per_objfile->all_type_units.size ());
- dw2_setup (objfile);
-
- for (i = 0; i < (dwarf2_per_objfile->n_comp_units
- + dwarf2_per_objfile->n_type_units); ++i)
+ for (int i = 0; i < total_units; ++i)
{
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
+ dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->get_cutu (i);
- dw2_instantiate_symtab (per_cu);
+ /* We don't want to directly expand a partial CU, because if we
+ read it with the wrong language, then assertion failures can
+ be triggered later on. See PR symtab/23010. So, tell
+ dw2_instantiate_symtab to skip partial CUs -- any important
+ partial CU will be read via DW_TAG_imported_unit anyway. */
+ dw2_instantiate_symtab (per_cu, true);
}
}
dw2_expand_symtabs_with_fullname (struct objfile *objfile,
const char *fullname)
{
- int i;
-
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
/* We don't need to consider type units here.
This is only called for examining code, e.g. expand_line_sal.
There can be an order of magnitude (or more) more type units
than comp units, and we avoid them if we can. */
- for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
{
- int j;
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
- struct quick_file_names *file_data;
-
/* We only need to look at symtabs not already expanded. */
if (per_cu->v.quick->compunit_symtab)
continue;
- file_data = dw2_get_file_names (per_cu);
+ quick_file_names *file_data = dw2_get_file_names (per_cu);
if (file_data == NULL)
continue;
- for (j = 0; j < file_data->num_file_names; ++j)
+ for (int j = 0; j < file_data->num_file_names; ++j)
{
const char *this_fullname = file_data->file_names[j];
if (filename_cmp (this_fullname, fullname) == 0)
{
- dw2_instantiate_symtab (per_cu);
+ dw2_instantiate_symtab (per_cu, false);
break;
}
}
for (int i = 0; i < nr_languages; i++)
{
const language_defn *lang = language_def ((enum language) i);
- if (lang->la_get_symbol_name_matcher != NULL)
- {
- symbol_name_matcher_ftype *name_matcher
- = lang->la_get_symbol_name_matcher (m_lookup_name);
+ symbol_name_matcher_ftype *name_matcher
+ = get_symbol_name_matcher (lang, m_lookup_name);
- /* Don't insert the same comparison routine more than once.
- Note that we do this linear walk instead of a cheaper
- sorted insert, or use a std::set or something like that,
- because relative order of function addresses is not
- stable. This is not a problem in practice because the
- number of supported languages is low, and the cost here
- is tiny compared to the number of searches we'll do
- afterwards using this object. */
- if (std::find (matchers.begin (), matchers.end (), name_matcher)
- == matchers.end ())
- matchers.push_back (name_matcher);
- }
+ /* Don't insert the same comparison routine more than once.
+ Note that we do this linear walk instead of a seemingly
+ cheaper sorted insert, or use a std::set or something like
+ that, because relative order of function addresses is not
+ stable. This is not a problem in practice because the number
+ of supported languages is low, and the cost here is tiny
+ compared to the number of searches we'll do afterwards using
+ this object. */
+ if (name_matcher != default_symbol_name_matcher
+ && (std::find (matchers.begin (), matchers.end (), name_matcher)
+ == matchers.end ()))
+ matchers.push_back (name_matcher);
}
}
std::pair<std::vector<name_component>::const_iterator,
std::vector<name_component>::const_iterator>
-mapped_index::find_name_components_bounds
+mapped_index_base::find_name_components_bounds
(const lookup_name_info &lookup_name_without_params) const
{
auto *name_cmp
/* See declaration. */
void
-mapped_index::build_name_components ()
+mapped_index_base::build_name_components ()
{
if (!this->name_components.empty ())
return;
D use '.'), then we'll need to try splitting the symbol name
according to that language too. Note that Ada does support wild
matching, but doesn't currently support .gdb_index. */
- for (size_t iter = 0; iter < this->symbol_table_slots; ++iter)
+ auto count = this->symbol_name_count ();
+ for (offset_type idx = 0; idx < count; idx++)
{
- offset_type idx = 2 * iter;
-
- if (this->symbol_table[idx] == 0
- && this->symbol_table[idx + 1] == 0)
+ if (this->symbol_name_slot_invalid (idx))
continue;
const char *name = this->symbol_name_at (idx);
}
/* Helper for dw2_expand_symtabs_matching that works with a
- mapped_index instead of the containing objfile. This is split to a
- separate function in order to be able to unit test the
- name_components matching using a mock mapped_index. For each
+ mapped_index_base instead of the containing objfile. This is split
+ to a separate function in order to be able to unit test the
+ name_components matching using a mock mapped_index_base. For each
symbol name that matches, calls MATCH_CALLBACK, passing it the
- symbol's index in the mapped_index symbol table. */
+ symbol's index in the mapped_index_base symbol table. */
static void
dw2_expand_symtabs_matching_symbol
- (mapped_index &index,
+ (mapped_index_base &index,
const lookup_name_info &lookup_name_in,
gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
enum search_domain kind,
namespace selftests { namespace dw2_expand_symtabs_matching {
-/* A wrapper around mapped_index that builds a mock mapped_index, from
- the symbol list passed as parameter to the constructor. */
-class mock_mapped_index
+/* A mock .gdb_index/.debug_names-like name index table, enough to
+ exercise dw2_expand_symtabs_matching_symbol, which works with the
+ mapped_index_base interface. Builds an index from the symbol list
+ passed as parameter to the constructor. */
+class mock_mapped_index : public mapped_index_base
{
public:
- template<size_t N>
- mock_mapped_index (const char *(&symbols)[N])
- : mock_mapped_index (symbols, N)
+ mock_mapped_index (gdb::array_view<const char *> symbols)
+ : m_symbol_table (symbols)
{}
- /* Access the built index. */
- mapped_index &index ()
- { return m_index; }
-
- /* Disable copy. */
- mock_mapped_index(const mock_mapped_index &) = delete;
- void operator= (const mock_mapped_index &) = delete;
+ DISABLE_COPY_AND_ASSIGN (mock_mapped_index);
-private:
- mock_mapped_index (const char **symbols, size_t symbols_size)
+ /* Return the number of names in the symbol table. */
+ size_t symbol_name_count () const override
{
- /* No string can live at offset zero. Add a dummy entry. */
- obstack_grow_str0 (&m_constant_pool, "");
-
- for (size_t i = 0; i < symbols_size; i++)
- {
- const char *sym = symbols[i];
- size_t offset = obstack_object_size (&m_constant_pool);
- obstack_grow_str0 (&m_constant_pool, sym);
- m_symbol_table.push_back (offset);
- m_symbol_table.push_back (0);
- };
-
- m_index.constant_pool = (const char *) obstack_base (&m_constant_pool);
- m_index.symbol_table = m_symbol_table.data ();
- m_index.symbol_table_slots = m_symbol_table.size () / 2;
+ return m_symbol_table.size ();
}
-public:
- /* The built mapped_index. */
- mapped_index m_index{};
+ /* Get the name of the symbol at IDX in the symbol table. */
+ const char *symbol_name_at (offset_type idx) const override
+ {
+ return m_symbol_table[idx];
+ }
- /* The storage that the built mapped_index uses for symbol and
- constant pool tables. */
- std::vector<offset_type> m_symbol_table;
- auto_obstack m_constant_pool;
+private:
+ gdb::array_view<const char *> m_symbol_table;
};
/* Convenience function that converts a NULL pointer to a "<null>"
auto expected_it = expected_list.begin ();
auto expected_end = expected_list.end ();
- dw2_expand_symtabs_matching_symbol (mock_index.index (), lookup_name,
+ dw2_expand_symtabs_matching_symbol (mock_index, lookup_name,
NULL, ALL_DOMAIN,
[&] (offset_type idx)
{
- const char *matched_name = mock_index.index ().symbol_name_at (idx);
+ const char *matched_name = mock_index.symbol_name_at (idx);
const char *expected_str
= expected_it == expected_end ? NULL : *expected_it++;
Z_SYM_NAME
};
-/* Returns true if the mapped_index::find_name_component_bounds method
- finds EXPECTED_SYMS in INDEX when looking for SEARCH_NAME, in
- completion mode. */
+/* Returns true if the mapped_index_base::find_name_component_bounds
+ method finds EXPECTED_SYMS in INDEX when looking for SEARCH_NAME,
+ in completion mode. */
static bool
-check_find_bounds_finds (mapped_index &index,
+check_find_bounds_finds (mapped_index_base &index,
const char *search_name,
gdb::array_view<const char *> expected_syms)
{
{
mock_mapped_index mock_index (test_symbols);
- mock_index.index ().build_name_components ();
+ mock_index.build_name_components ();
/* Test the lower-level mapped_index::find_name_component_bounds
method in completion mode. */
"t1_func1",
};
- SELF_CHECK (check_find_bounds_finds (mock_index.index (),
+ SELF_CHECK (check_find_bounds_finds (mock_index,
"t1_func", expected_syms));
}
"\377",
"\377\377123",
};
- SELF_CHECK (check_find_bounds_finds (mock_index.index (),
+ SELF_CHECK (check_find_bounds_finds (mock_index,
"\377", expected_syms1));
static const char *expected_syms2[] = {
"\377\377123",
};
- SELF_CHECK (check_find_bounds_finds (mock_index.index (),
+ SELF_CHECK (check_find_bounds_finds (mock_index,
"\377\377", expected_syms2));
}
}
#endif /* GDB_SELF_TEST */
+/* If FILE_MATCHER is NULL or if PER_CU has
+ dwarf2_per_cu_quick_data::MARK set (see
+ dw_expand_symtabs_matching_file_matcher), expand the CU and call
+ EXPANSION_NOTIFY on it. */
+
+static void
+dw2_expand_symtabs_matching_one
+ (struct dwarf2_per_cu_data *per_cu,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify)
+{
+ if (file_matcher == NULL || per_cu->v.quick->mark)
+ {
+ bool symtab_was_null
+ = (per_cu->v.quick->compunit_symtab == NULL);
+
+ dw2_instantiate_symtab (per_cu, false);
+
+ if (expansion_notify != NULL
+ && symtab_was_null
+ && per_cu->v.quick->compunit_symtab != NULL)
+ expansion_notify (per_cu->v.quick->compunit_symtab);
+ }
+}
+
/* Helper for dw2_expand_matching symtabs. Called on each symbol
matched, to expand corresponding CUs that were marked. IDX is the
index of the symbol name that matched. */
static void
dw2_expand_marked_cus
- (mapped_index &index, offset_type idx,
- struct objfile *objfile,
+ (struct dwarf2_per_objfile *dwarf2_per_objfile, offset_type idx,
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
search_domain kind)
{
offset_type *vec, vec_len, vec_idx;
bool global_seen = false;
+ mapped_index &index = *dwarf2_per_objfile->index_table;
vec = (offset_type *) (index.constant_pool
- + MAYBE_SWAP (index.symbol_table[idx + 1]));
+ + MAYBE_SWAP (index.symbol_table[idx].vec));
vec_len = MAYBE_SWAP (vec[0]);
for (vec_idx = 0; vec_idx < vec_len; ++vec_idx)
{
- struct dwarf2_per_cu_data *per_cu;
offset_type cu_index_and_attrs = MAYBE_SWAP (vec[vec_idx + 1]);
/* This value is only valid for index versions >= 7. */
int is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
}
/* Don't crash on bad data. */
- if (cu_index >= (dwarf2_per_objfile->n_comp_units
- + dwarf2_per_objfile->n_type_units))
+ if (cu_index >= (dwarf2_per_objfile->all_comp_units.size ()
+ + dwarf2_per_objfile->all_type_units.size ()))
{
- complaint (&symfile_complaints,
- _(".gdb_index entry has bad CU index"
- " [in module %s]"), objfile_name (objfile));
+ complaint (_(".gdb_index entry has bad CU index"
+ " [in module %s]"),
+ objfile_name (dwarf2_per_objfile->objfile));
+ continue;
+ }
+
+ dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->get_cutu (cu_index);
+ dw2_expand_symtabs_matching_one (per_cu, file_matcher,
+ expansion_notify);
+ }
+}
+
+/* If FILE_MATCHER is non-NULL, set all the
+ dwarf2_per_cu_quick_data::MARK of the current DWARF2_PER_OBJFILE
+ that match FILE_MATCHER. */
+
+static void
+dw_expand_symtabs_matching_file_matcher
+ (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher)
+{
+ if (file_matcher == NULL)
+ return;
+
+ objfile *const objfile = dwarf2_per_objfile->objfile;
+
+ htab_up visited_found (htab_create_alloc (10, htab_hash_pointer,
+ htab_eq_pointer,
+ NULL, xcalloc, xfree));
+ htab_up visited_not_found (htab_create_alloc (10, htab_hash_pointer,
+ htab_eq_pointer,
+ NULL, xcalloc, xfree));
+
+ /* The rule is CUs specify all the files, including those used by
+ any TU, so there's no need to scan TUs here. */
+
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
+ {
+ QUIT;
+
+ per_cu->v.quick->mark = 0;
+
+ /* We only need to look at symtabs not already expanded. */
+ if (per_cu->v.quick->compunit_symtab)
+ continue;
+
+ quick_file_names *file_data = dw2_get_file_names (per_cu);
+ if (file_data == NULL)
+ continue;
+
+ if (htab_find (visited_not_found.get (), file_data) != NULL)
+ continue;
+ else if (htab_find (visited_found.get (), file_data) != NULL)
+ {
+ per_cu->v.quick->mark = 1;
continue;
}
- per_cu = dw2_get_cutu (cu_index);
- if (file_matcher == NULL || per_cu->v.quick->mark)
+ for (int j = 0; j < file_data->num_file_names; ++j)
{
- int symtab_was_null =
- (per_cu->v.quick->compunit_symtab == NULL);
+ const char *this_real_name;
+
+ if (file_matcher (file_data->file_names[j], false))
+ {
+ per_cu->v.quick->mark = 1;
+ break;
+ }
- dw2_instantiate_symtab (per_cu);
+ /* Before we invoke realpath, which can get expensive when many
+ files are involved, do a quick comparison of the basenames. */
+ if (!basenames_may_differ
+ && !file_matcher (lbasename (file_data->file_names[j]),
+ true))
+ continue;
- if (expansion_notify != NULL
- && symtab_was_null
- && per_cu->v.quick->compunit_symtab != NULL)
- expansion_notify (per_cu->v.quick->compunit_symtab);
+ this_real_name = dw2_get_real_path (objfile, file_data, j);
+ if (file_matcher (this_real_name, false))
+ {
+ per_cu->v.quick->mark = 1;
+ break;
+ }
}
+
+ void **slot = htab_find_slot (per_cu->v.quick->mark
+ ? visited_found.get ()
+ : visited_not_found.get (),
+ file_data, INSERT);
+ *slot = file_data;
}
}
gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
enum search_domain kind)
{
- int i;
-
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
/* index_table is NULL if OBJF_READNOW. */
if (!dwarf2_per_objfile->index_table)
return;
- if (file_matcher != NULL)
- {
- htab_up visited_found (htab_create_alloc (10, htab_hash_pointer,
- htab_eq_pointer,
- NULL, xcalloc, xfree));
- htab_up visited_not_found (htab_create_alloc (10, htab_hash_pointer,
- htab_eq_pointer,
- NULL, xcalloc, xfree));
+ dw_expand_symtabs_matching_file_matcher (dwarf2_per_objfile, file_matcher);
- /* The rule is CUs specify all the files, including those used by
- any TU, so there's no need to scan TUs here. */
+ mapped_index &index = *dwarf2_per_objfile->index_table;
- for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
- {
- int j;
- struct dwarf2_per_cu_data *per_cu = dw2_get_cu (i);
- struct quick_file_names *file_data;
- void **slot;
+ dw2_expand_symtabs_matching_symbol (index, lookup_name,
+ symbol_matcher,
+ kind, [&] (offset_type idx)
+ {
+ dw2_expand_marked_cus (dwarf2_per_objfile, idx, file_matcher,
+ expansion_notify, kind);
+ });
+}
- QUIT;
+/* A helper for dw2_find_pc_sect_compunit_symtab which finds the most specific
+ symtab. */
- per_cu->v.quick->mark = 0;
-
- /* We only need to look at symtabs not already expanded. */
- if (per_cu->v.quick->compunit_symtab)
- continue;
-
- file_data = dw2_get_file_names (per_cu);
- if (file_data == NULL)
- continue;
-
- if (htab_find (visited_not_found.get (), file_data) != NULL)
- continue;
- else if (htab_find (visited_found.get (), file_data) != NULL)
- {
- per_cu->v.quick->mark = 1;
- continue;
- }
-
- for (j = 0; j < file_data->num_file_names; ++j)
- {
- const char *this_real_name;
-
- if (file_matcher (file_data->file_names[j], false))
- {
- per_cu->v.quick->mark = 1;
- break;
- }
-
- /* Before we invoke realpath, which can get expensive when many
- files are involved, do a quick comparison of the basenames. */
- if (!basenames_may_differ
- && !file_matcher (lbasename (file_data->file_names[j]),
- true))
- continue;
-
- this_real_name = dw2_get_real_path (objfile, file_data, j);
- if (file_matcher (this_real_name, false))
- {
- per_cu->v.quick->mark = 1;
- break;
- }
- }
-
- slot = htab_find_slot (per_cu->v.quick->mark
- ? visited_found.get ()
- : visited_not_found.get (),
- file_data, INSERT);
- *slot = file_data;
- }
- }
-
- mapped_index &index = *dwarf2_per_objfile->index_table;
-
- dw2_expand_symtabs_matching_symbol (index, lookup_name,
- symbol_matcher,
- kind, [&] (offset_type idx)
- {
- dw2_expand_marked_cus (index, idx, objfile, file_matcher,
- expansion_notify, kind);
- });
-}
-
-/* A helper for dw2_find_pc_sect_compunit_symtab which finds the most specific
- symtab. */
-
-static struct compunit_symtab *
-recursively_find_pc_sect_compunit_symtab (struct compunit_symtab *cust,
- CORE_ADDR pc)
-{
- int i;
+static struct compunit_symtab *
+recursively_find_pc_sect_compunit_symtab (struct compunit_symtab *cust,
+ CORE_ADDR pc)
+{
+ int i;
if (COMPUNIT_BLOCKVECTOR (cust) != NULL
&& blockvector_contains_pc (COMPUNIT_BLOCKVECTOR (cust), pc))
struct dwarf2_per_cu_data *data;
struct compunit_symtab *result;
- dw2_setup (objfile);
-
if (!objfile->psymtabs_addrmap)
return NULL;
paddress (get_objfile_arch (objfile), pc));
result
- = recursively_find_pc_sect_compunit_symtab (dw2_instantiate_symtab (data),
+ = recursively_find_pc_sect_compunit_symtab (dw2_instantiate_symtab (data,
+ false),
pc);
gdb_assert (result != NULL);
return result;
dw2_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun,
void *data, int need_fullname)
{
- dw2_setup (objfile);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
if (!dwarf2_per_objfile->filenames_cache)
{
by any TU, so there's no need to scan TUs here. We can
ignore file names coming from already-expanded CUs. */
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
{
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
-
if (per_cu->v.quick->compunit_symtab)
{
void **slot = htab_find_slot (visited.get (),
}
}
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
{
- struct dwarf2_per_cu_data *per_cu = dw2_get_cu (i);
- struct quick_file_names *file_data;
- void **slot;
-
/* We only need to look at symtabs not already expanded. */
if (per_cu->v.quick->compunit_symtab)
continue;
- file_data = dw2_get_file_names (per_cu);
+ quick_file_names *file_data = dw2_get_file_names (per_cu);
if (file_data == NULL)
continue;
- slot = htab_find_slot (visited.get (), file_data, INSERT);
+ void **slot = htab_find_slot (visited.get (), file_data, INSERT);
if (*slot)
{
/* Already visited. */
dw2_map_symbol_filenames
};
-/* Initialize for reading DWARF for this objfile. Return 0 if this
- file will use psymtabs, or 1 if using the GNU index. */
+/* DWARF-5 debug_names reader. */
-int
-dwarf2_initialize_objfile (struct objfile *objfile)
+/* DWARF-5 augmentation string for GDB's DW_IDX_GNU_* extension. */
+static const gdb_byte dwarf5_augmentation[] = { 'G', 'D', 'B', 0 };
+
+/* A helper function that reads the .debug_names section in SECTION
+ and fills in MAP. FILENAME is the name of the file containing the
+ section; it is used for error reporting.
+
+ Returns true if all went well, false otherwise. */
+
+static bool
+read_debug_names_from_section (struct objfile *objfile,
+ const char *filename,
+ struct dwarf2_section_info *section,
+ mapped_debug_names &map)
{
- /* If we're about to read full symbols, don't bother with the
- indices. In this case we also don't care if some other debug
- format is making psymtabs, because they are all about to be
- expanded anyway. */
- if ((objfile->flags & OBJF_READNOW))
- {
- int i;
+ if (dwarf2_section_empty_p (section))
+ return false;
- dwarf2_per_objfile->using_index = 1;
- create_all_comp_units (objfile);
- create_all_type_units (objfile);
- dwarf2_per_objfile->quick_file_names_table =
- create_quick_file_names_table (dwarf2_per_objfile->n_comp_units);
+ /* Older elfutils strip versions could keep the section in the main
+ executable while splitting it for the separate debug info file. */
+ if ((get_section_flags (section) & SEC_HAS_CONTENTS) == 0)
+ return false;
- for (i = 0; i < (dwarf2_per_objfile->n_comp_units
- + dwarf2_per_objfile->n_type_units); ++i)
- {
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
+ dwarf2_read_section (objfile, section);
- per_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_quick_data);
- }
+ map.dwarf5_byte_order = gdbarch_byte_order (get_objfile_arch (objfile));
- /* Return 1 so that gdb sees the "quick" functions. However,
- these functions will be no-ops because we will have expanded
- all symtabs. */
- return 1;
+ const gdb_byte *addr = section->buffer;
+
+ bfd *const abfd = get_section_bfd_owner (section);
+
+ unsigned int bytes_read;
+ LONGEST length = read_initial_length (abfd, addr, &bytes_read);
+ addr += bytes_read;
+
+ map.dwarf5_is_dwarf64 = bytes_read != 4;
+ map.offset_size = map.dwarf5_is_dwarf64 ? 8 : 4;
+ if (bytes_read + length != section->size)
+ {
+ /* There may be multiple per-CU indices. */
+ warning (_("Section .debug_names in %s length %s does not match "
+ "section length %s, ignoring .debug_names."),
+ filename, plongest (bytes_read + length),
+ pulongest (section->size));
+ return false;
}
- if (dwarf2_read_index (objfile))
- return 1;
+ /* The version number. */
+ uint16_t version = read_2_bytes (abfd, addr);
+ addr += 2;
+ if (version != 5)
+ {
+ warning (_("Section .debug_names in %s has unsupported version %d, "
+ "ignoring .debug_names."),
+ filename, version);
+ return false;
+ }
- return 0;
-}
+ /* Padding. */
+ uint16_t padding = read_2_bytes (abfd, addr);
+ addr += 2;
+ if (padding != 0)
+ {
+ warning (_("Section .debug_names in %s has unsupported padding %d, "
+ "ignoring .debug_names."),
+ filename, padding);
+ return false;
+ }
-\f
+ /* comp_unit_count - The number of CUs in the CU list. */
+ map.cu_count = read_4_bytes (abfd, addr);
+ addr += 4;
-/* Build a partial symbol table. */
+ /* local_type_unit_count - The number of TUs in the local TU
+ list. */
+ map.tu_count = read_4_bytes (abfd, addr);
+ addr += 4;
-void
-dwarf2_build_psymtabs (struct objfile *objfile)
-{
+ /* foreign_type_unit_count - The number of TUs in the foreign TU
+ list. */
+ uint32_t foreign_tu_count = read_4_bytes (abfd, addr);
+ addr += 4;
+ if (foreign_tu_count != 0)
+ {
+ warning (_("Section .debug_names in %s has unsupported %lu foreign TUs, "
+ "ignoring .debug_names."),
+ filename, static_cast<unsigned long> (foreign_tu_count));
+ return false;
+ }
- if (objfile->global_psymbols.capacity () == 0
- && objfile->static_psymbols.capacity () == 0)
- init_psymbol_list (objfile, 1024);
+ /* bucket_count - The number of hash buckets in the hash lookup
+ table. */
+ map.bucket_count = read_4_bytes (abfd, addr);
+ addr += 4;
- TRY
+ /* name_count - The number of unique names in the index. */
+ map.name_count = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* abbrev_table_size - The size in bytes of the abbreviations
+ table. */
+ uint32_t abbrev_table_size = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* augmentation_string_size - The size in bytes of the augmentation
+ string. This value is rounded up to a multiple of 4. */
+ uint32_t augmentation_string_size = read_4_bytes (abfd, addr);
+ addr += 4;
+ map.augmentation_is_gdb = ((augmentation_string_size
+ == sizeof (dwarf5_augmentation))
+ && memcmp (addr, dwarf5_augmentation,
+ sizeof (dwarf5_augmentation)) == 0);
+ augmentation_string_size += (-augmentation_string_size) & 3;
+ addr += augmentation_string_size;
+
+ /* List of CUs */
+ map.cu_table_reordered = addr;
+ addr += map.cu_count * map.offset_size;
+
+ /* List of Local TUs */
+ map.tu_table_reordered = addr;
+ addr += map.tu_count * map.offset_size;
+
+ /* Hash Lookup Table */
+ map.bucket_table_reordered = reinterpret_cast<const uint32_t *> (addr);
+ addr += map.bucket_count * 4;
+ map.hash_table_reordered = reinterpret_cast<const uint32_t *> (addr);
+ addr += map.name_count * 4;
+
+ /* Name Table */
+ map.name_table_string_offs_reordered = addr;
+ addr += map.name_count * map.offset_size;
+ map.name_table_entry_offs_reordered = addr;
+ addr += map.name_count * map.offset_size;
+
+ const gdb_byte *abbrev_table_start = addr;
+ for (;;)
{
- /* This isn't really ideal: all the data we allocate on the
- objfile's obstack is still uselessly kept around. However,
- freeing it seems unsafe. */
- psymtab_discarder psymtabs (objfile);
- dwarf2_build_psymtabs_hard (objfile);
- psymtabs.keep ();
+ unsigned int bytes_read;
+ const ULONGEST index_num = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ if (index_num == 0)
+ break;
+
+ const auto insertpair
+ = map.abbrev_map.emplace (index_num, mapped_debug_names::index_val ());
+ if (!insertpair.second)
+ {
+ warning (_("Section .debug_names in %s has duplicate index %s, "
+ "ignoring .debug_names."),
+ filename, pulongest (index_num));
+ return false;
+ }
+ mapped_debug_names::index_val &indexval = insertpair.first->second;
+ indexval.dwarf_tag = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+
+ for (;;)
+ {
+ mapped_debug_names::index_val::attr attr;
+ attr.dw_idx = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ attr.form = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ if (attr.form == DW_FORM_implicit_const)
+ {
+ attr.implicit_const = read_signed_leb128 (abfd, addr,
+ &bytes_read);
+ addr += bytes_read;
+ }
+ if (attr.dw_idx == 0 && attr.form == 0)
+ break;
+ indexval.attr_vec.push_back (std::move (attr));
+ }
}
- CATCH (except, RETURN_MASK_ERROR)
+ if (addr != abbrev_table_start + abbrev_table_size)
{
- exception_print (gdb_stderr, except);
+ warning (_("Section .debug_names in %s has abbreviation_table "
+ "of size %zu vs. written as %u, ignoring .debug_names."),
+ filename, addr - abbrev_table_start, abbrev_table_size);
+ return false;
}
- END_CATCH
+ map.entry_pool = addr;
+
+ return true;
}
-/* Return the total length of the CU described by HEADER. */
+/* A helper for create_cus_from_debug_names that handles the MAP's CU
+ list. */
-static unsigned int
-get_cu_length (const struct comp_unit_head *header)
+static void
+create_cus_from_debug_names_list (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const mapped_debug_names &map,
+ dwarf2_section_info §ion,
+ bool is_dwz)
{
- return header->initial_length_size + header->length;
+ sect_offset sect_off_prev;
+ for (uint32_t i = 0; i <= map.cu_count; ++i)
+ {
+ sect_offset sect_off_next;
+ if (i < map.cu_count)
+ {
+ sect_off_next
+ = (sect_offset) (extract_unsigned_integer
+ (map.cu_table_reordered + i * map.offset_size,
+ map.offset_size,
+ map.dwarf5_byte_order));
+ }
+ else
+ sect_off_next = (sect_offset) section.size;
+ if (i >= 1)
+ {
+ const ULONGEST length = sect_off_next - sect_off_prev;
+ dwarf2_per_cu_data *per_cu
+ = create_cu_from_index_list (dwarf2_per_objfile, §ion, is_dwz,
+ sect_off_prev, length);
+ dwarf2_per_objfile->all_comp_units.push_back (per_cu);
+ }
+ sect_off_prev = sect_off_next;
+ }
}
-/* Return TRUE if SECT_OFF is within CU_HEADER. */
+/* Read the CU list from the mapped index, and use it to create all
+ the CU objects for this dwarf2_per_objfile. */
-static inline bool
-offset_in_cu_p (const comp_unit_head *cu_header, sect_offset sect_off)
+static void
+create_cus_from_debug_names (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const mapped_debug_names &map,
+ const mapped_debug_names &dwz_map)
{
- sect_offset bottom = cu_header->sect_off;
- sect_offset top = cu_header->sect_off + get_cu_length (cu_header);
+ gdb_assert (dwarf2_per_objfile->all_comp_units.empty ());
+ dwarf2_per_objfile->all_comp_units.reserve (map.cu_count + dwz_map.cu_count);
- return sect_off >= bottom && sect_off < top;
+ create_cus_from_debug_names_list (dwarf2_per_objfile, map,
+ dwarf2_per_objfile->info,
+ false /* is_dwz */);
+
+ if (dwz_map.cu_count == 0)
+ return;
+
+ dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+ create_cus_from_debug_names_list (dwarf2_per_objfile, dwz_map, dwz->info,
+ true /* is_dwz */);
}
-/* 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. */
+/* Read .debug_names. If everything went ok, initialize the "quick"
+ elements of all the CUs and return true. Otherwise, return false. */
-static void
-dwarf2_find_base_address (struct die_info *die, struct dwarf2_cu *cu)
+static bool
+dwarf2_read_debug_names (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct attribute *attr;
+ std::unique_ptr<mapped_debug_names> map
+ (new mapped_debug_names (dwarf2_per_objfile));
+ mapped_debug_names dwz_map (dwarf2_per_objfile);
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- cu->base_known = 0;
- cu->base_address = 0;
+ if (!read_debug_names_from_section (objfile, objfile_name (objfile),
+ &dwarf2_per_objfile->debug_names,
+ *map))
+ return false;
- attr = dwarf2_attr (die, DW_AT_entry_pc, cu);
- if (attr)
- {
- cu->base_address = attr_value_as_address (attr);
- cu->base_known = 1;
- }
- else
+ /* Don't use the index if it's empty. */
+ if (map->name_count == 0)
+ return false;
+
+ /* If there is a .dwz file, read it so we can get its CU list as
+ well. */
+ dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+ if (dwz != NULL)
{
- attr = dwarf2_attr (die, DW_AT_low_pc, cu);
- if (attr)
+ if (!read_debug_names_from_section (objfile,
+ bfd_get_filename (dwz->dwz_bfd),
+ &dwz->debug_names, dwz_map))
{
- cu->base_address = attr_value_as_address (attr);
- cu->base_known = 1;
+ warning (_("could not read '.debug_names' section from %s; skipping"),
+ bfd_get_filename (dwz->dwz_bfd));
+ return false;
}
}
+
+ create_cus_from_debug_names (dwarf2_per_objfile, *map, dwz_map);
+
+ if (map->tu_count != 0)
+ {
+ /* We can only handle a single .debug_types when we have an
+ index. */
+ if (VEC_length (dwarf2_section_info_def, dwarf2_per_objfile->types) != 1)
+ return false;
+
+ dwarf2_section_info *section = VEC_index (dwarf2_section_info_def,
+ dwarf2_per_objfile->types, 0);
+
+ create_signatured_type_table_from_debug_names
+ (dwarf2_per_objfile, *map, section, &dwarf2_per_objfile->abbrev);
+ }
+
+ create_addrmap_from_aranges (dwarf2_per_objfile,
+ &dwarf2_per_objfile->debug_aranges);
+
+ dwarf2_per_objfile->debug_names_table = std::move (map);
+ dwarf2_per_objfile->using_index = 1;
+ dwarf2_per_objfile->quick_file_names_table =
+ create_quick_file_names_table (dwarf2_per_objfile->all_comp_units.size ());
+
+ return true;
}
-/* Read in the comp unit header information from the debug_info at info_ptr.
- Use rcuh_kind::COMPILE as the default type if not known by the caller.
- NOTE: This leaves members offset, first_die_offset to be filled in
- by the caller. */
+/* Type used to manage iterating over all CUs looking for a symbol for
+ .debug_names. */
-static const gdb_byte *
-read_comp_unit_head (struct comp_unit_head *cu_header,
- const gdb_byte *info_ptr,
- struct dwarf2_section_info *section,
- rcuh_kind section_kind)
+class dw2_debug_names_iterator
{
- int signed_addr;
- unsigned int bytes_read;
- const char *filename = get_section_file_name (section);
- bfd *abfd = get_section_bfd_owner (section);
+public:
+ /* If WANT_SPECIFIC_BLOCK is true, only look for symbols in block
+ BLOCK_INDEX. Otherwise BLOCK_INDEX is ignored. */
+ dw2_debug_names_iterator (const mapped_debug_names &map,
+ bool want_specific_block,
+ block_enum block_index, domain_enum domain,
+ const char *name)
+ : m_map (map), m_want_specific_block (want_specific_block),
+ m_block_index (block_index), m_domain (domain),
+ m_addr (find_vec_in_debug_names (map, name))
+ {}
- cu_header->length = read_initial_length (abfd, info_ptr, &bytes_read);
- cu_header->initial_length_size = bytes_read;
- cu_header->offset_size = (bytes_read == 4) ? 4 : 8;
- info_ptr += bytes_read;
- cu_header->version = read_2_bytes (abfd, info_ptr);
- info_ptr += 2;
- if (cu_header->version < 5)
- switch (section_kind)
- {
- case rcuh_kind::COMPILE:
- cu_header->unit_type = DW_UT_compile;
- break;
- case rcuh_kind::TYPE:
- cu_header->unit_type = DW_UT_type;
- break;
- default:
- internal_error (__FILE__, __LINE__,
- _("read_comp_unit_head: invalid section_kind"));
- }
- else
- {
- cu_header->unit_type = static_cast<enum dwarf_unit_type>
- (read_1_byte (abfd, info_ptr));
- info_ptr += 1;
- switch (cu_header->unit_type)
- {
- case DW_UT_compile:
- if (section_kind != rcuh_kind::COMPILE)
- error (_("Dwarf Error: wrong unit_type in compilation unit header "
- "(is DW_UT_compile, should be DW_UT_type) [in module %s]"),
- filename);
- break;
- case DW_UT_type:
- section_kind = rcuh_kind::TYPE;
- break;
- default:
- error (_("Dwarf Error: wrong unit_type in compilation unit header "
- "(is %d, should be %d or %d) [in module %s]"),
- cu_header->unit_type, DW_UT_compile, DW_UT_type, filename);
- }
-
- cu_header->addr_size = read_1_byte (abfd, info_ptr);
- info_ptr += 1;
- }
- cu_header->abbrev_sect_off = (sect_offset) read_offset (abfd, info_ptr,
- cu_header,
- &bytes_read);
- info_ptr += bytes_read;
- if (cu_header->version < 5)
- {
- 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)
- internal_error (__FILE__, __LINE__,
- _("read_comp_unit_head: dwarf from non elf file"));
- cu_header->signed_addr_p = signed_addr;
-
- if (section_kind == rcuh_kind::TYPE)
- {
- LONGEST type_offset;
-
- cu_header->signature = read_8_bytes (abfd, info_ptr);
- info_ptr += 8;
+ dw2_debug_names_iterator (const mapped_debug_names &map,
+ search_domain search, uint32_t namei)
+ : m_map (map),
+ m_search (search),
+ m_addr (find_vec_in_debug_names (map, namei))
+ {}
- type_offset = read_offset (abfd, info_ptr, cu_header, &bytes_read);
- info_ptr += bytes_read;
- cu_header->type_cu_offset_in_tu = (cu_offset) type_offset;
- if (to_underlying (cu_header->type_cu_offset_in_tu) != type_offset)
- error (_("Dwarf Error: Too big type_offset in compilation unit "
- "header (is %s) [in module %s]"), plongest (type_offset),
- filename);
- }
+ /* Return the next matching CU or NULL if there are no more. */
+ dwarf2_per_cu_data *next ();
- return info_ptr;
-}
+private:
+ static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
+ const char *name);
+ static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
+ uint32_t namei);
-/* Helper function that returns the proper abbrev section for
- THIS_CU. */
+ /* The internalized form of .debug_names. */
+ const mapped_debug_names &m_map;
-static struct dwarf2_section_info *
-get_abbrev_section_for_cu (struct dwarf2_per_cu_data *this_cu)
-{
- struct dwarf2_section_info *abbrev;
+ /* If true, only look for symbols that match BLOCK_INDEX. */
+ const bool m_want_specific_block = false;
- if (this_cu->is_dwz)
- abbrev = &dwarf2_get_dwz_file ()->abbrev;
- else
- abbrev = &dwarf2_per_objfile->abbrev;
+ /* One of GLOBAL_BLOCK or STATIC_BLOCK.
+ Unused if !WANT_SPECIFIC_BLOCK - FIRST_LOCAL_BLOCK is an invalid
+ value. */
+ const block_enum m_block_index = FIRST_LOCAL_BLOCK;
- return abbrev;
-}
+ /* The kind of symbol we're looking for. */
+ const domain_enum m_domain = UNDEF_DOMAIN;
+ const search_domain m_search = ALL_DOMAIN;
-/* Subroutine of read_and_check_comp_unit_head and
- read_and_check_type_unit_head to simplify them.
- Perform various error checking on the header. */
+ /* The list of CUs from the index entry of the symbol, or NULL if
+ not found. */
+ const gdb_byte *m_addr;
+};
-static void
-error_check_comp_unit_head (struct comp_unit_head *header,
- struct dwarf2_section_info *section,
- struct dwarf2_section_info *abbrev_section)
+const char *
+mapped_debug_names::namei_to_name (uint32_t namei) const
{
- const char *filename = get_section_file_name (section);
-
- if (header->version < 2 || header->version > 5)
- error (_("Dwarf Error: wrong version in compilation unit header "
- "(is %d, should be 2, 3, 4 or 5) [in module %s]"), header->version,
- filename);
-
- if (to_underlying (header->abbrev_sect_off)
- >= dwarf2_section_size (dwarf2_per_objfile->objfile, abbrev_section))
- error (_("Dwarf Error: bad offset (0x%x) in compilation unit header "
- "(offset 0x%x + 6) [in module %s]"),
- to_underlying (header->abbrev_sect_off),
- to_underlying (header->sect_off),
- filename);
-
- /* Cast to ULONGEST to use 64-bit arithmetic when possible to
- avoid potential 32-bit overflow. */
- if (((ULONGEST) header->sect_off + get_cu_length (header))
- > section->size)
- error (_("Dwarf Error: bad length (0x%x) in compilation unit header "
- "(offset 0x%x + 0) [in module %s]"),
- header->length, to_underlying (header->sect_off),
- filename);
+ const ULONGEST namei_string_offs
+ = extract_unsigned_integer ((name_table_string_offs_reordered
+ + namei * offset_size),
+ offset_size,
+ dwarf5_byte_order);
+ return read_indirect_string_at_offset
+ (dwarf2_per_objfile, dwarf2_per_objfile->objfile->obfd, namei_string_offs);
}
-/* Read in a CU/TU header and perform some basic error checking.
- The contents of the header are stored in HEADER.
- The result is a pointer to the start of the first DIE. */
+/* Find a slot in .debug_names for the object named NAME. If NAME is
+ found, return pointer to its pool data. If NAME cannot be found,
+ return NULL. */
-static const gdb_byte *
-read_and_check_comp_unit_head (struct comp_unit_head *header,
- struct dwarf2_section_info *section,
- struct dwarf2_section_info *abbrev_section,
- const gdb_byte *info_ptr,
- rcuh_kind section_kind)
+const gdb_byte *
+dw2_debug_names_iterator::find_vec_in_debug_names
+ (const mapped_debug_names &map, const char *name)
{
- const gdb_byte *beg_of_comp_unit = info_ptr;
+ int (*cmp) (const char *, const char *);
- header->sect_off = (sect_offset) (beg_of_comp_unit - section->buffer);
+ if (current_language->la_language == language_cplus
+ || current_language->la_language == language_fortran
+ || current_language->la_language == language_d)
+ {
+ /* NAME is already canonical. Drop any qualifiers as
+ .debug_names does not contain any. */
- info_ptr = read_comp_unit_head (header, info_ptr, section, section_kind);
+ if (strchr (name, '(') != NULL)
+ {
+ gdb::unique_xmalloc_ptr<char> without_params
+ = cp_remove_params (name);
- header->first_die_cu_offset = (cu_offset) (info_ptr - beg_of_comp_unit);
+ if (without_params != NULL)
+ {
+ name = without_params.get();
+ }
+ }
+ }
- error_check_comp_unit_head (header, section, abbrev_section);
+ cmp = (case_sensitivity == case_sensitive_on ? strcmp : strcasecmp);
- return info_ptr;
-}
+ const uint32_t full_hash = dwarf5_djb_hash (name);
+ uint32_t namei
+ = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
+ (map.bucket_table_reordered
+ + (full_hash % map.bucket_count)), 4,
+ map.dwarf5_byte_order);
+ if (namei == 0)
+ return NULL;
+ --namei;
+ if (namei >= map.name_count)
+ {
+ complaint (_("Wrong .debug_names with name index %u but name_count=%u "
+ "[in module %s]"),
+ namei, map.name_count,
+ objfile_name (map.dwarf2_per_objfile->objfile));
+ return NULL;
+ }
-/* Fetch the abbreviation table offset from a comp or type unit header. */
+ for (;;)
+ {
+ const uint32_t namei_full_hash
+ = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
+ (map.hash_table_reordered + namei), 4,
+ map.dwarf5_byte_order);
+ if (full_hash % map.bucket_count != namei_full_hash % map.bucket_count)
+ return NULL;
-static sect_offset
-read_abbrev_offset (struct dwarf2_section_info *section,
- sect_offset sect_off)
-{
- bfd *abfd = get_section_bfd_owner (section);
- const gdb_byte *info_ptr;
- unsigned int initial_length_size, offset_size;
- uint16_t version;
+ if (full_hash == namei_full_hash)
+ {
+ const char *const namei_string = map.namei_to_name (namei);
- dwarf2_read_section (dwarf2_per_objfile->objfile, section);
- info_ptr = section->buffer + to_underlying (sect_off);
- read_initial_length (abfd, info_ptr, &initial_length_size);
- offset_size = initial_length_size == 4 ? 4 : 8;
- info_ptr += initial_length_size;
+#if 0 /* An expensive sanity check. */
+ if (namei_full_hash != dwarf5_djb_hash (namei_string))
+ {
+ complaint (_("Wrong .debug_names hash for string at index %u "
+ "[in module %s]"),
+ namei, objfile_name (dwarf2_per_objfile->objfile));
+ return NULL;
+ }
+#endif
- version = read_2_bytes (abfd, info_ptr);
- info_ptr += 2;
- if (version >= 5)
- {
- /* Skip unit type and address size. */
- info_ptr += 2;
- }
+ if (cmp (namei_string, name) == 0)
+ {
+ const ULONGEST namei_entry_offs
+ = extract_unsigned_integer ((map.name_table_entry_offs_reordered
+ + namei * map.offset_size),
+ map.offset_size, map.dwarf5_byte_order);
+ return map.entry_pool + namei_entry_offs;
+ }
+ }
- return (sect_offset) read_offset_1 (abfd, info_ptr, offset_size);
+ ++namei;
+ if (namei >= map.name_count)
+ return NULL;
+ }
}
-/* 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 (const char *name, struct partial_symtab *pst,
- struct objfile *objfile)
+const gdb_byte *
+dw2_debug_names_iterator::find_vec_in_debug_names
+ (const mapped_debug_names &map, uint32_t namei)
{
- struct partial_symtab *subpst = allocate_psymtab (name, objfile);
-
- if (!IS_ABSOLUTE_PATH (subpst->filename))
+ if (namei >= map.name_count)
{
- /* It shares objfile->objfile_obstack. */
- subpst->dirname = pst->dirname;
+ complaint (_("Wrong .debug_names with name index %u but name_count=%u "
+ "[in module %s]"),
+ namei, map.name_count,
+ objfile_name (map.dwarf2_per_objfile->objfile));
+ return NULL;
}
- subpst->textlow = 0;
- subpst->texthigh = 0;
-
- subpst->dependencies
- = XOBNEW (&objfile->objfile_obstack, 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->compunit_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. */
- subpst->read_symtab_private = NULL;
+ const ULONGEST namei_entry_offs
+ = extract_unsigned_integer ((map.name_table_entry_offs_reordered
+ + namei * map.offset_size),
+ map.offset_size, map.dwarf5_byte_order);
+ return map.entry_pool + namei_entry_offs;
}
-/* 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. */
+/* See dw2_debug_names_iterator. */
-static void
-dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
- struct die_info *die,
- struct partial_symtab *pst)
+dwarf2_per_cu_data *
+dw2_debug_names_iterator::next ()
{
- line_header_up lh;
- struct attribute *attr;
+ if (m_addr == NULL)
+ return NULL;
- attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
- if (attr)
- lh = dwarf_decode_line_header ((sect_offset) DW_UNSND (attr), cu);
- if (lh == NULL)
- return; /* No linetable, so no includes. */
+ struct dwarf2_per_objfile *dwarf2_per_objfile = m_map.dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *const abfd = objfile->obfd;
- /* NOTE: pst->dirname is DW_AT_comp_dir (if present). */
- dwarf_decode_lines (lh.get (), pst->dirname, cu, pst, pst->textlow, 1);
-}
+ again:
-static hashval_t
-hash_signatured_type (const void *item)
-{
- const struct signatured_type *sig_type
- = (const struct signatured_type *) item;
+ unsigned int bytes_read;
+ const ULONGEST abbrev = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
+ m_addr += bytes_read;
+ if (abbrev == 0)
+ return NULL;
- /* This drops the top 32 bits of the signature, but is ok for a hash. */
- return sig_type->signature;
-}
+ const auto indexval_it = m_map.abbrev_map.find (abbrev);
+ if (indexval_it == m_map.abbrev_map.cend ())
+ {
+ complaint (_("Wrong .debug_names undefined abbrev code %s "
+ "[in module %s]"),
+ pulongest (abbrev), objfile_name (objfile));
+ return NULL;
+ }
+ const mapped_debug_names::index_val &indexval = indexval_it->second;
+ bool have_is_static = false;
+ bool is_static;
+ dwarf2_per_cu_data *per_cu = NULL;
+ for (const mapped_debug_names::index_val::attr &attr : indexval.attr_vec)
+ {
+ ULONGEST ull;
+ switch (attr.form)
+ {
+ case DW_FORM_implicit_const:
+ ull = attr.implicit_const;
+ break;
+ case DW_FORM_flag_present:
+ ull = 1;
+ break;
+ case DW_FORM_udata:
+ ull = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
+ m_addr += bytes_read;
+ break;
+ default:
+ complaint (_("Unsupported .debug_names form %s [in module %s]"),
+ dwarf_form_name (attr.form),
+ objfile_name (objfile));
+ return NULL;
+ }
+ switch (attr.dw_idx)
+ {
+ case DW_IDX_compile_unit:
+ /* Don't crash on bad data. */
+ if (ull >= dwarf2_per_objfile->all_comp_units.size ())
+ {
+ complaint (_(".debug_names entry has bad CU index %s"
+ " [in module %s]"),
+ pulongest (ull),
+ objfile_name (dwarf2_per_objfile->objfile));
+ continue;
+ }
+ per_cu = dwarf2_per_objfile->get_cutu (ull);
+ break;
+ case DW_IDX_type_unit:
+ /* Don't crash on bad data. */
+ if (ull >= dwarf2_per_objfile->all_type_units.size ())
+ {
+ complaint (_(".debug_names entry has bad TU index %s"
+ " [in module %s]"),
+ pulongest (ull),
+ objfile_name (dwarf2_per_objfile->objfile));
+ continue;
+ }
+ per_cu = &dwarf2_per_objfile->get_tu (ull)->per_cu;
+ break;
+ case DW_IDX_GNU_internal:
+ if (!m_map.augmentation_is_gdb)
+ break;
+ have_is_static = true;
+ is_static = true;
+ break;
+ case DW_IDX_GNU_external:
+ if (!m_map.augmentation_is_gdb)
+ break;
+ have_is_static = true;
+ is_static = false;
+ break;
+ }
+ }
-static int
-eq_signatured_type (const void *item_lhs, const void *item_rhs)
-{
- const struct signatured_type *lhs = (const struct signatured_type *) item_lhs;
- const struct signatured_type *rhs = (const struct signatured_type *) item_rhs;
+ /* Skip if already read in. */
+ if (per_cu->v.quick->compunit_symtab)
+ goto again;
- return lhs->signature == rhs->signature;
-}
-
-/* Allocate a hash table for signatured types. */
-
-static htab_t
-allocate_signatured_type_table (struct objfile *objfile)
-{
- return htab_create_alloc_ex (41,
- hash_signatured_type,
- eq_signatured_type,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
-}
-
-/* A helper function to add a signatured type CU to a table. */
-
-static int
-add_signatured_type_cu_to_table (void **slot, void *datum)
-{
- struct signatured_type *sigt = (struct signatured_type *) *slot;
- struct signatured_type ***datap = (struct signatured_type ***) datum;
-
- **datap = sigt;
- ++*datap;
-
- return 1;
-}
-
-/* A helper for create_debug_types_hash_table. Read types from SECTION
- and fill them into TYPES_HTAB. It will process only type units,
- therefore DW_UT_type. */
-
-static void
-create_debug_type_hash_table (struct dwo_file *dwo_file,
- dwarf2_section_info *section, htab_t &types_htab,
- rcuh_kind section_kind)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_section_info *abbrev_section;
- bfd *abfd;
- const gdb_byte *info_ptr, *end_ptr;
-
- abbrev_section = (dwo_file != NULL
- ? &dwo_file->sections.abbrev
- : &dwarf2_per_objfile->abbrev);
-
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n",
- get_section_name (section),
- get_section_file_name (abbrev_section));
-
- dwarf2_read_section (objfile, section);
- info_ptr = section->buffer;
-
- if (info_ptr == NULL)
- return;
-
- /* We can't set abfd until now because the section may be empty or
- not present, in which case the bfd is unknown. */
- abfd = get_section_bfd_owner (section);
-
- /* We don't use init_cutu_and_read_dies_simple, or some such, here
- because we don't need to read any dies: the signature is in the
- header. */
-
- end_ptr = info_ptr + section->size;
- while (info_ptr < end_ptr)
+ /* Check static vs global. */
+ if (have_is_static)
{
- struct signatured_type *sig_type;
- struct dwo_unit *dwo_tu;
- void **slot;
- const gdb_byte *ptr = info_ptr;
- struct comp_unit_head header;
- unsigned int length;
-
- sect_offset sect_off = (sect_offset) (ptr - section->buffer);
-
- /* Initialize it due to a false compiler warning. */
- header.signature = -1;
- header.type_cu_offset_in_tu = (cu_offset) -1;
-
- /* We need to read the type's signature in order to build the hash
- table, but we don't need anything else just yet. */
-
- ptr = read_and_check_comp_unit_head (&header, section,
- abbrev_section, ptr, section_kind);
-
- length = get_cu_length (&header);
+ const bool want_static = m_block_index != GLOBAL_BLOCK;
+ if (m_want_specific_block && want_static != is_static)
+ goto again;
+ }
- /* Skip dummy type units. */
- if (ptr >= info_ptr + length
- || peek_abbrev_code (abfd, ptr) == 0
- || header.unit_type != DW_UT_type)
+ /* Match dw2_symtab_iter_next, symbol_kind
+ and debug_names::psymbol_tag. */
+ switch (m_domain)
+ {
+ case VAR_DOMAIN:
+ switch (indexval.dwarf_tag)
{
- info_ptr += length;
- continue;
+ case DW_TAG_variable:
+ case DW_TAG_subprogram:
+ /* Some types are also in VAR_DOMAIN. */
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
}
-
- if (types_htab == NULL)
+ break;
+ case STRUCT_DOMAIN:
+ switch (indexval.dwarf_tag)
{
- if (dwo_file)
- types_htab = allocate_dwo_unit_table (objfile);
- else
- types_htab = allocate_signatured_type_table (objfile);
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
}
+ break;
+ case LABEL_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case 0:
+ case DW_TAG_variable:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ default:
+ break;
+ }
- if (dwo_file)
+ /* Match dw2_expand_symtabs_matching, symbol_kind and
+ debug_names::psymbol_tag. */
+ switch (m_search)
+ {
+ case VARIABLES_DOMAIN:
+ switch (indexval.dwarf_tag)
{
- sig_type = NULL;
- dwo_tu = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwo_unit);
- dwo_tu->dwo_file = dwo_file;
- dwo_tu->signature = header.signature;
- dwo_tu->type_offset_in_tu = header.type_cu_offset_in_tu;
- dwo_tu->section = section;
- dwo_tu->sect_off = sect_off;
- dwo_tu->length = length;
+ case DW_TAG_variable:
+ break;
+ default:
+ goto again;
}
- else
+ break;
+ case FUNCTIONS_DOMAIN:
+ switch (indexval.dwarf_tag)
{
- /* N.B.: type_offset is not usable if this type uses a DWO file.
- The real type_offset is in the DWO file. */
- dwo_tu = NULL;
- sig_type = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct signatured_type);
- sig_type->signature = header.signature;
- sig_type->type_offset_in_tu = header.type_cu_offset_in_tu;
- sig_type->per_cu.objfile = objfile;
- sig_type->per_cu.is_debug_types = 1;
- sig_type->per_cu.section = section;
- sig_type->per_cu.sect_off = sect_off;
- sig_type->per_cu.length = length;
+ case DW_TAG_subprogram:
+ break;
+ default:
+ goto again;
}
-
- slot = htab_find_slot (types_htab,
- dwo_file ? (void*) dwo_tu : (void *) sig_type,
- INSERT);
- gdb_assert (slot != NULL);
- if (*slot != NULL)
+ break;
+ case TYPES_DOMAIN:
+ switch (indexval.dwarf_tag)
{
- sect_offset dup_sect_off;
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ default:
+ break;
+ }
- if (dwo_file)
- {
- const struct dwo_unit *dup_tu
- = (const struct dwo_unit *) *slot;
+ return per_cu;
+}
- dup_sect_off = dup_tu->sect_off;
- }
- else
- {
- const struct signatured_type *dup_tu
- = (const struct signatured_type *) *slot;
+static struct compunit_symtab *
+dw2_debug_names_lookup_symbol (struct objfile *objfile, int block_index_int,
+ const char *name, domain_enum domain)
+{
+ const block_enum block_index = static_cast<block_enum> (block_index_int);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- dup_sect_off = dup_tu->per_cu.sect_off;
- }
+ const auto &mapp = dwarf2_per_objfile->debug_names_table;
+ if (!mapp)
+ {
+ /* index is NULL if OBJF_READNOW. */
+ return NULL;
+ }
+ const auto &map = *mapp;
- complaint (&symfile_complaints,
- _("debug type entry at offset 0x%x is duplicate to"
- " the entry at offset 0x%x, signature %s"),
- to_underlying (sect_off), to_underlying (dup_sect_off),
- hex_string (header.signature));
- }
- *slot = dwo_file ? (void *) dwo_tu : (void *) sig_type;
+ dw2_debug_names_iterator iter (map, true /* want_specific_block */,
+ block_index, domain, name);
- if (dwarf_read_debug > 1)
- fprintf_unfiltered (gdb_stdlog, " offset 0x%x, signature %s\n",
- to_underlying (sect_off),
- hex_string (header.signature));
+ struct compunit_symtab *stab_best = NULL;
+ struct dwarf2_per_cu_data *per_cu;
+ while ((per_cu = iter.next ()) != NULL)
+ {
+ struct symbol *sym, *with_opaque = NULL;
+ struct compunit_symtab *stab = dw2_instantiate_symtab (per_cu, false);
+ const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (stab);
+ struct block *block = BLOCKVECTOR_BLOCK (bv, block_index);
- info_ptr += length;
- }
-}
+ sym = block_find_symbol (block, name, domain,
+ block_find_non_opaque_type_preferred,
+ &with_opaque);
-/* Create the hash table of all entries in the .debug_types
- (or .debug_types.dwo) section(s).
- If reading a DWO file, then DWO_FILE is a pointer to the DWO file object,
- otherwise it is NULL.
+ /* Some caution must be observed with overloaded functions and
+ methods, since the index will not contain any overload
+ information (but NAME might contain it). */
- The result is a pointer to the hash table or NULL if there are no types.
+ if (sym != NULL
+ && strcmp_iw (SYMBOL_SEARCH_NAME (sym), name) == 0)
+ return stab;
+ if (with_opaque != NULL
+ && strcmp_iw (SYMBOL_SEARCH_NAME (with_opaque), name) == 0)
+ stab_best = stab;
- Note: This function processes DWO files only, not DWP files. */
+ /* Keep looking through other CUs. */
+ }
+
+ return stab_best;
+}
+
+/* This dumps minimal information about .debug_names. It is called
+ via "mt print objfiles". The gdb.dwarf2/gdb-index.exp testcase
+ uses this to verify that .debug_names has been loaded. */
static void
-create_debug_types_hash_table (struct dwo_file *dwo_file,
- VEC (dwarf2_section_info_def) *types,
- htab_t &types_htab)
+dw2_debug_names_dump (struct objfile *objfile)
{
- int ix;
- struct dwarf2_section_info *section;
-
- if (VEC_empty (dwarf2_section_info_def, types))
- return;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- for (ix = 0;
- VEC_iterate (dwarf2_section_info_def, types, ix, section);
- ++ix)
- create_debug_type_hash_table (dwo_file, section, types_htab,
- rcuh_kind::TYPE);
+ gdb_assert (dwarf2_per_objfile->using_index);
+ printf_filtered (".debug_names:");
+ if (dwarf2_per_objfile->debug_names_table)
+ printf_filtered (" exists\n");
+ else
+ printf_filtered (" faked for \"readnow\"\n");
+ printf_filtered ("\n");
}
-/* Create the hash table of all entries in the .debug_types section,
- and initialize all_type_units.
- The result is zero if there is an error (e.g. missing .debug_types section),
- otherwise non-zero. */
-
-static int
-create_all_type_units (struct objfile *objfile)
+static void
+dw2_debug_names_expand_symtabs_for_function (struct objfile *objfile,
+ const char *func_name)
{
- htab_t types_htab = NULL;
- struct signatured_type **iter;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- create_debug_type_hash_table (NULL, &dwarf2_per_objfile->info, types_htab,
- rcuh_kind::COMPILE);
- create_debug_types_hash_table (NULL, dwarf2_per_objfile->types, types_htab);
- if (types_htab == NULL)
+ /* dwarf2_per_objfile->debug_names_table is NULL if OBJF_READNOW. */
+ if (dwarf2_per_objfile->debug_names_table)
{
- dwarf2_per_objfile->signatured_types = NULL;
- return 0;
+ const mapped_debug_names &map = *dwarf2_per_objfile->debug_names_table;
+
+ /* Note: It doesn't matter what we pass for block_index here. */
+ dw2_debug_names_iterator iter (map, false /* want_specific_block */,
+ GLOBAL_BLOCK, VAR_DOMAIN, func_name);
+
+ struct dwarf2_per_cu_data *per_cu;
+ while ((per_cu = iter.next ()) != NULL)
+ dw2_instantiate_symtab (per_cu, false);
}
+}
- dwarf2_per_objfile->signatured_types = types_htab;
+static void
+dw2_debug_names_expand_symtabs_matching
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info &lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ enum search_domain kind)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- dwarf2_per_objfile->n_type_units
- = dwarf2_per_objfile->n_allocated_type_units
- = htab_elements (types_htab);
- dwarf2_per_objfile->all_type_units =
- XNEWVEC (struct signatured_type *, dwarf2_per_objfile->n_type_units);
- iter = &dwarf2_per_objfile->all_type_units[0];
- htab_traverse_noresize (types_htab, add_signatured_type_cu_to_table, &iter);
- gdb_assert (iter - &dwarf2_per_objfile->all_type_units[0]
- == dwarf2_per_objfile->n_type_units);
+ /* debug_names_table is NULL if OBJF_READNOW. */
+ if (!dwarf2_per_objfile->debug_names_table)
+ return;
- return 1;
-}
+ dw_expand_symtabs_matching_file_matcher (dwarf2_per_objfile, file_matcher);
-/* Add an entry for signature SIG to dwarf2_per_objfile->signatured_types.
- If SLOT is non-NULL, it is the entry to use in the hash table.
- Otherwise we find one. */
+ mapped_debug_names &map = *dwarf2_per_objfile->debug_names_table;
-static struct signatured_type *
-add_type_unit (ULONGEST sig, void **slot)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- int n_type_units = dwarf2_per_objfile->n_type_units;
- struct signatured_type *sig_type;
-
- gdb_assert (n_type_units <= dwarf2_per_objfile->n_allocated_type_units);
- ++n_type_units;
- if (n_type_units > dwarf2_per_objfile->n_allocated_type_units)
- {
- if (dwarf2_per_objfile->n_allocated_type_units == 0)
- dwarf2_per_objfile->n_allocated_type_units = 1;
- dwarf2_per_objfile->n_allocated_type_units *= 2;
- dwarf2_per_objfile->all_type_units
- = XRESIZEVEC (struct signatured_type *,
- dwarf2_per_objfile->all_type_units,
- dwarf2_per_objfile->n_allocated_type_units);
- ++dwarf2_per_objfile->tu_stats.nr_all_type_units_reallocs;
- }
- dwarf2_per_objfile->n_type_units = n_type_units;
-
- sig_type = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct signatured_type);
- dwarf2_per_objfile->all_type_units[n_type_units - 1] = sig_type;
- sig_type->signature = sig;
- sig_type->per_cu.is_debug_types = 1;
- if (dwarf2_per_objfile->using_index)
+ dw2_expand_symtabs_matching_symbol (map, lookup_name,
+ symbol_matcher,
+ kind, [&] (offset_type namei)
{
- sig_type->per_cu.v.quick =
- OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_quick_data);
- }
+ /* The name was matched, now expand corresponding CUs that were
+ marked. */
+ dw2_debug_names_iterator iter (map, kind, namei);
- if (slot == NULL)
- {
- slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
- sig_type, INSERT);
- }
- gdb_assert (*slot == NULL);
- *slot = sig_type;
- /* The rest of sig_type must be filled in by the caller. */
- return sig_type;
+ struct dwarf2_per_cu_data *per_cu;
+ while ((per_cu = iter.next ()) != NULL)
+ dw2_expand_symtabs_matching_one (per_cu, file_matcher,
+ expansion_notify);
+ });
}
-/* Subroutine of lookup_dwo_signatured_type and lookup_dwp_signatured_type.
- Fill in SIG_ENTRY with DWO_ENTRY. */
-
-static void
-fill_in_sig_entry_from_dwo_entry (struct objfile *objfile,
- struct signatured_type *sig_entry,
- struct dwo_unit *dwo_entry)
+const struct quick_symbol_functions dwarf2_debug_names_functions =
{
- /* Make sure we're not clobbering something we don't expect to. */
- gdb_assert (! sig_entry->per_cu.queued);
- gdb_assert (sig_entry->per_cu.cu == NULL);
- if (dwarf2_per_objfile->using_index)
- {
- gdb_assert (sig_entry->per_cu.v.quick != NULL);
- gdb_assert (sig_entry->per_cu.v.quick->compunit_symtab == NULL);
- }
- else
- gdb_assert (sig_entry->per_cu.v.psymtab == NULL);
- gdb_assert (sig_entry->signature == dwo_entry->signature);
- gdb_assert (to_underlying (sig_entry->type_offset_in_section) == 0);
- gdb_assert (sig_entry->type_unit_group == NULL);
- gdb_assert (sig_entry->dwo_unit == NULL);
-
- sig_entry->per_cu.section = dwo_entry->section;
- sig_entry->per_cu.sect_off = dwo_entry->sect_off;
- sig_entry->per_cu.length = dwo_entry->length;
- sig_entry->per_cu.reading_dwo_directly = 1;
- sig_entry->per_cu.objfile = objfile;
- sig_entry->type_offset_in_tu = dwo_entry->type_offset_in_tu;
- sig_entry->dwo_unit = dwo_entry;
-}
+ dw2_has_symbols,
+ dw2_find_last_source_symtab,
+ dw2_forget_cached_source_info,
+ dw2_map_symtabs_matching_filename,
+ dw2_debug_names_lookup_symbol,
+ dw2_print_stats,
+ dw2_debug_names_dump,
+ dw2_relocate,
+ dw2_debug_names_expand_symtabs_for_function,
+ dw2_expand_all_symtabs,
+ dw2_expand_symtabs_with_fullname,
+ dw2_map_matching_symbols,
+ dw2_debug_names_expand_symtabs_matching,
+ dw2_find_pc_sect_compunit_symtab,
+ NULL,
+ dw2_map_symbol_filenames
+};
-/* Subroutine of lookup_signatured_type.
- If we haven't read the TU yet, create the signatured_type data structure
- for a TU to be read in directly from a DWO file, bypassing the stub.
- This is the "Stay in DWO Optimization": When there is no DWP file and we're
- using .gdb_index, then when reading a CU we want to stay in the DWO file
- containing that CU. Otherwise we could end up reading several other DWO
- files (due to comdat folding) to process the transitive closure of all the
- mentioned TUs, and that can be slow. The current DWO file will have every
- type signature that it needs.
- We only do this for .gdb_index because in the psymtab case we already have
- to read all the DWOs to build the type unit groups. */
+/* See symfile.h. */
-static struct signatured_type *
-lookup_dwo_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
+bool
+dwarf2_initialize_objfile (struct objfile *objfile, dw_index_kind *index_kind)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwo_file *dwo_file;
- struct dwo_unit find_dwo_entry, *dwo_entry;
- struct signatured_type find_sig_entry, *sig_entry;
- void **slot;
-
- gdb_assert (cu->dwo_unit && dwarf2_per_objfile->using_index);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- /* If TU skeletons have been removed then we may not have read in any
- TUs yet. */
- if (dwarf2_per_objfile->signatured_types == NULL)
+ /* If we're about to read full symbols, don't bother with the
+ indices. In this case we also don't care if some other debug
+ format is making psymtabs, because they are all about to be
+ expanded anyway. */
+ if ((objfile->flags & OBJF_READNOW))
{
- dwarf2_per_objfile->signatured_types
- = allocate_signatured_type_table (objfile);
- }
-
- /* We only ever need to read in one copy of a signatured type.
- Use the global signatured_types array to do our own comdat-folding
- of types. If this is the first time we're reading this TU, and
- the TU has an entry in .gdb_index, replace the recorded data from
- .gdb_index with this TU. */
-
- find_sig_entry.signature = sig;
- slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
- &find_sig_entry, INSERT);
- sig_entry = (struct signatured_type *) *slot;
-
- /* We can get here with the TU already read, *or* in the process of being
- read. Don't reassign the global entry to point to this DWO if that's
- the case. Also note that if the TU is already being read, it may not
- have come from a DWO, the program may be a mix of Fission-compiled
- code and non-Fission-compiled code. */
+ dwarf2_per_objfile->using_index = 1;
+ create_all_comp_units (dwarf2_per_objfile);
+ create_all_type_units (dwarf2_per_objfile);
+ dwarf2_per_objfile->quick_file_names_table
+ = create_quick_file_names_table
+ (dwarf2_per_objfile->all_comp_units.size ());
+
+ for (int i = 0; i < (dwarf2_per_objfile->all_comp_units.size ()
+ + dwarf2_per_objfile->all_type_units.size ()); ++i)
+ {
+ dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->get_cutu (i);
- /* Have we already tried to read this TU?
- Note: sig_entry can be NULL if the skeleton TU was removed (thus it
- needn't exist in the global table yet). */
- if (sig_entry != NULL && sig_entry->per_cu.tu_read)
- return sig_entry;
+ per_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_quick_data);
+ }
- /* Note: cu->dwo_unit is the dwo_unit that references this TU, not the
- dwo_unit of the TU itself. */
- dwo_file = cu->dwo_unit->dwo_file;
+ /* Return 1 so that gdb sees the "quick" functions. However,
+ these functions will be no-ops because we will have expanded
+ all symtabs. */
+ *index_kind = dw_index_kind::GDB_INDEX;
+ return true;
+ }
- /* Ok, this is the first time we're reading this TU. */
- if (dwo_file->tus == NULL)
- return NULL;
- find_dwo_entry.signature = sig;
- dwo_entry = (struct dwo_unit *) htab_find (dwo_file->tus, &find_dwo_entry);
- if (dwo_entry == NULL)
- return NULL;
+ if (dwarf2_read_debug_names (dwarf2_per_objfile))
+ {
+ *index_kind = dw_index_kind::DEBUG_NAMES;
+ return true;
+ }
- /* If the global table doesn't have an entry for this TU, add one. */
- if (sig_entry == NULL)
- sig_entry = add_type_unit (sig, slot);
+ if (dwarf2_read_index (dwarf2_per_objfile))
+ {
+ *index_kind = dw_index_kind::GDB_INDEX;
+ return true;
+ }
- fill_in_sig_entry_from_dwo_entry (objfile, sig_entry, dwo_entry);
- sig_entry->per_cu.tu_read = 1;
- return sig_entry;
+ return false;
}
-/* Subroutine of lookup_signatured_type.
- Look up the type for signature SIG, and if we can't find SIG in .gdb_index
- then try the DWP file. If the TU stub (skeleton) has been removed then
- it won't be in .gdb_index. */
+\f
-static struct signatured_type *
-lookup_dwp_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
+/* Build a partial symbol table. */
+
+void
+dwarf2_build_psymtabs (struct objfile *objfile)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwp_file *dwp_file = get_dwp_file ();
- struct dwo_unit *dwo_entry;
- struct signatured_type find_sig_entry, *sig_entry;
- void **slot;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- gdb_assert (cu->dwo_unit && dwarf2_per_objfile->using_index);
- gdb_assert (dwp_file != NULL);
+ if (objfile->global_psymbols.capacity () == 0
+ && objfile->static_psymbols.capacity () == 0)
+ init_psymbol_list (objfile, 1024);
- /* If TU skeletons have been removed then we may not have read in any
- TUs yet. */
- if (dwarf2_per_objfile->signatured_types == NULL)
+ TRY
{
- dwarf2_per_objfile->signatured_types
- = allocate_signatured_type_table (objfile);
+ /* This isn't really ideal: all the data we allocate on the
+ objfile's obstack is still uselessly kept around. However,
+ freeing it seems unsafe. */
+ psymtab_discarder psymtabs (objfile);
+ dwarf2_build_psymtabs_hard (dwarf2_per_objfile);
+ psymtabs.keep ();
}
+ CATCH (except, RETURN_MASK_ERROR)
+ {
+ exception_print (gdb_stderr, except);
+ }
+ END_CATCH
+}
- find_sig_entry.signature = sig;
- slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
- &find_sig_entry, INSERT);
- sig_entry = (struct signatured_type *) *slot;
+/* Return the total length of the CU described by HEADER. */
- /* Have we already tried to read this TU?
- Note: sig_entry can be NULL if the skeleton TU was removed (thus it
- needn't exist in the global table yet). */
- if (sig_entry != NULL)
- return sig_entry;
+static unsigned int
+get_cu_length (const struct comp_unit_head *header)
+{
+ return header->initial_length_size + header->length;
+}
- if (dwp_file->tus == NULL)
- return NULL;
- dwo_entry = lookup_dwo_unit_in_dwp (dwp_file, NULL,
- sig, 1 /* is_debug_types */);
- if (dwo_entry == NULL)
- return NULL;
+/* Return TRUE if SECT_OFF is within CU_HEADER. */
- sig_entry = add_type_unit (sig, slot);
- fill_in_sig_entry_from_dwo_entry (objfile, sig_entry, dwo_entry);
+static inline bool
+offset_in_cu_p (const comp_unit_head *cu_header, sect_offset sect_off)
+{
+ sect_offset bottom = cu_header->sect_off;
+ sect_offset top = cu_header->sect_off + get_cu_length (cu_header);
- return sig_entry;
+ return sect_off >= bottom && sect_off < top;
}
-/* Lookup a signature based type for DW_FORM_ref_sig8.
- Returns NULL if signature SIG is not present in the table.
- It is up to the caller to complain about this. */
+/* 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. */
-static struct signatured_type *
-lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
+static void
+dwarf2_find_base_address (struct die_info *die, struct dwarf2_cu *cu)
{
- if (cu->dwo_unit
- && dwarf2_per_objfile->using_index)
+ struct attribute *attr;
+
+ cu->base_known = 0;
+ cu->base_address = 0;
+
+ attr = dwarf2_attr (die, DW_AT_entry_pc, cu);
+ if (attr)
{
- /* We're in a DWO/DWP file, and we're using .gdb_index.
- These cases require special processing. */
- if (get_dwp_file () == NULL)
- return lookup_dwo_signatured_type (cu, sig);
- else
- return lookup_dwp_signatured_type (cu, sig);
+ cu->base_address = attr_value_as_address (attr);
+ cu->base_known = 1;
}
else
{
- struct signatured_type find_entry, *entry;
+ attr = dwarf2_attr (die, DW_AT_low_pc, cu);
+ if (attr)
+ {
+ cu->base_address = attr_value_as_address (attr);
+ cu->base_known = 1;
+ }
+ }
+}
- if (dwarf2_per_objfile->signatured_types == NULL)
- return NULL;
- find_entry.signature = sig;
- entry = ((struct signatured_type *)
- htab_find (dwarf2_per_objfile->signatured_types, &find_entry));
- return entry;
+/* Read in the comp unit header information from the debug_info at info_ptr.
+ Use rcuh_kind::COMPILE as the default type if not known by the caller.
+ NOTE: This leaves members offset, first_die_offset to be filled in
+ by the caller. */
+
+static const gdb_byte *
+read_comp_unit_head (struct comp_unit_head *cu_header,
+ const gdb_byte *info_ptr,
+ struct dwarf2_section_info *section,
+ rcuh_kind section_kind)
+{
+ int signed_addr;
+ unsigned int bytes_read;
+ const char *filename = get_section_file_name (section);
+ bfd *abfd = get_section_bfd_owner (section);
+
+ cu_header->length = read_initial_length (abfd, info_ptr, &bytes_read);
+ cu_header->initial_length_size = bytes_read;
+ cu_header->offset_size = (bytes_read == 4) ? 4 : 8;
+ info_ptr += bytes_read;
+ cu_header->version = read_2_bytes (abfd, info_ptr);
+ info_ptr += 2;
+ if (cu_header->version < 5)
+ switch (section_kind)
+ {
+ case rcuh_kind::COMPILE:
+ cu_header->unit_type = DW_UT_compile;
+ break;
+ case rcuh_kind::TYPE:
+ cu_header->unit_type = DW_UT_type;
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("read_comp_unit_head: invalid section_kind"));
+ }
+ else
+ {
+ cu_header->unit_type = static_cast<enum dwarf_unit_type>
+ (read_1_byte (abfd, info_ptr));
+ info_ptr += 1;
+ switch (cu_header->unit_type)
+ {
+ case DW_UT_compile:
+ if (section_kind != rcuh_kind::COMPILE)
+ error (_("Dwarf Error: wrong unit_type in compilation unit header "
+ "(is DW_UT_compile, should be DW_UT_type) [in module %s]"),
+ filename);
+ break;
+ case DW_UT_type:
+ section_kind = rcuh_kind::TYPE;
+ break;
+ default:
+ error (_("Dwarf Error: wrong unit_type in compilation unit header "
+ "(is %d, should be %d or %d) [in module %s]"),
+ cu_header->unit_type, DW_UT_compile, DW_UT_type, filename);
+ }
+
+ cu_header->addr_size = read_1_byte (abfd, info_ptr);
+ info_ptr += 1;
}
+ cu_header->abbrev_sect_off = (sect_offset) read_offset (abfd, info_ptr,
+ cu_header,
+ &bytes_read);
+ info_ptr += bytes_read;
+ if (cu_header->version < 5)
+ {
+ 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)
+ internal_error (__FILE__, __LINE__,
+ _("read_comp_unit_head: dwarf from non elf file"));
+ cu_header->signed_addr_p = signed_addr;
+
+ if (section_kind == rcuh_kind::TYPE)
+ {
+ LONGEST type_offset;
+
+ cu_header->signature = read_8_bytes (abfd, info_ptr);
+ info_ptr += 8;
+
+ type_offset = read_offset (abfd, info_ptr, cu_header, &bytes_read);
+ info_ptr += bytes_read;
+ cu_header->type_cu_offset_in_tu = (cu_offset) type_offset;
+ if (to_underlying (cu_header->type_cu_offset_in_tu) != type_offset)
+ error (_("Dwarf Error: Too big type_offset in compilation unit "
+ "header (is %s) [in module %s]"), plongest (type_offset),
+ filename);
+ }
+
+ return info_ptr;
}
-\f
-/* Low level DIE reading support. */
-/* Initialize a die_reader_specs struct from a dwarf2_cu struct. */
+/* Helper function that returns the proper abbrev section for
+ THIS_CU. */
-static void
-init_cu_die_reader (struct die_reader_specs *reader,
- struct dwarf2_cu *cu,
- struct dwarf2_section_info *section,
- struct dwo_file *dwo_file)
+static struct dwarf2_section_info *
+get_abbrev_section_for_cu (struct dwarf2_per_cu_data *this_cu)
{
- gdb_assert (section->readin && section->buffer != NULL);
- reader->abfd = get_section_bfd_owner (section);
- reader->cu = cu;
- reader->dwo_file = dwo_file;
- reader->die_section = section;
- reader->buffer = section->buffer;
- reader->buffer_end = section->buffer + section->size;
- reader->comp_dir = NULL;
-}
+ struct dwarf2_section_info *abbrev;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_cu->dwarf2_per_objfile;
-/* Subroutine of init_cutu_and_read_dies to simplify it.
- Read in the rest of a CU/TU top level DIE from DWO_UNIT.
- There's just a lot of work to do, and init_cutu_and_read_dies is big enough
- already.
+ if (this_cu->is_dwz)
+ abbrev = &dwarf2_get_dwz_file (dwarf2_per_objfile)->abbrev;
+ else
+ abbrev = &dwarf2_per_objfile->abbrev;
- STUB_COMP_UNIT_DIE is for the stub DIE, we copy over certain attributes
- from it to the DIE in the DWO. If NULL we are skipping the stub.
- STUB_COMP_DIR is similar to STUB_COMP_UNIT_DIE: When reading a TU directly
- from the DWO file, bypassing the stub, it contains the DW_AT_comp_dir
- attribute of the referencing CU. At most one of STUB_COMP_UNIT_DIE and
- STUB_COMP_DIR may be non-NULL.
- *RESULT_READER,*RESULT_INFO_PTR,*RESULT_COMP_UNIT_DIE,*RESULT_HAS_CHILDREN
- are filled in with the info of the DIE from the DWO file.
- ABBREV_TABLE_PROVIDED is non-zero if the caller of init_cutu_and_read_dies
- provided an abbrev table to use.
- The result is non-zero if a valid (non-dummy) DIE was found. */
+ return abbrev;
+}
-static int
-read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu,
- struct dwo_unit *dwo_unit,
- int abbrev_table_provided,
- struct die_info *stub_comp_unit_die,
- const char *stub_comp_dir,
- struct die_reader_specs *result_reader,
- const gdb_byte **result_info_ptr,
- struct die_info **result_comp_unit_die,
- int *result_has_children)
+/* Subroutine of read_and_check_comp_unit_head and
+ read_and_check_type_unit_head to simplify them.
+ Perform various error checking on the header. */
+
+static void
+error_check_comp_unit_head (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct comp_unit_head *header,
+ struct dwarf2_section_info *section,
+ struct dwarf2_section_info *abbrev_section)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_cu *cu = this_cu->cu;
- struct dwarf2_section_info *section;
- bfd *abfd;
- const gdb_byte *begin_info_ptr, *info_ptr;
- struct attribute *comp_dir, *stmt_list, *low_pc, *high_pc, *ranges;
- int i,num_extra_attrs;
- struct dwarf2_section_info *dwo_abbrev_section;
- struct attribute *attr;
- struct die_info *comp_unit_die;
+ const char *filename = get_section_file_name (section);
- /* At most one of these may be provided. */
- gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) <= 1);
+ if (header->version < 2 || header->version > 5)
+ error (_("Dwarf Error: wrong version in compilation unit header "
+ "(is %d, should be 2, 3, 4 or 5) [in module %s]"), header->version,
+ filename);
- /* These attributes aren't processed until later:
- DW_AT_stmt_list, DW_AT_low_pc, DW_AT_high_pc, DW_AT_ranges.
- DW_AT_comp_dir is used now, to find the DWO file, but it is also
- referenced later. However, these attributes are found in the stub
- which we won't have later. In order to not impose this complication
- on the rest of the code, we read them here and copy them to the
- DWO CU/TU die. */
+ if (to_underlying (header->abbrev_sect_off)
+ >= dwarf2_section_size (dwarf2_per_objfile->objfile, abbrev_section))
+ error (_("Dwarf Error: bad offset (%s) in compilation unit header "
+ "(offset %s + 6) [in module %s]"),
+ sect_offset_str (header->abbrev_sect_off),
+ sect_offset_str (header->sect_off),
+ filename);
- stmt_list = NULL;
- low_pc = NULL;
- high_pc = NULL;
- ranges = NULL;
- comp_dir = NULL;
+ /* Cast to ULONGEST to use 64-bit arithmetic when possible to
+ avoid potential 32-bit overflow. */
+ if (((ULONGEST) header->sect_off + get_cu_length (header))
+ > section->size)
+ error (_("Dwarf Error: bad length (0x%x) in compilation unit header "
+ "(offset %s + 0) [in module %s]"),
+ header->length, sect_offset_str (header->sect_off),
+ filename);
+}
- if (stub_comp_unit_die != NULL)
- {
- /* For TUs in DWO files, the DW_AT_stmt_list attribute lives in the
- DWO file. */
- if (! this_cu->is_debug_types)
- stmt_list = dwarf2_attr (stub_comp_unit_die, DW_AT_stmt_list, cu);
- low_pc = dwarf2_attr (stub_comp_unit_die, DW_AT_low_pc, cu);
- high_pc = dwarf2_attr (stub_comp_unit_die, DW_AT_high_pc, cu);
- ranges = dwarf2_attr (stub_comp_unit_die, DW_AT_ranges, cu);
- comp_dir = dwarf2_attr (stub_comp_unit_die, DW_AT_comp_dir, cu);
+/* Read in a CU/TU header and perform some basic error checking.
+ The contents of the header are stored in HEADER.
+ The result is a pointer to the start of the first DIE. */
- /* There should be a DW_AT_addr_base attribute here (if needed).
- We need the value before we can process DW_FORM_GNU_addr_index. */
- cu->addr_base = 0;
- attr = dwarf2_attr (stub_comp_unit_die, DW_AT_GNU_addr_base, cu);
- if (attr)
- cu->addr_base = DW_UNSND (attr);
+static const gdb_byte *
+read_and_check_comp_unit_head (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct comp_unit_head *header,
+ struct dwarf2_section_info *section,
+ struct dwarf2_section_info *abbrev_section,
+ const gdb_byte *info_ptr,
+ rcuh_kind section_kind)
+{
+ const gdb_byte *beg_of_comp_unit = info_ptr;
- /* There should be a DW_AT_ranges_base attribute here (if needed).
- We need the value before we can process DW_AT_ranges. */
- cu->ranges_base = 0;
- attr = dwarf2_attr (stub_comp_unit_die, DW_AT_GNU_ranges_base, cu);
- if (attr)
- cu->ranges_base = DW_UNSND (attr);
- }
- else if (stub_comp_dir != NULL)
- {
- /* Reconstruct the comp_dir attribute to simplify the code below. */
- comp_dir = XOBNEW (&cu->comp_unit_obstack, struct attribute);
- comp_dir->name = DW_AT_comp_dir;
- comp_dir->form = DW_FORM_string;
- DW_STRING_IS_CANONICAL (comp_dir) = 0;
- DW_STRING (comp_dir) = stub_comp_dir;
- }
+ header->sect_off = (sect_offset) (beg_of_comp_unit - section->buffer);
- /* Set up for reading the DWO CU/TU. */
- cu->dwo_unit = dwo_unit;
- section = dwo_unit->section;
- dwarf2_read_section (objfile, section);
- abfd = get_section_bfd_owner (section);
- begin_info_ptr = info_ptr = (section->buffer
- + to_underlying (dwo_unit->sect_off));
- dwo_abbrev_section = &dwo_unit->dwo_file->sections.abbrev;
- init_cu_die_reader (result_reader, cu, section, dwo_unit->dwo_file);
+ info_ptr = read_comp_unit_head (header, info_ptr, section, section_kind);
- if (this_cu->is_debug_types)
- {
- struct signatured_type *sig_type = (struct signatured_type *) this_cu;
+ header->first_die_cu_offset = (cu_offset) (info_ptr - beg_of_comp_unit);
- info_ptr = read_and_check_comp_unit_head (&cu->header, section,
- dwo_abbrev_section,
- info_ptr, rcuh_kind::TYPE);
- /* This is not an assert because it can be caused by bad debug info. */
- if (sig_type->signature != cu->header.signature)
- {
- error (_("Dwarf Error: signature mismatch %s vs %s while reading"
- " TU at offset 0x%x [in module %s]"),
- hex_string (sig_type->signature),
- hex_string (cu->header.signature),
- to_underlying (dwo_unit->sect_off),
- bfd_get_filename (abfd));
- }
- gdb_assert (dwo_unit->sect_off == cu->header.sect_off);
- /* For DWOs coming from DWP files, we don't know the CU length
- nor the type's offset in the TU until now. */
- dwo_unit->length = get_cu_length (&cu->header);
- dwo_unit->type_offset_in_tu = cu->header.type_cu_offset_in_tu;
+ error_check_comp_unit_head (dwarf2_per_objfile, header, section,
+ abbrev_section);
- /* Establish the type offset that can be used to lookup the type.
- For DWO files, we don't know it until now. */
- sig_type->type_offset_in_section
- = dwo_unit->sect_off + to_underlying (dwo_unit->type_offset_in_tu);
- }
- else
- {
- info_ptr = read_and_check_comp_unit_head (&cu->header, section,
- dwo_abbrev_section,
- info_ptr, rcuh_kind::COMPILE);
- gdb_assert (dwo_unit->sect_off == cu->header.sect_off);
- /* For DWOs coming from DWP files, we don't know the CU length
- until now. */
- dwo_unit->length = get_cu_length (&cu->header);
- }
+ return info_ptr;
+}
- /* Replace the CU's original abbrev table with the DWO's.
- Reminder: We can't read the abbrev table until we've read the header. */
- if (abbrev_table_provided)
- {
- /* Don't free the provided abbrev table, the caller of
- init_cutu_and_read_dies owns it. */
- dwarf2_read_abbrevs (cu, dwo_abbrev_section);
- /* Ensure the DWO abbrev table gets freed. */
- make_cleanup (dwarf2_free_abbrev_table, cu);
- }
- else
- {
- dwarf2_free_abbrev_table (cu);
- dwarf2_read_abbrevs (cu, dwo_abbrev_section);
- /* Leave any existing abbrev table cleanup as is. */
- }
+/* Fetch the abbreviation table offset from a comp or type unit header. */
- /* Read in the die, but leave space to copy over the attributes
- from the stub. This has the benefit of simplifying the rest of
- the code - all the work to maintain the illusion of a single
- DW_TAG_{compile,type}_unit DIE is done here. */
- num_extra_attrs = ((stmt_list != NULL)
- + (low_pc != NULL)
- + (high_pc != NULL)
- + (ranges != NULL)
- + (comp_dir != NULL));
- info_ptr = read_full_die_1 (result_reader, result_comp_unit_die, info_ptr,
- result_has_children, num_extra_attrs);
+static sect_offset
+read_abbrev_offset (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ sect_offset sect_off)
+{
+ bfd *abfd = get_section_bfd_owner (section);
+ const gdb_byte *info_ptr;
+ unsigned int initial_length_size, offset_size;
+ uint16_t version;
- /* Copy over the attributes from the stub to the DIE we just read in. */
- comp_unit_die = *result_comp_unit_die;
- i = comp_unit_die->num_attrs;
- if (stmt_list != NULL)
- comp_unit_die->attrs[i++] = *stmt_list;
- if (low_pc != NULL)
- comp_unit_die->attrs[i++] = *low_pc;
- if (high_pc != NULL)
- comp_unit_die->attrs[i++] = *high_pc;
- if (ranges != NULL)
- comp_unit_die->attrs[i++] = *ranges;
- if (comp_dir != NULL)
- comp_unit_die->attrs[i++] = *comp_dir;
- comp_unit_die->num_attrs += num_extra_attrs;
+ dwarf2_read_section (dwarf2_per_objfile->objfile, section);
+ info_ptr = section->buffer + to_underlying (sect_off);
+ read_initial_length (abfd, info_ptr, &initial_length_size);
+ offset_size = initial_length_size == 4 ? 4 : 8;
+ info_ptr += initial_length_size;
- if (dwarf_die_debug)
+ version = read_2_bytes (abfd, info_ptr);
+ info_ptr += 2;
+ if (version >= 5)
{
- fprintf_unfiltered (gdb_stdlog,
- "Read die from %s@0x%x of %s:\n",
- get_section_name (section),
- (unsigned) (begin_info_ptr - section->buffer),
- bfd_get_filename (abfd));
- dump_die (comp_unit_die, dwarf_die_debug);
+ /* Skip unit type and address size. */
+ info_ptr += 2;
}
- /* Save the comp_dir attribute. If there is no DWP file then we'll read
- TUs by skipping the stub and going directly to the entry in the DWO file.
- However, skipping the stub means we won't get DW_AT_comp_dir, so we have
- to get it via circuitous means. Blech. */
- if (comp_dir != NULL)
- result_reader->comp_dir = DW_STRING (comp_dir);
-
- /* Skip dummy compilation units. */
- if (info_ptr >= begin_info_ptr + dwo_unit->length
- || peek_abbrev_code (abfd, info_ptr) == 0)
- return 0;
-
- *result_info_ptr = info_ptr;
- return 1;
+ return (sect_offset) read_offset_1 (abfd, info_ptr, offset_size);
}
-/* Subroutine of init_cutu_and_read_dies to simplify it.
- Look up the DWO unit specified by COMP_UNIT_DIE of THIS_CU.
- Returns NULL if the specified DWO unit cannot be found. */
+/* Allocate a new partial symtab for file named NAME and mark this new
+ partial symtab as being an include of PST. */
-static struct dwo_unit *
-lookup_dwo_unit (struct dwarf2_per_cu_data *this_cu,
- struct die_info *comp_unit_die)
+static void
+dwarf2_create_include_psymtab (const char *name, struct partial_symtab *pst,
+ struct objfile *objfile)
{
- struct dwarf2_cu *cu = this_cu->cu;
- ULONGEST signature;
- struct dwo_unit *dwo_unit;
- const char *comp_dir, *dwo_name;
-
- gdb_assert (cu != NULL);
-
- /* Yeah, we look dwo_name up again, but it simplifies the code. */
- dwo_name = dwarf2_string_attr (comp_unit_die, DW_AT_GNU_dwo_name, cu);
- comp_dir = dwarf2_string_attr (comp_unit_die, DW_AT_comp_dir, cu);
+ struct partial_symtab *subpst = allocate_psymtab (name, objfile);
- if (this_cu->is_debug_types)
+ if (!IS_ABSOLUTE_PATH (subpst->filename))
{
- struct signatured_type *sig_type;
-
- /* Since this_cu is the first member of struct signatured_type,
- we can go from a pointer to one to a pointer to the other. */
- sig_type = (struct signatured_type *) this_cu;
- signature = sig_type->signature;
- dwo_unit = lookup_dwo_type_unit (sig_type, dwo_name, comp_dir);
+ /* It shares objfile->objfile_obstack. */
+ subpst->dirname = pst->dirname;
}
- else
- {
- struct attribute *attr;
- attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_id, cu);
- if (! attr)
- error (_("Dwarf Error: missing dwo_id for dwo_name %s"
- " [in module %s]"),
- dwo_name, objfile_name (this_cu->objfile));
- signature = DW_UNSND (attr);
- dwo_unit = lookup_dwo_comp_unit (this_cu, dwo_name, comp_dir,
- signature);
- }
+ subpst->textlow = 0;
+ subpst->texthigh = 0;
- return dwo_unit;
-}
+ subpst->dependencies
+ = XOBNEW (&objfile->objfile_obstack, struct partial_symtab *);
+ subpst->dependencies[0] = pst;
+ subpst->number_of_dependencies = 1;
-/* Subroutine of init_cutu_and_read_dies to simplify it.
- See it for a description of the parameters.
- Read a TU directly from a DWO file, bypassing the stub.
+ subpst->globals_offset = 0;
+ subpst->n_global_syms = 0;
+ subpst->statics_offset = 0;
+ subpst->n_static_syms = 0;
+ subpst->compunit_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. */
+ subpst->read_symtab_private = NULL;
+}
- Note: This function could be a little bit simpler if we shared cleanups
- with our caller, init_cutu_and_read_dies. That's generally a fragile thing
- to do, so we keep this function self-contained. Or we could move this
- into our caller, but it's complex enough already. */
+/* 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. */
static void
-init_tu_and_read_dwo_dies (struct dwarf2_per_cu_data *this_cu,
- int use_existing_cu, int keep,
- die_reader_func_ftype *die_reader_func,
- void *data)
+dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
+ struct die_info *die,
+ struct partial_symtab *pst)
{
- struct dwarf2_cu *cu;
- struct signatured_type *sig_type;
- struct cleanup *cleanups, *free_cu_cleanup = NULL;
- struct die_reader_specs reader;
- const gdb_byte *info_ptr;
- struct die_info *comp_unit_die;
- int has_children;
-
- /* Verify we can do the following downcast, and that we have the
- data we need. */
- gdb_assert (this_cu->is_debug_types && this_cu->reading_dwo_directly);
- sig_type = (struct signatured_type *) this_cu;
- gdb_assert (sig_type->dwo_unit != NULL);
-
- cleanups = make_cleanup (null_cleanup, NULL);
+ line_header_up lh;
+ struct attribute *attr;
- if (use_existing_cu && this_cu->cu != NULL)
- {
- gdb_assert (this_cu->cu->dwo_unit == sig_type->dwo_unit);
- cu = this_cu->cu;
- /* There's no need to do the rereading_dwo_cu handling that
- init_cutu_and_read_dies does since we don't read the stub. */
- }
- else
- {
- /* If !use_existing_cu, this_cu->cu must be NULL. */
- gdb_assert (this_cu->cu == NULL);
- cu = XNEW (struct dwarf2_cu);
- init_one_comp_unit (cu, this_cu);
- /* If an error occurs while loading, release our storage. */
- free_cu_cleanup = make_cleanup (free_heap_comp_unit, cu);
- }
+ attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
+ if (attr)
+ lh = dwarf_decode_line_header ((sect_offset) DW_UNSND (attr), cu);
+ if (lh == NULL)
+ return; /* No linetable, so no includes. */
- /* A future optimization, if needed, would be to use an existing
- abbrev table. When reading DWOs with skeletonless TUs, all the TUs
- could share abbrev tables. */
+ /* NOTE: pst->dirname is DW_AT_comp_dir (if present). */
+ dwarf_decode_lines (lh.get (), pst->dirname, cu, pst, pst->textlow, 1);
+}
- if (read_cutu_die_from_dwo (this_cu, sig_type->dwo_unit,
- 0 /* abbrev_table_provided */,
- NULL /* stub_comp_unit_die */,
- sig_type->dwo_unit->dwo_file->comp_dir,
- &reader, &info_ptr,
- &comp_unit_die, &has_children) == 0)
- {
- /* Dummy die. */
- do_cleanups (cleanups);
- return;
- }
+static hashval_t
+hash_signatured_type (const void *item)
+{
+ const struct signatured_type *sig_type
+ = (const struct signatured_type *) item;
- /* All the "real" work is done here. */
- die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
+ /* This drops the top 32 bits of the signature, but is ok for a hash. */
+ return sig_type->signature;
+}
- /* This duplicates the code in init_cutu_and_read_dies,
- but the alternative is making the latter more complex.
- This function is only for the special case of using DWO files directly:
- no point in overly complicating the general case just to handle this. */
- if (free_cu_cleanup != NULL)
- {
- if (keep)
- {
- /* We've successfully allocated this compilation unit. Let our
- caller clean it up when finished with it. */
- discard_cleanups (free_cu_cleanup);
+static int
+eq_signatured_type (const void *item_lhs, const void *item_rhs)
+{
+ const struct signatured_type *lhs = (const struct signatured_type *) item_lhs;
+ const struct signatured_type *rhs = (const struct signatured_type *) item_rhs;
- /* We can only discard free_cu_cleanup and all subsequent cleanups.
- So we have to manually free the abbrev table. */
- dwarf2_free_abbrev_table (cu);
+ return lhs->signature == rhs->signature;
+}
- /* Link this CU into read_in_chain. */
- this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
- dwarf2_per_objfile->read_in_chain = this_cu;
- }
- else
- do_cleanups (free_cu_cleanup);
- }
+/* Allocate a hash table for signatured types. */
- do_cleanups (cleanups);
+static htab_t
+allocate_signatured_type_table (struct objfile *objfile)
+{
+ return htab_create_alloc_ex (41,
+ hash_signatured_type,
+ eq_signatured_type,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
}
-/* Initialize a CU (or TU) and read its DIEs.
- If the CU defers to a DWO file, read the DWO file as well.
+/* A helper function to add a signatured type CU to a table. */
- ABBREV_TABLE, if non-NULL, is the abbreviation table to use.
- Otherwise the table specified in the comp unit header is read in and used.
- This is an optimization for when we already have the abbrev table.
+static int
+add_signatured_type_cu_to_table (void **slot, void *datum)
+{
+ struct signatured_type *sigt = (struct signatured_type *) *slot;
+ std::vector<signatured_type *> *all_type_units
+ = (std::vector<signatured_type *> *) datum;
- If USE_EXISTING_CU is non-zero, and THIS_CU->cu is non-NULL, then use it.
- Otherwise, a new CU is allocated with xmalloc.
+ all_type_units->push_back (sigt);
- If KEEP is non-zero, then if we allocated a dwarf2_cu we add it to
- read_in_chain. Otherwise the dwarf2_cu data is freed at the end.
+ return 1;
+}
- WARNING: If THIS_CU is a "dummy CU" (used as filler by the incremental
- linker) then DIE_READER_FUNC will not get called. */
+/* A helper for create_debug_types_hash_table. Read types from SECTION
+ and fill them into TYPES_HTAB. It will process only type units,
+ therefore DW_UT_type. */
static void
-init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
- struct abbrev_table *abbrev_table,
- int use_existing_cu, int keep,
- die_reader_func_ftype *die_reader_func,
- void *data)
+create_debug_type_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwo_file *dwo_file,
+ dwarf2_section_info *section, htab_t &types_htab,
+ rcuh_kind section_kind)
{
struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_section_info *section = this_cu->section;
- bfd *abfd = get_section_bfd_owner (section);
- struct dwarf2_cu *cu;
- const gdb_byte *begin_info_ptr, *info_ptr;
- struct die_reader_specs reader;
- struct die_info *comp_unit_die;
- int has_children;
- struct attribute *attr;
- struct cleanup *cleanups, *free_cu_cleanup = NULL;
- struct signatured_type *sig_type = NULL;
struct dwarf2_section_info *abbrev_section;
- /* Non-zero if CU currently points to a DWO file and we need to
- reread it. When this happens we need to reread the skeleton die
- before we can reread the DWO file (this only applies to CUs, not TUs). */
- int rereading_dwo_cu = 0;
-
- if (dwarf_die_debug)
- fprintf_unfiltered (gdb_stdlog, "Reading %s unit at offset 0x%x\n",
- this_cu->is_debug_types ? "type" : "comp",
- to_underlying (this_cu->sect_off));
-
- if (use_existing_cu)
- gdb_assert (keep);
+ bfd *abfd;
+ const gdb_byte *info_ptr, *end_ptr;
- /* If we're reading a TU directly from a DWO file, including a virtual DWO
- file (instead of going through the stub), short-circuit all of this. */
- if (this_cu->reading_dwo_directly)
- {
- /* Narrow down the scope of possibilities to have to understand. */
- gdb_assert (this_cu->is_debug_types);
- gdb_assert (abbrev_table == NULL);
- init_tu_and_read_dwo_dies (this_cu, use_existing_cu, keep,
- die_reader_func, data);
- return;
- }
+ abbrev_section = (dwo_file != NULL
+ ? &dwo_file->sections.abbrev
+ : &dwarf2_per_objfile->abbrev);
- cleanups = make_cleanup (null_cleanup, NULL);
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n",
+ get_section_name (section),
+ get_section_file_name (abbrev_section));
- /* This is cheap if the section is already read in. */
dwarf2_read_section (objfile, section);
+ info_ptr = section->buffer;
- begin_info_ptr = info_ptr = section->buffer + to_underlying (this_cu->sect_off);
+ if (info_ptr == NULL)
+ return;
- abbrev_section = get_abbrev_section_for_cu (this_cu);
+ /* We can't set abfd until now because the section may be empty or
+ not present, in which case the bfd is unknown. */
+ abfd = get_section_bfd_owner (section);
- if (use_existing_cu && this_cu->cu != NULL)
- {
- cu = this_cu->cu;
- /* If this CU is from a DWO file we need to start over, we need to
- refetch the attributes from the skeleton CU.
- This could be optimized by retrieving those attributes from when we
- were here the first time: the previous comp_unit_die was stored in
- comp_unit_obstack. But there's no data yet that we need this
- optimization. */
- if (cu->dwo_unit != NULL)
- rereading_dwo_cu = 1;
- }
- else
- {
- /* If !use_existing_cu, this_cu->cu must be NULL. */
- gdb_assert (this_cu->cu == NULL);
- cu = XNEW (struct dwarf2_cu);
- init_one_comp_unit (cu, this_cu);
- /* If an error occurs while loading, release our storage. */
- free_cu_cleanup = make_cleanup (free_heap_comp_unit, cu);
- }
+ /* We don't use init_cutu_and_read_dies_simple, or some such, here
+ because we don't need to read any dies: the signature is in the
+ header. */
- /* Get the header. */
- if (to_underlying (cu->header.first_die_cu_offset) != 0 && !rereading_dwo_cu)
- {
- /* We already have the header, there's no need to read it in again. */
- info_ptr += to_underlying (cu->header.first_die_cu_offset);
- }
- else
+ end_ptr = info_ptr + section->size;
+ while (info_ptr < end_ptr)
{
- if (this_cu->is_debug_types)
- {
- info_ptr = read_and_check_comp_unit_head (&cu->header, section,
- abbrev_section, info_ptr,
- rcuh_kind::TYPE);
-
- /* Since per_cu is the first member of struct signatured_type,
- we can go from a pointer to one to a pointer to the other. */
- sig_type = (struct signatured_type *) this_cu;
- gdb_assert (sig_type->signature == cu->header.signature);
- gdb_assert (sig_type->type_offset_in_tu
- == cu->header.type_cu_offset_in_tu);
- gdb_assert (this_cu->sect_off == cu->header.sect_off);
-
- /* LENGTH has not been set yet for type units if we're
- using .gdb_index. */
- this_cu->length = get_cu_length (&cu->header);
-
- /* Establish the type offset that can be used to lookup the type. */
- sig_type->type_offset_in_section =
- this_cu->sect_off + to_underlying (sig_type->type_offset_in_tu);
+ struct signatured_type *sig_type;
+ struct dwo_unit *dwo_tu;
+ void **slot;
+ const gdb_byte *ptr = info_ptr;
+ struct comp_unit_head header;
+ unsigned int length;
- this_cu->dwarf_version = cu->header.version;
- }
- else
- {
- info_ptr = read_and_check_comp_unit_head (&cu->header, section,
- abbrev_section,
- info_ptr,
- rcuh_kind::COMPILE);
+ sect_offset sect_off = (sect_offset) (ptr - section->buffer);
- gdb_assert (this_cu->sect_off == cu->header.sect_off);
- gdb_assert (this_cu->length == get_cu_length (&cu->header));
- this_cu->dwarf_version = cu->header.version;
- }
- }
+ /* Initialize it due to a false compiler warning. */
+ header.signature = -1;
+ header.type_cu_offset_in_tu = (cu_offset) -1;
- /* Skip dummy compilation units. */
- if (info_ptr >= begin_info_ptr + this_cu->length
- || peek_abbrev_code (abfd, info_ptr) == 0)
- {
- do_cleanups (cleanups);
- return;
- }
+ /* We need to read the type's signature in order to build the hash
+ table, but we don't need anything else just yet. */
- /* If we don't have them yet, read the abbrevs for this compilation unit.
- And if we need to read them now, make sure they're freed when we're
- done. Note that it's important that if the CU had an abbrev table
- on entry we don't free it when we're done: Somewhere up the call stack
- it may be in use. */
- if (abbrev_table != NULL)
- {
- gdb_assert (cu->abbrev_table == NULL);
- gdb_assert (cu->header.abbrev_sect_off == abbrev_table->sect_off);
- cu->abbrev_table = abbrev_table;
- }
- else if (cu->abbrev_table == NULL)
- {
- dwarf2_read_abbrevs (cu, abbrev_section);
- make_cleanup (dwarf2_free_abbrev_table, cu);
- }
- else if (rereading_dwo_cu)
- {
- dwarf2_free_abbrev_table (cu);
- dwarf2_read_abbrevs (cu, abbrev_section);
- }
+ ptr = read_and_check_comp_unit_head (dwarf2_per_objfile, &header, section,
+ abbrev_section, ptr, section_kind);
- /* Read the top level CU/TU die. */
- init_cu_die_reader (&reader, cu, section, NULL);
- info_ptr = read_full_die (&reader, &comp_unit_die, info_ptr, &has_children);
+ length = get_cu_length (&header);
- /* If we are in a DWO stub, process it and then read in the "real" CU/TU
- from the DWO file.
- Note that if USE_EXISTING_OK != 0, and THIS_CU->cu already contains a
- DWO CU, that this test will fail (the attribute will not be present). */
- attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_name, cu);
- if (attr)
- {
- struct dwo_unit *dwo_unit;
- struct die_info *dwo_comp_unit_die;
+ /* Skip dummy type units. */
+ if (ptr >= info_ptr + length
+ || peek_abbrev_code (abfd, ptr) == 0
+ || header.unit_type != DW_UT_type)
+ {
+ info_ptr += length;
+ continue;
+ }
- if (has_children)
+ if (types_htab == NULL)
{
- complaint (&symfile_complaints,
- _("compilation unit with DW_AT_GNU_dwo_name"
- " has children (offset 0x%x) [in module %s]"),
- to_underlying (this_cu->sect_off), bfd_get_filename (abfd));
+ if (dwo_file)
+ types_htab = allocate_dwo_unit_table (objfile);
+ else
+ types_htab = allocate_signatured_type_table (objfile);
}
- dwo_unit = lookup_dwo_unit (this_cu, comp_unit_die);
- if (dwo_unit != NULL)
+
+ if (dwo_file)
{
- if (read_cutu_die_from_dwo (this_cu, dwo_unit,
- abbrev_table != NULL,
- comp_unit_die, NULL,
- &reader, &info_ptr,
- &dwo_comp_unit_die, &has_children) == 0)
- {
- /* Dummy die. */
- do_cleanups (cleanups);
- return;
- }
- comp_unit_die = dwo_comp_unit_die;
+ sig_type = NULL;
+ dwo_tu = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwo_unit);
+ dwo_tu->dwo_file = dwo_file;
+ dwo_tu->signature = header.signature;
+ dwo_tu->type_offset_in_tu = header.type_cu_offset_in_tu;
+ dwo_tu->section = section;
+ dwo_tu->sect_off = sect_off;
+ dwo_tu->length = length;
}
else
{
- /* Yikes, we couldn't find the rest of the DIE, we only have
- the stub. A complaint has already been logged. There's
- not much more we can do except pass on the stub DIE to
- die_reader_func. We don't want to throw an error on bad
- debug info. */
+ /* N.B.: type_offset is not usable if this type uses a DWO file.
+ The real type_offset is in the DWO file. */
+ dwo_tu = NULL;
+ sig_type = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct signatured_type);
+ sig_type->signature = header.signature;
+ sig_type->type_offset_in_tu = header.type_cu_offset_in_tu;
+ sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
+ sig_type->per_cu.is_debug_types = 1;
+ sig_type->per_cu.section = section;
+ sig_type->per_cu.sect_off = sect_off;
+ sig_type->per_cu.length = length;
}
- }
-
- /* All of the above is setup for this call. Yikes. */
- die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
- /* Done, clean up. */
- if (free_cu_cleanup != NULL)
- {
- if (keep)
+ slot = htab_find_slot (types_htab,
+ dwo_file ? (void*) dwo_tu : (void *) sig_type,
+ INSERT);
+ gdb_assert (slot != NULL);
+ if (*slot != NULL)
{
- /* We've successfully allocated this compilation unit. Let our
- caller clean it up when finished with it. */
- discard_cleanups (free_cu_cleanup);
+ sect_offset dup_sect_off;
+
+ if (dwo_file)
+ {
+ const struct dwo_unit *dup_tu
+ = (const struct dwo_unit *) *slot;
+
+ dup_sect_off = dup_tu->sect_off;
+ }
+ else
+ {
+ const struct signatured_type *dup_tu
+ = (const struct signatured_type *) *slot;
- /* We can only discard free_cu_cleanup and all subsequent cleanups.
- So we have to manually free the abbrev table. */
- dwarf2_free_abbrev_table (cu);
+ dup_sect_off = dup_tu->per_cu.sect_off;
+ }
- /* Link this CU into read_in_chain. */
- this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
- dwarf2_per_objfile->read_in_chain = this_cu;
+ complaint (_("debug type entry at offset %s is duplicate to"
+ " the entry at offset %s, signature %s"),
+ sect_offset_str (sect_off), sect_offset_str (dup_sect_off),
+ hex_string (header.signature));
}
- else
- do_cleanups (free_cu_cleanup);
- }
+ *slot = dwo_file ? (void *) dwo_tu : (void *) sig_type;
+
+ if (dwarf_read_debug > 1)
+ fprintf_unfiltered (gdb_stdlog, " offset %s, signature %s\n",
+ sect_offset_str (sect_off),
+ hex_string (header.signature));
- do_cleanups (cleanups);
+ info_ptr += length;
+ }
}
-/* Read CU/TU THIS_CU but do not follow DW_AT_GNU_dwo_name if present.
- DWO_FILE, if non-NULL, is the DWO file to read (the caller is assumed
- to have already done the lookup to find the DWO file).
-
- The caller is required to fill in THIS_CU->section, THIS_CU->offset, and
- THIS_CU->is_debug_types, but nothing else.
-
- We fill in THIS_CU->length.
+/* Create the hash table of all entries in the .debug_types
+ (or .debug_types.dwo) section(s).
+ If reading a DWO file, then DWO_FILE is a pointer to the DWO file object,
+ otherwise it is NULL.
- WARNING: If THIS_CU is a "dummy CU" (used as filler by the incremental
- linker) then DIE_READER_FUNC will not get called.
+ The result is a pointer to the hash table or NULL if there are no types.
- THIS_CU->cu is always freed when done.
- This is done in order to not leave THIS_CU->cu in a state where we have
- to care whether it refers to the "main" CU or the DWO CU. */
+ Note: This function processes DWO files only, not DWP files. */
static void
-init_cutu_and_read_dies_no_follow (struct dwarf2_per_cu_data *this_cu,
- struct dwo_file *dwo_file,
- die_reader_func_ftype *die_reader_func,
- void *data)
+create_debug_types_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwo_file *dwo_file,
+ VEC (dwarf2_section_info_def) *types,
+ htab_t &types_htab)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_section_info *section = this_cu->section;
- bfd *abfd = get_section_bfd_owner (section);
- struct dwarf2_section_info *abbrev_section;
- struct dwarf2_cu cu;
- const gdb_byte *begin_info_ptr, *info_ptr;
- struct die_reader_specs reader;
- struct cleanup *cleanups;
- struct die_info *comp_unit_die;
- int has_children;
-
- if (dwarf_die_debug)
- fprintf_unfiltered (gdb_stdlog, "Reading %s unit at offset 0x%x\n",
- this_cu->is_debug_types ? "type" : "comp",
- to_underlying (this_cu->sect_off));
-
- gdb_assert (this_cu->cu == NULL);
-
- abbrev_section = (dwo_file != NULL
- ? &dwo_file->sections.abbrev
- : get_abbrev_section_for_cu (this_cu));
-
- /* This is cheap if the section is already read in. */
- dwarf2_read_section (objfile, section);
+ int ix;
+ struct dwarf2_section_info *section;
- init_one_comp_unit (&cu, this_cu);
+ if (VEC_empty (dwarf2_section_info_def, types))
+ return;
- cleanups = make_cleanup (free_stack_comp_unit, &cu);
+ for (ix = 0;
+ VEC_iterate (dwarf2_section_info_def, types, ix, section);
+ ++ix)
+ create_debug_type_hash_table (dwarf2_per_objfile, dwo_file, section,
+ types_htab, rcuh_kind::TYPE);
+}
- begin_info_ptr = info_ptr = section->buffer + to_underlying (this_cu->sect_off);
- info_ptr = read_and_check_comp_unit_head (&cu.header, section,
- abbrev_section, info_ptr,
- (this_cu->is_debug_types
- ? rcuh_kind::TYPE
- : rcuh_kind::COMPILE));
+/* Create the hash table of all entries in the .debug_types section,
+ and initialize all_type_units.
+ The result is zero if there is an error (e.g. missing .debug_types section),
+ otherwise non-zero. */
- this_cu->length = get_cu_length (&cu.header);
+static int
+create_all_type_units (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ htab_t types_htab = NULL;
- /* Skip dummy compilation units. */
- if (info_ptr >= begin_info_ptr + this_cu->length
- || peek_abbrev_code (abfd, info_ptr) == 0)
+ create_debug_type_hash_table (dwarf2_per_objfile, NULL,
+ &dwarf2_per_objfile->info, types_htab,
+ rcuh_kind::COMPILE);
+ create_debug_types_hash_table (dwarf2_per_objfile, NULL,
+ dwarf2_per_objfile->types, types_htab);
+ if (types_htab == NULL)
{
- do_cleanups (cleanups);
- return;
+ dwarf2_per_objfile->signatured_types = NULL;
+ return 0;
}
- dwarf2_read_abbrevs (&cu, abbrev_section);
- make_cleanup (dwarf2_free_abbrev_table, &cu);
-
- init_cu_die_reader (&reader, &cu, section, dwo_file);
- info_ptr = read_full_die (&reader, &comp_unit_die, info_ptr, &has_children);
-
- die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
-
- do_cleanups (cleanups);
-}
+ dwarf2_per_objfile->signatured_types = types_htab;
-/* Read a CU/TU, except that this does not look for DW_AT_GNU_dwo_name and
- does not lookup the specified DWO file.
- This cannot be used to read DWO files.
+ gdb_assert (dwarf2_per_objfile->all_type_units.empty ());
+ dwarf2_per_objfile->all_type_units.reserve (htab_elements (types_htab));
- THIS_CU->cu is always freed when done.
- This is done in order to not leave THIS_CU->cu in a state where we have
- to care whether it refers to the "main" CU or the DWO CU.
- We can revisit this if the data shows there's a performance issue. */
+ htab_traverse_noresize (types_htab, add_signatured_type_cu_to_table,
+ &dwarf2_per_objfile->all_type_units);
-static void
-init_cutu_and_read_dies_simple (struct dwarf2_per_cu_data *this_cu,
- die_reader_func_ftype *die_reader_func,
- void *data)
-{
- init_cutu_and_read_dies_no_follow (this_cu, NULL, die_reader_func, data);
+ return 1;
}
-\f
-/* Type Unit Groups.
- Type Unit Groups are a way to collapse the set of all TUs (type units) into
- a more manageable set. The grouping is done by DW_AT_stmt_list entry
- so that all types coming from the same compilation (.o file) are grouped
- together. A future step could be to put the types in the same symtab as
- the CU the types ultimately came from. */
+/* Add an entry for signature SIG to dwarf2_per_objfile->signatured_types.
+ If SLOT is non-NULL, it is the entry to use in the hash table.
+ Otherwise we find one. */
-static hashval_t
-hash_type_unit_group (const void *item)
+static struct signatured_type *
+add_type_unit (struct dwarf2_per_objfile *dwarf2_per_objfile, ULONGEST sig,
+ void **slot)
{
- const struct type_unit_group *tu_group
- = (const struct type_unit_group *) item;
-
- return hash_stmt_list_entry (&tu_group->hash);
-}
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
-static int
-eq_type_unit_group (const void *item_lhs, const void *item_rhs)
-{
- const struct type_unit_group *lhs = (const struct type_unit_group *) item_lhs;
- const struct type_unit_group *rhs = (const struct type_unit_group *) item_rhs;
+ if (dwarf2_per_objfile->all_type_units.size ()
+ == dwarf2_per_objfile->all_type_units.capacity ())
+ ++dwarf2_per_objfile->tu_stats.nr_all_type_units_reallocs;
- return eq_stmt_list_entry (&lhs->hash, &rhs->hash);
-}
+ signatured_type *sig_type = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct signatured_type);
-/* Allocate a hash table for type unit groups. */
+ dwarf2_per_objfile->all_type_units.push_back (sig_type);
+ sig_type->signature = sig;
+ sig_type->per_cu.is_debug_types = 1;
+ if (dwarf2_per_objfile->using_index)
+ {
+ sig_type->per_cu.v.quick =
+ OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_quick_data);
+ }
-static htab_t
-allocate_type_unit_groups_table (void)
-{
- return htab_create_alloc_ex (3,
- hash_type_unit_group,
- eq_type_unit_group,
- NULL,
- &dwarf2_per_objfile->objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ if (slot == NULL)
+ {
+ slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
+ sig_type, INSERT);
+ }
+ gdb_assert (*slot == NULL);
+ *slot = sig_type;
+ /* The rest of sig_type must be filled in by the caller. */
+ return sig_type;
}
-/* Type units that don't have DW_AT_stmt_list are grouped into their own
- partial symtabs. We combine several TUs per psymtab to not let the size
- of any one psymtab grow too big. */
-#define NO_STMT_LIST_TYPE_UNIT_PSYMTAB (1 << 31)
-#define NO_STMT_LIST_TYPE_UNIT_PSYMTAB_SIZE 10
-
-/* Helper routine for get_type_unit_group.
- Create the type_unit_group object used to hold one or more TUs. */
+/* Subroutine of lookup_dwo_signatured_type and lookup_dwp_signatured_type.
+ Fill in SIG_ENTRY with DWO_ENTRY. */
-static struct type_unit_group *
-create_type_unit_group (struct dwarf2_cu *cu, sect_offset line_offset_struct)
+static void
+fill_in_sig_entry_from_dwo_entry (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct signatured_type *sig_entry,
+ struct dwo_unit *dwo_entry)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_per_cu_data *per_cu;
- struct type_unit_group *tu_group;
-
- tu_group = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct type_unit_group);
- per_cu = &tu_group->per_cu;
- per_cu->objfile = objfile;
-
+ /* Make sure we're not clobbering something we don't expect to. */
+ gdb_assert (! sig_entry->per_cu.queued);
+ gdb_assert (sig_entry->per_cu.cu == NULL);
if (dwarf2_per_objfile->using_index)
{
- per_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_quick_data);
+ gdb_assert (sig_entry->per_cu.v.quick != NULL);
+ gdb_assert (sig_entry->per_cu.v.quick->compunit_symtab == NULL);
}
else
- {
- unsigned int line_offset = to_underlying (line_offset_struct);
- struct partial_symtab *pst;
- char *name;
-
- /* Give the symtab a useful name for debug purposes. */
- if ((line_offset & NO_STMT_LIST_TYPE_UNIT_PSYMTAB) != 0)
- name = xstrprintf ("<type_units_%d>",
- (line_offset & ~NO_STMT_LIST_TYPE_UNIT_PSYMTAB));
- else
- name = xstrprintf ("<type_units_at_0x%x>", line_offset);
-
- pst = create_partial_symtab (per_cu, name);
- pst->anonymous = 1;
-
- xfree (name);
- }
-
- tu_group->hash.dwo_unit = cu->dwo_unit;
- tu_group->hash.line_sect_off = line_offset_struct;
+ gdb_assert (sig_entry->per_cu.v.psymtab == NULL);
+ gdb_assert (sig_entry->signature == dwo_entry->signature);
+ gdb_assert (to_underlying (sig_entry->type_offset_in_section) == 0);
+ gdb_assert (sig_entry->type_unit_group == NULL);
+ gdb_assert (sig_entry->dwo_unit == NULL);
- return tu_group;
+ sig_entry->per_cu.section = dwo_entry->section;
+ sig_entry->per_cu.sect_off = dwo_entry->sect_off;
+ sig_entry->per_cu.length = dwo_entry->length;
+ sig_entry->per_cu.reading_dwo_directly = 1;
+ sig_entry->per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
+ sig_entry->type_offset_in_tu = dwo_entry->type_offset_in_tu;
+ sig_entry->dwo_unit = dwo_entry;
}
-/* Look up the type_unit_group for type unit CU, and create it if necessary.
- STMT_LIST is a DW_AT_stmt_list attribute. */
+/* Subroutine of lookup_signatured_type.
+ If we haven't read the TU yet, create the signatured_type data structure
+ for a TU to be read in directly from a DWO file, bypassing the stub.
+ This is the "Stay in DWO Optimization": When there is no DWP file and we're
+ using .gdb_index, then when reading a CU we want to stay in the DWO file
+ containing that CU. Otherwise we could end up reading several other DWO
+ files (due to comdat folding) to process the transitive closure of all the
+ mentioned TUs, and that can be slow. The current DWO file will have every
+ type signature that it needs.
+ We only do this for .gdb_index because in the psymtab case we already have
+ to read all the DWOs to build the type unit groups. */
-static struct type_unit_group *
-get_type_unit_group (struct dwarf2_cu *cu, const struct attribute *stmt_list)
+static struct signatured_type *
+lookup_dwo_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
{
- struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
- struct type_unit_group *tu_group;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwo_file *dwo_file;
+ struct dwo_unit find_dwo_entry, *dwo_entry;
+ struct signatured_type find_sig_entry, *sig_entry;
void **slot;
- unsigned int line_offset;
- struct type_unit_group type_unit_group_for_lookup;
- if (dwarf2_per_objfile->type_unit_groups == NULL)
+ gdb_assert (cu->dwo_unit && dwarf2_per_objfile->using_index);
+
+ /* If TU skeletons have been removed then we may not have read in any
+ TUs yet. */
+ if (dwarf2_per_objfile->signatured_types == NULL)
{
- dwarf2_per_objfile->type_unit_groups =
- allocate_type_unit_groups_table ();
+ dwarf2_per_objfile->signatured_types
+ = allocate_signatured_type_table (objfile);
}
- /* Do we need to create a new group, or can we use an existing one? */
+ /* We only ever need to read in one copy of a signatured type.
+ Use the global signatured_types array to do our own comdat-folding
+ of types. If this is the first time we're reading this TU, and
+ the TU has an entry in .gdb_index, replace the recorded data from
+ .gdb_index with this TU. */
- if (stmt_list)
- {
- line_offset = DW_UNSND (stmt_list);
- ++tu_stats->nr_symtab_sharers;
- }
- else
- {
- /* Ugh, no stmt_list. Rare, but we have to handle it.
- We can do various things here like create one group per TU or
- spread them over multiple groups to split up the expansion work.
- To avoid worst case scenarios (too many groups or too large groups)
- we, umm, group them in bunches. */
- line_offset = (NO_STMT_LIST_TYPE_UNIT_PSYMTAB
- | (tu_stats->nr_stmt_less_type_units
- / NO_STMT_LIST_TYPE_UNIT_PSYMTAB_SIZE));
- ++tu_stats->nr_stmt_less_type_units;
- }
+ find_sig_entry.signature = sig;
+ slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
+ &find_sig_entry, INSERT);
+ sig_entry = (struct signatured_type *) *slot;
- type_unit_group_for_lookup.hash.dwo_unit = cu->dwo_unit;
- type_unit_group_for_lookup.hash.line_sect_off = (sect_offset) line_offset;
- slot = htab_find_slot (dwarf2_per_objfile->type_unit_groups,
- &type_unit_group_for_lookup, INSERT);
- if (*slot != NULL)
- {
- tu_group = (struct type_unit_group *) *slot;
- gdb_assert (tu_group != NULL);
- }
- else
- {
- sect_offset line_offset_struct = (sect_offset) line_offset;
- tu_group = create_type_unit_group (cu, line_offset_struct);
- *slot = tu_group;
- ++tu_stats->nr_symtabs;
- }
+ /* We can get here with the TU already read, *or* in the process of being
+ read. Don't reassign the global entry to point to this DWO if that's
+ the case. Also note that if the TU is already being read, it may not
+ have come from a DWO, the program may be a mix of Fission-compiled
+ code and non-Fission-compiled code. */
- return tu_group;
-}
-\f
-/* Partial symbol tables. */
+ /* Have we already tried to read this TU?
+ Note: sig_entry can be NULL if the skeleton TU was removed (thus it
+ needn't exist in the global table yet). */
+ if (sig_entry != NULL && sig_entry->per_cu.tu_read)
+ return sig_entry;
-/* Create a psymtab named NAME and assign it to PER_CU.
+ /* Note: cu->dwo_unit is the dwo_unit that references this TU, not the
+ dwo_unit of the TU itself. */
+ dwo_file = cu->dwo_unit->dwo_file;
- The caller must fill in the following details:
- dirname, textlow, texthigh. */
+ /* Ok, this is the first time we're reading this TU. */
+ if (dwo_file->tus == NULL)
+ return NULL;
+ find_dwo_entry.signature = sig;
+ dwo_entry = (struct dwo_unit *) htab_find (dwo_file->tus, &find_dwo_entry);
+ if (dwo_entry == NULL)
+ return NULL;
-static struct partial_symtab *
-create_partial_symtab (struct dwarf2_per_cu_data *per_cu, const char *name)
+ /* If the global table doesn't have an entry for this TU, add one. */
+ if (sig_entry == NULL)
+ sig_entry = add_type_unit (dwarf2_per_objfile, sig, slot);
+
+ fill_in_sig_entry_from_dwo_entry (dwarf2_per_objfile, sig_entry, dwo_entry);
+ sig_entry->per_cu.tu_read = 1;
+ return sig_entry;
+}
+
+/* Subroutine of lookup_signatured_type.
+ Look up the type for signature SIG, and if we can't find SIG in .gdb_index
+ then try the DWP file. If the TU stub (skeleton) has been removed then
+ it won't be in .gdb_index. */
+
+static struct signatured_type *
+lookup_dwp_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
{
- struct objfile *objfile = per_cu->objfile;
- struct partial_symtab *pst;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwp_file *dwp_file = get_dwp_file (dwarf2_per_objfile);
+ struct dwo_unit *dwo_entry;
+ struct signatured_type find_sig_entry, *sig_entry;
+ void **slot;
- pst = start_psymtab_common (objfile, name, 0,
- objfile->global_psymbols,
- objfile->static_psymbols);
+ gdb_assert (cu->dwo_unit && dwarf2_per_objfile->using_index);
+ gdb_assert (dwp_file != NULL);
- pst->psymtabs_addrmap_supported = 1;
+ /* If TU skeletons have been removed then we may not have read in any
+ TUs yet. */
+ if (dwarf2_per_objfile->signatured_types == NULL)
+ {
+ dwarf2_per_objfile->signatured_types
+ = allocate_signatured_type_table (objfile);
+ }
- /* This is the glue that links PST into GDB's symbol API. */
- pst->read_symtab_private = per_cu;
- pst->read_symtab = dwarf2_read_symtab;
- per_cu->v.psymtab = pst;
+ find_sig_entry.signature = sig;
+ slot = htab_find_slot (dwarf2_per_objfile->signatured_types,
+ &find_sig_entry, INSERT);
+ sig_entry = (struct signatured_type *) *slot;
- return pst;
+ /* Have we already tried to read this TU?
+ Note: sig_entry can be NULL if the skeleton TU was removed (thus it
+ needn't exist in the global table yet). */
+ if (sig_entry != NULL)
+ return sig_entry;
+
+ if (dwp_file->tus == NULL)
+ return NULL;
+ dwo_entry = lookup_dwo_unit_in_dwp (dwarf2_per_objfile, dwp_file, NULL,
+ sig, 1 /* is_debug_types */);
+ if (dwo_entry == NULL)
+ return NULL;
+
+ sig_entry = add_type_unit (dwarf2_per_objfile, sig, slot);
+ fill_in_sig_entry_from_dwo_entry (dwarf2_per_objfile, sig_entry, dwo_entry);
+
+ return sig_entry;
}
-/* The DATA object passed to process_psymtab_comp_unit_reader has this
- type. */
+/* Lookup a signature based type for DW_FORM_ref_sig8.
+ Returns NULL if signature SIG is not present in the table.
+ It is up to the caller to complain about this. */
-struct process_psymtab_comp_unit_data
+static struct signatured_type *
+lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
{
- /* True if we are reading a DW_TAG_partial_unit. */
-
- int want_partial_unit;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- /* The "pretend" language that is used if the CU doesn't declare a
- language. */
+ if (cu->dwo_unit
+ && dwarf2_per_objfile->using_index)
+ {
+ /* We're in a DWO/DWP file, and we're using .gdb_index.
+ These cases require special processing. */
+ if (get_dwp_file (dwarf2_per_objfile) == NULL)
+ return lookup_dwo_signatured_type (cu, sig);
+ else
+ return lookup_dwp_signatured_type (cu, sig);
+ }
+ else
+ {
+ struct signatured_type find_entry, *entry;
- enum language pretend_language;
-};
+ if (dwarf2_per_objfile->signatured_types == NULL)
+ return NULL;
+ find_entry.signature = sig;
+ entry = ((struct signatured_type *)
+ htab_find (dwarf2_per_objfile->signatured_types, &find_entry));
+ return entry;
+ }
+}
+\f
+/* Low level DIE reading support. */
-/* die_reader_func for process_psymtab_comp_unit. */
+/* Initialize a die_reader_specs struct from a dwarf2_cu struct. */
static void
-process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *data)
+init_cu_die_reader (struct die_reader_specs *reader,
+ struct dwarf2_cu *cu,
+ struct dwarf2_section_info *section,
+ struct dwo_file *dwo_file,
+ struct abbrev_table *abbrev_table)
{
- struct dwarf2_cu *cu = reader->cu;
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct dwarf2_per_cu_data *per_cu = cu->per_cu;
- CORE_ADDR baseaddr;
- CORE_ADDR best_lowpc = 0, best_highpc = 0;
- struct partial_symtab *pst;
- enum pc_bounds_kind cu_bounds_kind;
- const char *filename;
- struct process_psymtab_comp_unit_data *info
- = (struct process_psymtab_comp_unit_data *) data;
+ gdb_assert (section->readin && section->buffer != NULL);
+ reader->abfd = get_section_bfd_owner (section);
+ reader->cu = cu;
+ reader->dwo_file = dwo_file;
+ reader->die_section = section;
+ reader->buffer = section->buffer;
+ reader->buffer_end = section->buffer + section->size;
+ reader->comp_dir = NULL;
+ reader->abbrev_table = abbrev_table;
+}
- if (comp_unit_die->tag == DW_TAG_partial_unit && !info->want_partial_unit)
- return;
+/* Subroutine of init_cutu_and_read_dies to simplify it.
+ Read in the rest of a CU/TU top level DIE from DWO_UNIT.
+ There's just a lot of work to do, and init_cutu_and_read_dies is big enough
+ already.
- gdb_assert (! per_cu->is_debug_types);
+ STUB_COMP_UNIT_DIE is for the stub DIE, we copy over certain attributes
+ from it to the DIE in the DWO. If NULL we are skipping the stub.
+ STUB_COMP_DIR is similar to STUB_COMP_UNIT_DIE: When reading a TU directly
+ from the DWO file, bypassing the stub, it contains the DW_AT_comp_dir
+ attribute of the referencing CU. At most one of STUB_COMP_UNIT_DIE and
+ STUB_COMP_DIR may be non-NULL.
+ *RESULT_READER,*RESULT_INFO_PTR,*RESULT_COMP_UNIT_DIE,*RESULT_HAS_CHILDREN
+ are filled in with the info of the DIE from the DWO file.
+ *RESULT_DWO_ABBREV_TABLE will be filled in with the abbrev table allocated
+ from the dwo. Since *RESULT_READER references this abbrev table, it must be
+ kept around for at least as long as *RESULT_READER.
- prepare_one_comp_unit (cu, comp_unit_die, info->pretend_language);
+ The result is non-zero if a valid (non-dummy) DIE was found. */
- cu->list_in_scope = &file_symbols;
+static int
+read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu,
+ struct dwo_unit *dwo_unit,
+ struct die_info *stub_comp_unit_die,
+ const char *stub_comp_dir,
+ struct die_reader_specs *result_reader,
+ const gdb_byte **result_info_ptr,
+ struct die_info **result_comp_unit_die,
+ int *result_has_children,
+ abbrev_table_up *result_dwo_abbrev_table)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_cu *cu = this_cu->cu;
+ bfd *abfd;
+ const gdb_byte *begin_info_ptr, *info_ptr;
+ struct attribute *comp_dir, *stmt_list, *low_pc, *high_pc, *ranges;
+ int i,num_extra_attrs;
+ struct dwarf2_section_info *dwo_abbrev_section;
+ struct attribute *attr;
+ struct die_info *comp_unit_die;
- /* Allocate a new partial symbol table structure. */
- filename = dwarf2_string_attr (comp_unit_die, DW_AT_name, cu);
- if (filename == NULL)
- filename = "";
+ /* At most one of these may be provided. */
+ gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) <= 1);
- pst = create_partial_symtab (per_cu, filename);
+ /* These attributes aren't processed until later:
+ DW_AT_stmt_list, DW_AT_low_pc, DW_AT_high_pc, DW_AT_ranges.
+ DW_AT_comp_dir is used now, to find the DWO file, but it is also
+ referenced later. However, these attributes are found in the stub
+ which we won't have later. In order to not impose this complication
+ on the rest of the code, we read them here and copy them to the
+ DWO CU/TU die. */
- /* This must be done before calling dwarf2_build_include_psymtabs. */
- pst->dirname = dwarf2_string_attr (comp_unit_die, DW_AT_comp_dir, cu);
+ stmt_list = NULL;
+ low_pc = NULL;
+ high_pc = NULL;
+ ranges = NULL;
+ comp_dir = NULL;
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ if (stub_comp_unit_die != NULL)
+ {
+ /* For TUs in DWO files, the DW_AT_stmt_list attribute lives in the
+ DWO file. */
+ if (! this_cu->is_debug_types)
+ stmt_list = dwarf2_attr (stub_comp_unit_die, DW_AT_stmt_list, cu);
+ low_pc = dwarf2_attr (stub_comp_unit_die, DW_AT_low_pc, cu);
+ high_pc = dwarf2_attr (stub_comp_unit_die, DW_AT_high_pc, cu);
+ ranges = dwarf2_attr (stub_comp_unit_die, DW_AT_ranges, cu);
+ comp_dir = dwarf2_attr (stub_comp_unit_die, DW_AT_comp_dir, cu);
- dwarf2_find_base_address (comp_unit_die, cu);
+ /* There should be a DW_AT_addr_base attribute here (if needed).
+ We need the value before we can process DW_FORM_GNU_addr_index. */
+ cu->addr_base = 0;
+ attr = dwarf2_attr (stub_comp_unit_die, DW_AT_GNU_addr_base, cu);
+ if (attr)
+ cu->addr_base = DW_UNSND (attr);
- /* Possibly set the default values of LOWPC and HIGHPC from
- `DW_AT_ranges'. */
- cu_bounds_kind = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc,
- &best_highpc, cu, pst);
- if (cu_bounds_kind == PC_BOUNDS_HIGH_LOW && best_lowpc < best_highpc)
- /* Store the contiguous range if it is not empty; it can be empty for
- CUs with no code. */
- addrmap_set_empty (objfile->psymtabs_addrmap,
- gdbarch_adjust_dwarf2_addr (gdbarch,
- best_lowpc + baseaddr),
- gdbarch_adjust_dwarf2_addr (gdbarch,
- best_highpc + baseaddr) - 1,
- pst);
-
- /* 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 (has_children)
+ /* There should be a DW_AT_ranges_base attribute here (if needed).
+ We need the value before we can process DW_AT_ranges. */
+ cu->ranges_base = 0;
+ attr = dwarf2_attr (stub_comp_unit_die, DW_AT_GNU_ranges_base, cu);
+ if (attr)
+ cu->ranges_base = DW_UNSND (attr);
+ }
+ else if (stub_comp_dir != NULL)
{
- struct partial_die_info *first_die;
- CORE_ADDR lowpc, highpc;
-
- lowpc = ((CORE_ADDR) -1);
- highpc = ((CORE_ADDR) 0);
-
- first_die = load_partial_dies (reader, info_ptr, 1);
+ /* Reconstruct the comp_dir attribute to simplify the code below. */
+ comp_dir = XOBNEW (&cu->comp_unit_obstack, struct attribute);
+ comp_dir->name = DW_AT_comp_dir;
+ comp_dir->form = DW_FORM_string;
+ DW_STRING_IS_CANONICAL (comp_dir) = 0;
+ DW_STRING (comp_dir) = stub_comp_dir;
+ }
- scan_partial_symbols (first_die, &lowpc, &highpc,
- cu_bounds_kind <= PC_BOUNDS_INVALID, cu);
+ /* Set up for reading the DWO CU/TU. */
+ cu->dwo_unit = dwo_unit;
+ dwarf2_section_info *section = dwo_unit->section;
+ dwarf2_read_section (objfile, section);
+ abfd = get_section_bfd_owner (section);
+ begin_info_ptr = info_ptr = (section->buffer
+ + to_underlying (dwo_unit->sect_off));
+ dwo_abbrev_section = &dwo_unit->dwo_file->sections.abbrev;
- /* If we didn't find a lowpc, set it to highpc to avoid
- complaints from `maint check'. */
- if (lowpc == ((CORE_ADDR) -1))
- lowpc = highpc;
+ if (this_cu->is_debug_types)
+ {
+ struct signatured_type *sig_type = (struct signatured_type *) this_cu;
- /* If the compilation unit didn't have an explicit address range,
- then use the information extracted from its child dies. */
- if (cu_bounds_kind <= PC_BOUNDS_INVALID)
+ info_ptr = read_and_check_comp_unit_head (dwarf2_per_objfile,
+ &cu->header, section,
+ dwo_abbrev_section,
+ info_ptr, rcuh_kind::TYPE);
+ /* This is not an assert because it can be caused by bad debug info. */
+ if (sig_type->signature != cu->header.signature)
{
- best_lowpc = lowpc;
- best_highpc = highpc;
+ error (_("Dwarf Error: signature mismatch %s vs %s while reading"
+ " TU at offset %s [in module %s]"),
+ hex_string (sig_type->signature),
+ hex_string (cu->header.signature),
+ sect_offset_str (dwo_unit->sect_off),
+ bfd_get_filename (abfd));
}
- }
- pst->textlow = gdbarch_adjust_dwarf2_addr (gdbarch, best_lowpc + baseaddr);
- pst->texthigh = gdbarch_adjust_dwarf2_addr (gdbarch, best_highpc + baseaddr);
-
- end_psymtab_common (objfile, pst);
+ gdb_assert (dwo_unit->sect_off == cu->header.sect_off);
+ /* For DWOs coming from DWP files, we don't know the CU length
+ nor the type's offset in the TU until now. */
+ dwo_unit->length = get_cu_length (&cu->header);
+ dwo_unit->type_offset_in_tu = cu->header.type_cu_offset_in_tu;
- if (!VEC_empty (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs))
+ /* Establish the type offset that can be used to lookup the type.
+ For DWO files, we don't know it until now. */
+ sig_type->type_offset_in_section
+ = dwo_unit->sect_off + to_underlying (dwo_unit->type_offset_in_tu);
+ }
+ else
{
- int i;
- int len = VEC_length (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs);
- struct dwarf2_per_cu_data *iter;
+ info_ptr = read_and_check_comp_unit_head (dwarf2_per_objfile,
+ &cu->header, section,
+ dwo_abbrev_section,
+ info_ptr, rcuh_kind::COMPILE);
+ gdb_assert (dwo_unit->sect_off == cu->header.sect_off);
+ /* For DWOs coming from DWP files, we don't know the CU length
+ until now. */
+ dwo_unit->length = get_cu_length (&cu->header);
+ }
- /* Fill in 'dependencies' here; we fill in 'users' in a
- post-pass. */
- pst->number_of_dependencies = len;
- pst->dependencies =
- XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
- for (i = 0;
- VEC_iterate (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs,
- i, iter);
- ++i)
- pst->dependencies[i] = iter->v.psymtab;
+ *result_dwo_abbrev_table
+ = abbrev_table_read_table (dwarf2_per_objfile, dwo_abbrev_section,
+ cu->header.abbrev_sect_off);
+ init_cu_die_reader (result_reader, cu, section, dwo_unit->dwo_file,
+ result_dwo_abbrev_table->get ());
- VEC_free (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs);
- }
+ /* Read in the die, but leave space to copy over the attributes
+ from the stub. This has the benefit of simplifying the rest of
+ the code - all the work to maintain the illusion of a single
+ DW_TAG_{compile,type}_unit DIE is done here. */
+ num_extra_attrs = ((stmt_list != NULL)
+ + (low_pc != NULL)
+ + (high_pc != NULL)
+ + (ranges != NULL)
+ + (comp_dir != NULL));
+ info_ptr = read_full_die_1 (result_reader, result_comp_unit_die, info_ptr,
+ result_has_children, num_extra_attrs);
- /* 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);
+ /* Copy over the attributes from the stub to the DIE we just read in. */
+ comp_unit_die = *result_comp_unit_die;
+ i = comp_unit_die->num_attrs;
+ if (stmt_list != NULL)
+ comp_unit_die->attrs[i++] = *stmt_list;
+ if (low_pc != NULL)
+ comp_unit_die->attrs[i++] = *low_pc;
+ if (high_pc != NULL)
+ comp_unit_die->attrs[i++] = *high_pc;
+ if (ranges != NULL)
+ comp_unit_die->attrs[i++] = *ranges;
+ if (comp_dir != NULL)
+ comp_unit_die->attrs[i++] = *comp_dir;
+ comp_unit_die->num_attrs += num_extra_attrs;
- if (dwarf_read_debug)
+ if (dwarf_die_debug)
{
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
-
fprintf_unfiltered (gdb_stdlog,
- "Psymtab for %s unit @0x%x: %s - %s"
- ", %d global, %d static syms\n",
- per_cu->is_debug_types ? "type" : "comp",
- to_underlying (per_cu->sect_off),
- paddress (gdbarch, pst->textlow),
- paddress (gdbarch, pst->texthigh),
- pst->n_global_syms, pst->n_static_syms);
+ "Read die from %s@0x%x of %s:\n",
+ get_section_name (section),
+ (unsigned) (begin_info_ptr - section->buffer),
+ bfd_get_filename (abfd));
+ dump_die (comp_unit_die, dwarf_die_debug);
}
+
+ /* Save the comp_dir attribute. If there is no DWP file then we'll read
+ TUs by skipping the stub and going directly to the entry in the DWO file.
+ However, skipping the stub means we won't get DW_AT_comp_dir, so we have
+ to get it via circuitous means. Blech. */
+ if (comp_dir != NULL)
+ result_reader->comp_dir = DW_STRING (comp_dir);
+
+ /* Skip dummy compilation units. */
+ if (info_ptr >= begin_info_ptr + dwo_unit->length
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ return 0;
+
+ *result_info_ptr = info_ptr;
+ return 1;
}
-/* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
- Process compilation unit THIS_CU for a psymtab. */
+/* Subroutine of init_cutu_and_read_dies to simplify it.
+ Look up the DWO unit specified by COMP_UNIT_DIE of THIS_CU.
+ Returns NULL if the specified DWO unit cannot be found. */
-static void
-process_psymtab_comp_unit (struct dwarf2_per_cu_data *this_cu,
- int want_partial_unit,
- enum language pretend_language)
+static struct dwo_unit *
+lookup_dwo_unit (struct dwarf2_per_cu_data *this_cu,
+ struct die_info *comp_unit_die)
{
- /* If this compilation unit was already read in, free the
- cached copy in order to read it in again. This is
- necessary because we skipped some symbols when we first
- read in the compilation unit (see load_partial_dies).
- This problem could be avoided, but the benefit is unclear. */
- if (this_cu->cu != NULL)
- free_one_cached_comp_unit (this_cu);
+ struct dwarf2_cu *cu = this_cu->cu;
+ ULONGEST signature;
+ struct dwo_unit *dwo_unit;
+ const char *comp_dir, *dwo_name;
+
+ gdb_assert (cu != NULL);
+
+ /* Yeah, we look dwo_name up again, but it simplifies the code. */
+ dwo_name = dwarf2_string_attr (comp_unit_die, DW_AT_GNU_dwo_name, cu);
+ comp_dir = dwarf2_string_attr (comp_unit_die, DW_AT_comp_dir, cu);
if (this_cu->is_debug_types)
- init_cutu_and_read_dies (this_cu, NULL, 0, 0, build_type_psymtabs_reader,
- NULL);
+ {
+ struct signatured_type *sig_type;
+
+ /* Since this_cu is the first member of struct signatured_type,
+ we can go from a pointer to one to a pointer to the other. */
+ sig_type = (struct signatured_type *) this_cu;
+ signature = sig_type->signature;
+ dwo_unit = lookup_dwo_type_unit (sig_type, dwo_name, comp_dir);
+ }
else
{
- process_psymtab_comp_unit_data info;
- info.want_partial_unit = want_partial_unit;
- info.pretend_language = pretend_language;
- init_cutu_and_read_dies (this_cu, NULL, 0, 0,
- process_psymtab_comp_unit_reader, &info);
+ struct attribute *attr;
+
+ attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_id, cu);
+ if (! attr)
+ error (_("Dwarf Error: missing dwo_id for dwo_name %s"
+ " [in module %s]"),
+ dwo_name, objfile_name (this_cu->dwarf2_per_objfile->objfile));
+ signature = DW_UNSND (attr);
+ dwo_unit = lookup_dwo_comp_unit (this_cu, dwo_name, comp_dir,
+ signature);
}
- /* Age out any secondary CUs. */
- age_cached_comp_units ();
+ return dwo_unit;
}
-/* Reader function for build_type_psymtabs. */
+/* Subroutine of init_cutu_and_read_dies to simplify it.
+ See it for a description of the parameters.
+ Read a TU directly from a DWO file, bypassing the stub. */
static void
-build_type_psymtabs_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *type_unit_die,
- int has_children,
- void *data)
+init_tu_and_read_dwo_dies (struct dwarf2_per_cu_data *this_cu,
+ int use_existing_cu, int keep,
+ die_reader_func_ftype *die_reader_func,
+ void *data)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_cu *cu = reader->cu;
- struct dwarf2_per_cu_data *per_cu = cu->per_cu;
+ std::unique_ptr<dwarf2_cu> new_cu;
struct signatured_type *sig_type;
- struct type_unit_group *tu_group;
- struct attribute *attr;
- struct partial_die_info *first_die;
- CORE_ADDR lowpc, highpc;
- struct partial_symtab *pst;
-
- gdb_assert (data == NULL);
- gdb_assert (per_cu->is_debug_types);
- sig_type = (struct signatured_type *) per_cu;
-
- if (! has_children)
- return;
+ struct die_reader_specs reader;
+ const gdb_byte *info_ptr;
+ struct die_info *comp_unit_die;
+ int has_children;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_cu->dwarf2_per_objfile;
- attr = dwarf2_attr_no_follow (type_unit_die, DW_AT_stmt_list);
- tu_group = get_type_unit_group (cu, attr);
+ /* Verify we can do the following downcast, and that we have the
+ data we need. */
+ gdb_assert (this_cu->is_debug_types && this_cu->reading_dwo_directly);
+ sig_type = (struct signatured_type *) this_cu;
+ gdb_assert (sig_type->dwo_unit != NULL);
- VEC_safe_push (sig_type_ptr, tu_group->tus, sig_type);
+ if (use_existing_cu && this_cu->cu != NULL)
+ {
+ gdb_assert (this_cu->cu->dwo_unit == sig_type->dwo_unit);
+ /* There's no need to do the rereading_dwo_cu handling that
+ init_cutu_and_read_dies does since we don't read the stub. */
+ }
+ else
+ {
+ /* If !use_existing_cu, this_cu->cu must be NULL. */
+ gdb_assert (this_cu->cu == NULL);
+ new_cu.reset (new dwarf2_cu (this_cu));
+ }
- prepare_one_comp_unit (cu, type_unit_die, language_minimal);
- cu->list_in_scope = &file_symbols;
- pst = create_partial_symtab (per_cu, "");
- pst->anonymous = 1;
+ /* A future optimization, if needed, would be to use an existing
+ abbrev table. When reading DWOs with skeletonless TUs, all the TUs
+ could share abbrev tables. */
- first_die = load_partial_dies (reader, info_ptr, 1);
+ /* The abbreviation table used by READER, this must live at least as long as
+ READER. */
+ abbrev_table_up dwo_abbrev_table;
- lowpc = (CORE_ADDR) -1;
- highpc = (CORE_ADDR) 0;
- scan_partial_symbols (first_die, &lowpc, &highpc, 0, cu);
+ if (read_cutu_die_from_dwo (this_cu, sig_type->dwo_unit,
+ NULL /* stub_comp_unit_die */,
+ sig_type->dwo_unit->dwo_file->comp_dir,
+ &reader, &info_ptr,
+ &comp_unit_die, &has_children,
+ &dwo_abbrev_table) == 0)
+ {
+ /* Dummy die. */
+ return;
+ }
- end_psymtab_common (objfile, pst);
+ /* All the "real" work is done here. */
+ die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
+
+ /* This duplicates the code in init_cutu_and_read_dies,
+ but the alternative is making the latter more complex.
+ This function is only for the special case of using DWO files directly:
+ no point in overly complicating the general case just to handle this. */
+ if (new_cu != NULL && keep)
+ {
+ /* Link this CU into read_in_chain. */
+ this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
+ dwarf2_per_objfile->read_in_chain = this_cu;
+ /* The chain owns it now. */
+ new_cu.release ();
+ }
}
-/* Struct used to sort TUs by their abbreviation table offset. */
+/* Initialize a CU (or TU) and read its DIEs.
+ If the CU defers to a DWO file, read the DWO file as well.
-struct tu_abbrev_offset
-{
- struct signatured_type *sig_type;
- sect_offset abbrev_offset;
-};
+ ABBREV_TABLE, if non-NULL, is the abbreviation table to use.
+ Otherwise the table specified in the comp unit header is read in and used.
+ This is an optimization for when we already have the abbrev table.
-/* Helper routine for build_type_psymtabs_1, passed to qsort. */
+ If USE_EXISTING_CU is non-zero, and THIS_CU->cu is non-NULL, then use it.
+ Otherwise, a new CU is allocated with xmalloc.
-static int
-sort_tu_by_abbrev_offset (const void *ap, const void *bp)
+ If KEEP is non-zero, then if we allocated a dwarf2_cu we add it to
+ read_in_chain. Otherwise the dwarf2_cu data is freed at the end.
+
+ WARNING: If THIS_CU is a "dummy CU" (used as filler by the incremental
+ linker) then DIE_READER_FUNC will not get called. */
+
+static void
+init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
+ struct abbrev_table *abbrev_table,
+ int use_existing_cu, int keep,
+ bool skip_partial,
+ die_reader_func_ftype *die_reader_func,
+ void *data)
{
- const struct tu_abbrev_offset * const *a
- = (const struct tu_abbrev_offset * const*) ap;
- const struct tu_abbrev_offset * const *b
- = (const struct tu_abbrev_offset * const*) bp;
- sect_offset aoff = (*a)->abbrev_offset;
- sect_offset boff = (*b)->abbrev_offset;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_section_info *section = this_cu->section;
+ bfd *abfd = get_section_bfd_owner (section);
+ struct dwarf2_cu *cu;
+ const gdb_byte *begin_info_ptr, *info_ptr;
+ struct die_reader_specs reader;
+ struct die_info *comp_unit_die;
+ int has_children;
+ struct attribute *attr;
+ struct signatured_type *sig_type = NULL;
+ struct dwarf2_section_info *abbrev_section;
+ /* Non-zero if CU currently points to a DWO file and we need to
+ reread it. When this happens we need to reread the skeleton die
+ before we can reread the DWO file (this only applies to CUs, not TUs). */
+ int rereading_dwo_cu = 0;
- return (aoff > boff) - (aoff < boff);
-}
+ if (dwarf_die_debug)
+ fprintf_unfiltered (gdb_stdlog, "Reading %s unit at offset %s\n",
+ this_cu->is_debug_types ? "type" : "comp",
+ sect_offset_str (this_cu->sect_off));
-/* Efficiently read all the type units.
- This does the bulk of the work for build_type_psymtabs.
+ if (use_existing_cu)
+ gdb_assert (keep);
- The efficiency is because we sort TUs by the abbrev table they use and
- only read each abbrev table once. In one program there are 200K TUs
- sharing 8K abbrev tables.
+ /* If we're reading a TU directly from a DWO file, including a virtual DWO
+ file (instead of going through the stub), short-circuit all of this. */
+ if (this_cu->reading_dwo_directly)
+ {
+ /* Narrow down the scope of possibilities to have to understand. */
+ gdb_assert (this_cu->is_debug_types);
+ gdb_assert (abbrev_table == NULL);
+ init_tu_and_read_dwo_dies (this_cu, use_existing_cu, keep,
+ die_reader_func, data);
+ return;
+ }
- The main purpose of this function is to support building the
- dwarf2_per_objfile->type_unit_groups table.
- TUs typically share the DW_AT_stmt_list of the CU they came from, so we
- can collapse the search space by grouping them by stmt_list.
- The savings can be significant, in the same program from above the 200K TUs
- share 8K stmt_list tables.
+ /* This is cheap if the section is already read in. */
+ dwarf2_read_section (objfile, section);
- FUNC is expected to call get_type_unit_group, which will create the
- struct type_unit_group if necessary and add it to
- dwarf2_per_objfile->type_unit_groups. */
+ begin_info_ptr = info_ptr = section->buffer + to_underlying (this_cu->sect_off);
-static void
-build_type_psymtabs_1 (void)
-{
- struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
- struct cleanup *cleanups;
- struct abbrev_table *abbrev_table;
- sect_offset abbrev_offset;
- struct tu_abbrev_offset *sorted_by_abbrev;
- int i;
+ abbrev_section = get_abbrev_section_for_cu (this_cu);
- /* It's up to the caller to not call us multiple times. */
- gdb_assert (dwarf2_per_objfile->type_unit_groups == NULL);
+ std::unique_ptr<dwarf2_cu> new_cu;
+ if (use_existing_cu && this_cu->cu != NULL)
+ {
+ cu = this_cu->cu;
+ /* If this CU is from a DWO file we need to start over, we need to
+ refetch the attributes from the skeleton CU.
+ This could be optimized by retrieving those attributes from when we
+ were here the first time: the previous comp_unit_die was stored in
+ comp_unit_obstack. But there's no data yet that we need this
+ optimization. */
+ if (cu->dwo_unit != NULL)
+ rereading_dwo_cu = 1;
+ }
+ else
+ {
+ /* If !use_existing_cu, this_cu->cu must be NULL. */
+ gdb_assert (this_cu->cu == NULL);
+ new_cu.reset (new dwarf2_cu (this_cu));
+ cu = new_cu.get ();
+ }
- if (dwarf2_per_objfile->n_type_units == 0)
- return;
+ /* Get the header. */
+ if (to_underlying (cu->header.first_die_cu_offset) != 0 && !rereading_dwo_cu)
+ {
+ /* We already have the header, there's no need to read it in again. */
+ info_ptr += to_underlying (cu->header.first_die_cu_offset);
+ }
+ else
+ {
+ if (this_cu->is_debug_types)
+ {
+ info_ptr = read_and_check_comp_unit_head (dwarf2_per_objfile,
+ &cu->header, section,
+ abbrev_section, info_ptr,
+ rcuh_kind::TYPE);
- /* TUs typically share abbrev tables, and there can be way more TUs than
- abbrev tables. Sort by abbrev table to reduce the number of times we
- read each abbrev table in.
- Alternatives are to punt or to maintain a cache of abbrev tables.
- This is simpler and efficient enough for now.
+ /* Since per_cu is the first member of struct signatured_type,
+ we can go from a pointer to one to a pointer to the other. */
+ sig_type = (struct signatured_type *) this_cu;
+ gdb_assert (sig_type->signature == cu->header.signature);
+ gdb_assert (sig_type->type_offset_in_tu
+ == cu->header.type_cu_offset_in_tu);
+ gdb_assert (this_cu->sect_off == cu->header.sect_off);
- Later we group TUs by their DW_AT_stmt_list value (as this defines the
- symtab to use). Typically TUs with the same abbrev offset have the same
- stmt_list value too so in practice this should work well.
+ /* LENGTH has not been set yet for type units if we're
+ using .gdb_index. */
+ this_cu->length = get_cu_length (&cu->header);
- The basic algorithm here is:
+ /* Establish the type offset that can be used to lookup the type. */
+ sig_type->type_offset_in_section =
+ this_cu->sect_off + to_underlying (sig_type->type_offset_in_tu);
- sort TUs by abbrev table
- for each TU with same abbrev table:
- read abbrev table if first user
- read TU top level DIE
- [IWBN if DWO skeletons had DW_AT_stmt_list]
- call FUNC */
+ this_cu->dwarf_version = cu->header.version;
+ }
+ else
+ {
+ info_ptr = read_and_check_comp_unit_head (dwarf2_per_objfile,
+ &cu->header, section,
+ abbrev_section,
+ info_ptr,
+ rcuh_kind::COMPILE);
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "Building type unit groups ...\n");
+ gdb_assert (this_cu->sect_off == cu->header.sect_off);
+ gdb_assert (this_cu->length == get_cu_length (&cu->header));
+ this_cu->dwarf_version = cu->header.version;
+ }
+ }
- /* Sort in a separate table to maintain the order of all_type_units
- for .gdb_index: TU indices directly index all_type_units. */
- sorted_by_abbrev = XNEWVEC (struct tu_abbrev_offset,
- dwarf2_per_objfile->n_type_units);
- for (i = 0; i < dwarf2_per_objfile->n_type_units; ++i)
- {
- struct signatured_type *sig_type = dwarf2_per_objfile->all_type_units[i];
+ /* Skip dummy compilation units. */
+ if (info_ptr >= begin_info_ptr + this_cu->length
+ || peek_abbrev_code (abfd, info_ptr) == 0)
+ return;
- sorted_by_abbrev[i].sig_type = sig_type;
- sorted_by_abbrev[i].abbrev_offset =
- read_abbrev_offset (sig_type->per_cu.section,
- sig_type->per_cu.sect_off);
+ /* If we don't have them yet, read the abbrevs for this compilation unit.
+ And if we need to read them now, make sure they're freed when we're
+ done (own the table through ABBREV_TABLE_HOLDER). */
+ abbrev_table_up abbrev_table_holder;
+ if (abbrev_table != NULL)
+ gdb_assert (cu->header.abbrev_sect_off == abbrev_table->sect_off);
+ else
+ {
+ abbrev_table_holder
+ = abbrev_table_read_table (dwarf2_per_objfile, abbrev_section,
+ cu->header.abbrev_sect_off);
+ abbrev_table = abbrev_table_holder.get ();
}
- cleanups = make_cleanup (xfree, sorted_by_abbrev);
- qsort (sorted_by_abbrev, dwarf2_per_objfile->n_type_units,
- sizeof (struct tu_abbrev_offset), sort_tu_by_abbrev_offset);
- abbrev_offset = (sect_offset) ~(unsigned) 0;
- abbrev_table = NULL;
- make_cleanup (abbrev_table_free_cleanup, &abbrev_table);
+ /* Read the top level CU/TU die. */
+ init_cu_die_reader (&reader, cu, section, NULL, abbrev_table);
+ info_ptr = read_full_die (&reader, &comp_unit_die, info_ptr, &has_children);
+
+ if (skip_partial && comp_unit_die->tag == DW_TAG_partial_unit)
+ return;
- for (i = 0; i < dwarf2_per_objfile->n_type_units; ++i)
+ /* If we are in a DWO stub, process it and then read in the "real" CU/TU
+ from the DWO file. read_cutu_die_from_dwo will allocate the abbreviation
+ table from the DWO file and pass the ownership over to us. It will be
+ referenced from READER, so we must make sure to free it after we're done
+ with READER.
+
+ Note that if USE_EXISTING_OK != 0, and THIS_CU->cu already contains a
+ DWO CU, that this test will fail (the attribute will not be present). */
+ attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_name, cu);
+ abbrev_table_up dwo_abbrev_table;
+ if (attr)
{
- const struct tu_abbrev_offset *tu = &sorted_by_abbrev[i];
+ struct dwo_unit *dwo_unit;
+ struct die_info *dwo_comp_unit_die;
- /* Switch to the next abbrev table if necessary. */
- if (abbrev_table == NULL
- || tu->abbrev_offset != abbrev_offset)
+ if (has_children)
+ {
+ complaint (_("compilation unit with DW_AT_GNU_dwo_name"
+ " has children (offset %s) [in module %s]"),
+ sect_offset_str (this_cu->sect_off),
+ bfd_get_filename (abfd));
+ }
+ dwo_unit = lookup_dwo_unit (this_cu, comp_unit_die);
+ if (dwo_unit != NULL)
{
- if (abbrev_table != NULL)
+ if (read_cutu_die_from_dwo (this_cu, dwo_unit,
+ comp_unit_die, NULL,
+ &reader, &info_ptr,
+ &dwo_comp_unit_die, &has_children,
+ &dwo_abbrev_table) == 0)
{
- abbrev_table_free (abbrev_table);
- /* Reset to NULL in case abbrev_table_read_table throws
- an error: abbrev_table_free_cleanup will get called. */
- abbrev_table = NULL;
+ /* Dummy die. */
+ return;
}
- abbrev_offset = tu->abbrev_offset;
- abbrev_table =
- abbrev_table_read_table (&dwarf2_per_objfile->abbrev,
- abbrev_offset);
- ++tu_stats->nr_uniq_abbrev_tables;
+ comp_unit_die = dwo_comp_unit_die;
+ }
+ else
+ {
+ /* Yikes, we couldn't find the rest of the DIE, we only have
+ the stub. A complaint has already been logged. There's
+ not much more we can do except pass on the stub DIE to
+ die_reader_func. We don't want to throw an error on bad
+ debug info. */
}
-
- init_cutu_and_read_dies (&tu->sig_type->per_cu, abbrev_table, 0, 0,
- build_type_psymtabs_reader, NULL);
}
- do_cleanups (cleanups);
+ /* All of the above is setup for this call. Yikes. */
+ die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
+
+ /* Done, clean up. */
+ if (new_cu != NULL && keep)
+ {
+ /* Link this CU into read_in_chain. */
+ this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
+ dwarf2_per_objfile->read_in_chain = this_cu;
+ /* The chain owns it now. */
+ new_cu.release ();
+ }
}
-/* Print collected type unit statistics. */
+/* Read CU/TU THIS_CU but do not follow DW_AT_GNU_dwo_name if present.
+ DWO_FILE, if non-NULL, is the DWO file to read (the caller is assumed
+ to have already done the lookup to find the DWO file).
-static void
-print_tu_stats (void)
-{
- struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
+ The caller is required to fill in THIS_CU->section, THIS_CU->offset, and
+ THIS_CU->is_debug_types, but nothing else.
- fprintf_unfiltered (gdb_stdlog, "Type unit statistics:\n");
- fprintf_unfiltered (gdb_stdlog, " %d TUs\n",
- dwarf2_per_objfile->n_type_units);
- fprintf_unfiltered (gdb_stdlog, " %d uniq abbrev tables\n",
- tu_stats->nr_uniq_abbrev_tables);
- fprintf_unfiltered (gdb_stdlog, " %d symtabs from stmt_list entries\n",
- tu_stats->nr_symtabs);
- fprintf_unfiltered (gdb_stdlog, " %d symtab sharers\n",
- tu_stats->nr_symtab_sharers);
- fprintf_unfiltered (gdb_stdlog, " %d type units without a stmt_list\n",
- tu_stats->nr_stmt_less_type_units);
- fprintf_unfiltered (gdb_stdlog, " %d all_type_units reallocs\n",
- tu_stats->nr_all_type_units_reallocs);
-}
+ We fill in THIS_CU->length.
-/* Traversal function for build_type_psymtabs. */
+ WARNING: If THIS_CU is a "dummy CU" (used as filler by the incremental
+ linker) then DIE_READER_FUNC will not get called.
-static int
-build_type_psymtab_dependencies (void **slot, void *info)
+ THIS_CU->cu is always freed when done.
+ This is done in order to not leave THIS_CU->cu in a state where we have
+ to care whether it refers to the "main" CU or the DWO CU. */
+
+static void
+init_cutu_and_read_dies_no_follow (struct dwarf2_per_cu_data *this_cu,
+ struct dwo_file *dwo_file,
+ die_reader_func_ftype *die_reader_func,
+ void *data)
{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_cu->dwarf2_per_objfile;
struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct type_unit_group *tu_group = (struct type_unit_group *) *slot;
- struct dwarf2_per_cu_data *per_cu = &tu_group->per_cu;
- struct partial_symtab *pst = per_cu->v.psymtab;
- int len = VEC_length (sig_type_ptr, tu_group->tus);
- struct signatured_type *iter;
- int i;
+ struct dwarf2_section_info *section = this_cu->section;
+ bfd *abfd = get_section_bfd_owner (section);
+ struct dwarf2_section_info *abbrev_section;
+ const gdb_byte *begin_info_ptr, *info_ptr;
+ struct die_reader_specs reader;
+ struct die_info *comp_unit_die;
+ int has_children;
- gdb_assert (len > 0);
- gdb_assert (IS_TYPE_UNIT_GROUP (per_cu));
+ if (dwarf_die_debug)
+ fprintf_unfiltered (gdb_stdlog, "Reading %s unit at offset %s\n",
+ this_cu->is_debug_types ? "type" : "comp",
+ sect_offset_str (this_cu->sect_off));
- pst->number_of_dependencies = len;
- pst->dependencies =
- XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
- for (i = 0;
- VEC_iterate (sig_type_ptr, tu_group->tus, i, iter);
- ++i)
- {
- gdb_assert (iter->per_cu.is_debug_types);
- pst->dependencies[i] = iter->per_cu.v.psymtab;
- iter->type_unit_group = tu_group;
- }
+ gdb_assert (this_cu->cu == NULL);
- VEC_free (sig_type_ptr, tu_group->tus);
+ abbrev_section = (dwo_file != NULL
+ ? &dwo_file->sections.abbrev
+ : get_abbrev_section_for_cu (this_cu));
- return 1;
-}
+ /* This is cheap if the section is already read in. */
+ dwarf2_read_section (objfile, section);
-/* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
- Build partial symbol tables for the .debug_types comp-units. */
+ struct dwarf2_cu cu (this_cu);
-static void
-build_type_psymtabs (struct objfile *objfile)
-{
- if (! create_all_type_units (objfile))
+ begin_info_ptr = info_ptr = section->buffer + to_underlying (this_cu->sect_off);
+ info_ptr = read_and_check_comp_unit_head (dwarf2_per_objfile,
+ &cu.header, section,
+ abbrev_section, info_ptr,
+ (this_cu->is_debug_types
+ ? rcuh_kind::TYPE
+ : rcuh_kind::COMPILE));
+
+ this_cu->length = get_cu_length (&cu.header);
+
+ /* Skip dummy compilation units. */
+ if (info_ptr >= begin_info_ptr + this_cu->length
+ || peek_abbrev_code (abfd, info_ptr) == 0)
return;
- build_type_psymtabs_1 ();
-}
+ abbrev_table_up abbrev_table
+ = abbrev_table_read_table (dwarf2_per_objfile, abbrev_section,
+ cu.header.abbrev_sect_off);
-/* Traversal function for process_skeletonless_type_unit.
- Read a TU in a DWO file and build partial symbols for it. */
+ init_cu_die_reader (&reader, &cu, section, dwo_file, abbrev_table.get ());
+ info_ptr = read_full_die (&reader, &comp_unit_die, info_ptr, &has_children);
-static int
-process_skeletonless_type_unit (void **slot, void *info)
-{
- struct dwo_unit *dwo_unit = (struct dwo_unit *) *slot;
- struct objfile *objfile = (struct objfile *) info;
- struct signatured_type find_entry, *entry;
+ die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
+}
- /* If this TU doesn't exist in the global table, add it and read it in. */
+/* Read a CU/TU, except that this does not look for DW_AT_GNU_dwo_name and
+ does not lookup the specified DWO file.
+ This cannot be used to read DWO files.
- if (dwarf2_per_objfile->signatured_types == NULL)
- {
- dwarf2_per_objfile->signatured_types
- = allocate_signatured_type_table (objfile);
- }
+ THIS_CU->cu is always freed when done.
+ This is done in order to not leave THIS_CU->cu in a state where we have
+ to care whether it refers to the "main" CU or the DWO CU.
+ We can revisit this if the data shows there's a performance issue. */
- find_entry.signature = dwo_unit->signature;
- slot = htab_find_slot (dwarf2_per_objfile->signatured_types, &find_entry,
- INSERT);
- /* If we've already seen this type there's nothing to do. What's happening
- is we're doing our own version of comdat-folding here. */
- if (*slot != NULL)
- return 1;
+static void
+init_cutu_and_read_dies_simple (struct dwarf2_per_cu_data *this_cu,
+ die_reader_func_ftype *die_reader_func,
+ void *data)
+{
+ init_cutu_and_read_dies_no_follow (this_cu, NULL, die_reader_func, data);
+}
+\f
+/* Type Unit Groups.
- /* This does the job that create_all_type_units would have done for
- this TU. */
- entry = add_type_unit (dwo_unit->signature, slot);
- fill_in_sig_entry_from_dwo_entry (objfile, entry, dwo_unit);
- *slot = entry;
+ Type Unit Groups are a way to collapse the set of all TUs (type units) into
+ a more manageable set. The grouping is done by DW_AT_stmt_list entry
+ so that all types coming from the same compilation (.o file) are grouped
+ together. A future step could be to put the types in the same symtab as
+ the CU the types ultimately came from. */
- /* This does the job that build_type_psymtabs_1 would have done. */
- init_cutu_and_read_dies (&entry->per_cu, NULL, 0, 0,
- build_type_psymtabs_reader, NULL);
+static hashval_t
+hash_type_unit_group (const void *item)
+{
+ const struct type_unit_group *tu_group
+ = (const struct type_unit_group *) item;
- return 1;
+ return hash_stmt_list_entry (&tu_group->hash);
}
-/* Traversal function for process_skeletonless_type_units. */
-
static int
-process_dwo_file_for_skeletonless_type_units (void **slot, void *info)
+eq_type_unit_group (const void *item_lhs, const void *item_rhs)
{
- struct dwo_file *dwo_file = (struct dwo_file *) *slot;
-
- if (dwo_file->tus != NULL)
- {
- htab_traverse_noresize (dwo_file->tus,
- process_skeletonless_type_unit, info);
- }
+ const struct type_unit_group *lhs = (const struct type_unit_group *) item_lhs;
+ const struct type_unit_group *rhs = (const struct type_unit_group *) item_rhs;
- return 1;
+ return eq_stmt_list_entry (&lhs->hash, &rhs->hash);
}
-/* Scan all TUs of DWO files, verifying we've processed them.
- This is needed in case a TU was emitted without its skeleton.
- Note: This can't be done until we know what all the DWO files are. */
+/* Allocate a hash table for type unit groups. */
-static void
-process_skeletonless_type_units (struct objfile *objfile)
+static htab_t
+allocate_type_unit_groups_table (struct objfile *objfile)
{
- /* Skeletonless TUs in DWP files without .gdb_index is not supported yet. */
- if (get_dwp_file () == NULL
- && dwarf2_per_objfile->dwo_files != NULL)
- {
- htab_traverse_noresize (dwarf2_per_objfile->dwo_files,
- process_dwo_file_for_skeletonless_type_units,
- objfile);
- }
+ return htab_create_alloc_ex (3,
+ hash_type_unit_group,
+ eq_type_unit_group,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
}
-/* Compute the 'user' field for each psymtab in OBJFILE. */
+/* Type units that don't have DW_AT_stmt_list are grouped into their own
+ partial symtabs. We combine several TUs per psymtab to not let the size
+ of any one psymtab grow too big. */
+#define NO_STMT_LIST_TYPE_UNIT_PSYMTAB (1 << 31)
+#define NO_STMT_LIST_TYPE_UNIT_PSYMTAB_SIZE 10
+
+/* Helper routine for get_type_unit_group.
+ Create the type_unit_group object used to hold one or more TUs. */
-static void
-set_partial_user (struct objfile *objfile)
+static struct type_unit_group *
+create_type_unit_group (struct dwarf2_cu *cu, sect_offset line_offset_struct)
{
- int i;
-
- for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
- {
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
- struct partial_symtab *pst = per_cu->v.psymtab;
- int j;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_per_cu_data *per_cu;
+ struct type_unit_group *tu_group;
- if (pst == NULL)
- continue;
+ tu_group = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct type_unit_group);
+ per_cu = &tu_group->per_cu;
+ per_cu->dwarf2_per_objfile = dwarf2_per_objfile;
- for (j = 0; j < pst->number_of_dependencies; ++j)
- {
- /* Set the 'user' field only if it is not already set. */
- if (pst->dependencies[j]->user == NULL)
- pst->dependencies[j]->user = pst;
- }
+ if (dwarf2_per_objfile->using_index)
+ {
+ per_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_quick_data);
}
-}
+ else
+ {
+ unsigned int line_offset = to_underlying (line_offset_struct);
+ struct partial_symtab *pst;
+ char *name;
-/* Build the partial symbol table by doing a quick pass through the
- .debug_info and .debug_abbrev sections. */
+ /* Give the symtab a useful name for debug purposes. */
+ if ((line_offset & NO_STMT_LIST_TYPE_UNIT_PSYMTAB) != 0)
+ name = xstrprintf ("<type_units_%d>",
+ (line_offset & ~NO_STMT_LIST_TYPE_UNIT_PSYMTAB));
+ else
+ name = xstrprintf ("<type_units_at_0x%x>", line_offset);
-static void
-dwarf2_build_psymtabs_hard (struct objfile *objfile)
-{
- struct cleanup *back_to;
- int i;
+ pst = create_partial_symtab (per_cu, name);
+ pst->anonymous = 1;
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Building psymtabs of objfile %s ...\n",
- objfile_name (objfile));
+ xfree (name);
}
- dwarf2_per_objfile->reading_partial_symbols = 1;
+ tu_group->hash.dwo_unit = cu->dwo_unit;
+ tu_group->hash.line_sect_off = line_offset_struct;
- dwarf2_read_section (objfile, &dwarf2_per_objfile->info);
+ return tu_group;
+}
- /* Any cached compilation units will be linked by the per-objfile
- read_in_chain. Make sure to free them when we're done. */
- back_to = make_cleanup (free_cached_comp_units, NULL);
+/* Look up the type_unit_group for type unit CU, and create it if necessary.
+ STMT_LIST is a DW_AT_stmt_list attribute. */
- build_type_psymtabs (objfile);
+static struct type_unit_group *
+get_type_unit_group (struct dwarf2_cu *cu, const struct attribute *stmt_list)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
+ struct type_unit_group *tu_group;
+ void **slot;
+ unsigned int line_offset;
+ struct type_unit_group type_unit_group_for_lookup;
- create_all_comp_units (objfile);
+ if (dwarf2_per_objfile->type_unit_groups == NULL)
+ {
+ dwarf2_per_objfile->type_unit_groups =
+ allocate_type_unit_groups_table (dwarf2_per_objfile->objfile);
+ }
- /* Create a temporary address map on a temporary obstack. We later
- copy this to the final obstack. */
- auto_obstack temp_obstack;
+ /* Do we need to create a new group, or can we use an existing one? */
- scoped_restore save_psymtabs_addrmap
- = make_scoped_restore (&objfile->psymtabs_addrmap,
- addrmap_create_mutable (&temp_obstack));
-
- for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ if (stmt_list)
{
- struct dwarf2_per_cu_data *per_cu = dw2_get_cutu (i);
-
- process_psymtab_comp_unit (per_cu, 0, language_minimal);
+ line_offset = DW_UNSND (stmt_list);
+ ++tu_stats->nr_symtab_sharers;
+ }
+ else
+ {
+ /* Ugh, no stmt_list. Rare, but we have to handle it.
+ We can do various things here like create one group per TU or
+ spread them over multiple groups to split up the expansion work.
+ To avoid worst case scenarios (too many groups or too large groups)
+ we, umm, group them in bunches. */
+ line_offset = (NO_STMT_LIST_TYPE_UNIT_PSYMTAB
+ | (tu_stats->nr_stmt_less_type_units
+ / NO_STMT_LIST_TYPE_UNIT_PSYMTAB_SIZE));
+ ++tu_stats->nr_stmt_less_type_units;
}
- /* This has to wait until we read the CUs, we need the list of DWOs. */
- process_skeletonless_type_units (objfile);
-
- /* Now that all TUs have been processed we can fill in the dependencies. */
- if (dwarf2_per_objfile->type_unit_groups != NULL)
+ type_unit_group_for_lookup.hash.dwo_unit = cu->dwo_unit;
+ type_unit_group_for_lookup.hash.line_sect_off = (sect_offset) line_offset;
+ slot = htab_find_slot (dwarf2_per_objfile->type_unit_groups,
+ &type_unit_group_for_lookup, INSERT);
+ if (*slot != NULL)
{
- htab_traverse_noresize (dwarf2_per_objfile->type_unit_groups,
- build_type_psymtab_dependencies, NULL);
+ tu_group = (struct type_unit_group *) *slot;
+ gdb_assert (tu_group != NULL);
+ }
+ else
+ {
+ sect_offset line_offset_struct = (sect_offset) line_offset;
+ tu_group = create_type_unit_group (cu, line_offset_struct);
+ *slot = tu_group;
+ ++tu_stats->nr_symtabs;
}
- if (dwarf_read_debug)
- print_tu_stats ();
+ return tu_group;
+}
+\f
+/* Partial symbol tables. */
- set_partial_user (objfile);
+/* Create a psymtab named NAME and assign it to PER_CU.
- objfile->psymtabs_addrmap = addrmap_create_fixed (objfile->psymtabs_addrmap,
- &objfile->objfile_obstack);
- /* At this point we want to keep the address map. */
- save_psymtabs_addrmap.release ();
+ The caller must fill in the following details:
+ dirname, textlow, texthigh. */
- do_cleanups (back_to);
+static struct partial_symtab *
+create_partial_symtab (struct dwarf2_per_cu_data *per_cu, const char *name)
+{
+ struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
+ struct partial_symtab *pst;
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "Done building psymtabs of %s\n",
- objfile_name (objfile));
+ pst = start_psymtab_common (objfile, name, 0,
+ objfile->global_psymbols,
+ objfile->static_psymbols);
+
+ pst->psymtabs_addrmap_supported = 1;
+
+ /* This is the glue that links PST into GDB's symbol API. */
+ pst->read_symtab_private = per_cu;
+ pst->read_symtab = dwarf2_read_symtab;
+ per_cu->v.psymtab = pst;
+
+ return pst;
}
-/* die_reader_func for load_partial_comp_unit. */
+/* The DATA object passed to process_psymtab_comp_unit_reader has this
+ type. */
-static void
-load_partial_comp_unit_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *data)
+struct process_psymtab_comp_unit_data
{
- struct dwarf2_cu *cu = reader->cu;
+ /* True if we are reading a DW_TAG_partial_unit. */
- prepare_one_comp_unit (cu, comp_unit_die, language_minimal);
+ int want_partial_unit;
- /* 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 (has_children)
- load_partial_dies (reader, info_ptr, 0);
-}
+ /* The "pretend" language that is used if the CU doesn't declare a
+ language. */
-/* Load the partial DIEs for a secondary CU into memory.
- This is also used when rereading a primary CU with load_all_dies. */
+ enum language pretend_language;
+};
-static void
-load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu)
-{
- init_cutu_and_read_dies (this_cu, NULL, 1, 1,
- load_partial_comp_unit_reader, NULL);
-}
+/* die_reader_func for process_psymtab_comp_unit. */
static void
-read_comp_units_from_section (struct objfile *objfile,
- struct dwarf2_section_info *section,
- struct dwarf2_section_info *abbrev_section,
- unsigned int is_dwz,
- int *n_allocated,
- int *n_comp_units,
- struct dwarf2_per_cu_data ***all_comp_units)
+process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *data)
{
- const gdb_byte *info_ptr;
+ struct dwarf2_cu *cu = reader->cu;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct dwarf2_per_cu_data *per_cu = cu->per_cu;
+ CORE_ADDR baseaddr;
+ CORE_ADDR best_lowpc = 0, best_highpc = 0;
+ struct partial_symtab *pst;
+ enum pc_bounds_kind cu_bounds_kind;
+ const char *filename;
+ struct process_psymtab_comp_unit_data *info
+ = (struct process_psymtab_comp_unit_data *) data;
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "Reading %s for %s\n",
- get_section_name (section),
- get_section_file_name (section));
+ if (comp_unit_die->tag == DW_TAG_partial_unit && !info->want_partial_unit)
+ return;
- dwarf2_read_section (objfile, section);
+ gdb_assert (! per_cu->is_debug_types);
- info_ptr = section->buffer;
+ prepare_one_comp_unit (cu, comp_unit_die, info->pretend_language);
- while (info_ptr < section->buffer + section->size)
+ cu->list_in_scope = &file_symbols;
+
+ /* Allocate a new partial symbol table structure. */
+ filename = dwarf2_string_attr (comp_unit_die, DW_AT_name, cu);
+ if (filename == NULL)
+ filename = "";
+
+ pst = create_partial_symtab (per_cu, filename);
+
+ /* This must be done before calling dwarf2_build_include_psymtabs. */
+ pst->dirname = dwarf2_string_attr (comp_unit_die, DW_AT_comp_dir, cu);
+
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+
+ dwarf2_find_base_address (comp_unit_die, cu);
+
+ /* Possibly set the default values of LOWPC and HIGHPC from
+ `DW_AT_ranges'. */
+ cu_bounds_kind = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc,
+ &best_highpc, cu, pst);
+ if (cu_bounds_kind == PC_BOUNDS_HIGH_LOW && best_lowpc < best_highpc)
+ /* Store the contiguous range if it is not empty; it can be empty for
+ CUs with no code. */
+ addrmap_set_empty (objfile->psymtabs_addrmap,
+ gdbarch_adjust_dwarf2_addr (gdbarch,
+ best_lowpc + baseaddr),
+ gdbarch_adjust_dwarf2_addr (gdbarch,
+ best_highpc + baseaddr) - 1,
+ pst);
+
+ /* 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 (has_children)
{
- struct dwarf2_per_cu_data *this_cu;
+ struct partial_die_info *first_die;
+ CORE_ADDR lowpc, highpc;
- sect_offset sect_off = (sect_offset) (info_ptr - section->buffer);
+ lowpc = ((CORE_ADDR) -1);
+ highpc = ((CORE_ADDR) 0);
- comp_unit_head cu_header;
- read_and_check_comp_unit_head (&cu_header, section, abbrev_section,
- info_ptr, rcuh_kind::COMPILE);
+ first_die = load_partial_dies (reader, info_ptr, 1);
- /* Save the compilation unit for later lookup. */
- if (cu_header.unit_type != DW_UT_type)
- {
- this_cu = XOBNEW (&objfile->objfile_obstack,
- struct dwarf2_per_cu_data);
- memset (this_cu, 0, sizeof (*this_cu));
- }
- else
- {
- auto sig_type = XOBNEW (&objfile->objfile_obstack,
- struct signatured_type);
- memset (sig_type, 0, sizeof (*sig_type));
- sig_type->signature = cu_header.signature;
- sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
- this_cu = &sig_type->per_cu;
- }
- this_cu->is_debug_types = (cu_header.unit_type == DW_UT_type);
- this_cu->sect_off = sect_off;
- this_cu->length = cu_header.length + cu_header.initial_length_size;
- this_cu->is_dwz = is_dwz;
- this_cu->objfile = objfile;
- this_cu->section = section;
+ scan_partial_symbols (first_die, &lowpc, &highpc,
+ cu_bounds_kind <= PC_BOUNDS_INVALID, cu);
+
+ /* If we didn't find a lowpc, set it to highpc to avoid
+ complaints from `maint check'. */
+ if (lowpc == ((CORE_ADDR) -1))
+ lowpc = highpc;
- if (*n_comp_units == *n_allocated)
+ /* If the compilation unit didn't have an explicit address range,
+ then use the information extracted from its child dies. */
+ if (cu_bounds_kind <= PC_BOUNDS_INVALID)
{
- *n_allocated *= 2;
- *all_comp_units = XRESIZEVEC (struct dwarf2_per_cu_data *,
- *all_comp_units, *n_allocated);
+ best_lowpc = lowpc;
+ best_highpc = highpc;
}
- (*all_comp_units)[*n_comp_units] = this_cu;
- ++*n_comp_units;
-
- info_ptr = info_ptr + this_cu->length;
}
-}
+ pst->textlow = gdbarch_adjust_dwarf2_addr (gdbarch, best_lowpc + baseaddr);
+ pst->texthigh = gdbarch_adjust_dwarf2_addr (gdbarch, best_highpc + baseaddr);
-/* Create a list of all compilation units in OBJFILE.
- This is only done for -readnow and building partial symtabs. */
+ end_psymtab_common (objfile, pst);
-static void
-create_all_comp_units (struct objfile *objfile)
-{
- int n_allocated;
- int n_comp_units;
- struct dwarf2_per_cu_data **all_comp_units;
- struct dwz_file *dwz;
+ if (!VEC_empty (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs))
+ {
+ int i;
+ int len = VEC_length (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs);
+ struct dwarf2_per_cu_data *iter;
+
+ /* Fill in 'dependencies' here; we fill in 'users' in a
+ post-pass. */
+ pst->number_of_dependencies = len;
+ pst->dependencies =
+ XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
+ for (i = 0;
+ VEC_iterate (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs,
+ i, iter);
+ ++i)
+ pst->dependencies[i] = iter->v.psymtab;
- n_comp_units = 0;
- n_allocated = 10;
- all_comp_units = XNEWVEC (struct dwarf2_per_cu_data *, n_allocated);
+ VEC_free (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs);
+ }
- read_comp_units_from_section (objfile, &dwarf2_per_objfile->info,
- &dwarf2_per_objfile->abbrev, 0,
- &n_allocated, &n_comp_units, &all_comp_units);
+ /* 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);
- dwz = dwarf2_get_dwz_file ();
- if (dwz != NULL)
- read_comp_units_from_section (objfile, &dwz->info, &dwz->abbrev, 1,
- &n_allocated, &n_comp_units,
- &all_comp_units);
+ if (dwarf_read_debug)
+ {
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
- dwarf2_per_objfile->all_comp_units = XOBNEWVEC (&objfile->objfile_obstack,
- struct dwarf2_per_cu_data *,
- n_comp_units);
- memcpy (dwarf2_per_objfile->all_comp_units, all_comp_units,
- n_comp_units * sizeof (struct dwarf2_per_cu_data *));
- xfree (all_comp_units);
- dwarf2_per_objfile->n_comp_units = n_comp_units;
+ fprintf_unfiltered (gdb_stdlog,
+ "Psymtab for %s unit @%s: %s - %s"
+ ", %d global, %d static syms\n",
+ per_cu->is_debug_types ? "type" : "comp",
+ sect_offset_str (per_cu->sect_off),
+ paddress (gdbarch, pst->textlow),
+ paddress (gdbarch, pst->texthigh),
+ pst->n_global_syms, pst->n_static_syms);
+ }
}
-/* Process all loaded DIEs for compilation unit CU, starting at
- FIRST_DIE. The caller should pass SET_ADDRMAP == 1 if the compilation
- unit DIE did not have PC info (DW_AT_low_pc and DW_AT_high_pc, or
- DW_AT_ranges). See the comments of add_partial_subprogram on how
- SET_ADDRMAP is used and how *LOWPC and *HIGHPC are updated. */
+/* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
+ Process compilation unit THIS_CU for a psymtab. */
static void
-scan_partial_symbols (struct partial_die_info *first_die, CORE_ADDR *lowpc,
- CORE_ADDR *highpc, int set_addrmap,
- struct dwarf2_cu *cu)
+process_psymtab_comp_unit (struct dwarf2_per_cu_data *this_cu,
+ int want_partial_unit,
+ enum language pretend_language)
{
- struct partial_die_info *pdi;
+ /* If this compilation unit was already read in, free the
+ cached copy in order to read it in again. This is
+ necessary because we skipped some symbols when we first
+ read in the compilation unit (see load_partial_dies).
+ This problem could be avoided, but the benefit is unclear. */
+ if (this_cu->cu != NULL)
+ free_one_cached_comp_unit (this_cu);
- /* 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. */
+ if (this_cu->is_debug_types)
+ init_cutu_and_read_dies (this_cu, NULL, 0, 0, false,
+ build_type_psymtabs_reader, NULL);
+ else
+ {
+ process_psymtab_comp_unit_data info;
+ info.want_partial_unit = want_partial_unit;
+ info.pretend_language = pretend_language;
+ init_cutu_and_read_dies (this_cu, NULL, 0, 0, false,
+ process_psymtab_comp_unit_reader, &info);
+ }
- pdi = first_die;
+ /* Age out any secondary CUs. */
+ age_cached_comp_units (this_cu->dwarf2_per_objfile);
+}
- while (pdi != NULL)
- {
- fixup_partial_die (pdi, cu);
+/* Reader function for build_type_psymtabs. */
- /* Anonymous namespaces or modules have no name but have interesting
- children, so we need to look at them. Ditto for anonymous
- enums. */
+static void
+build_type_psymtabs_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *type_unit_die,
+ int has_children,
+ void *data)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = reader->cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_cu *cu = reader->cu;
+ struct dwarf2_per_cu_data *per_cu = cu->per_cu;
+ struct signatured_type *sig_type;
+ struct type_unit_group *tu_group;
+ struct attribute *attr;
+ struct partial_die_info *first_die;
+ CORE_ADDR lowpc, highpc;
+ struct partial_symtab *pst;
- if (pdi->name != NULL || pdi->tag == DW_TAG_namespace
- || pdi->tag == DW_TAG_module || pdi->tag == DW_TAG_enumeration_type
- || pdi->tag == DW_TAG_imported_unit)
- {
- switch (pdi->tag)
- {
- case DW_TAG_subprogram:
- add_partial_subprogram (pdi, lowpc, highpc, set_addrmap, cu);
- break;
- case DW_TAG_constant:
- case DW_TAG_variable:
- case DW_TAG_typedef:
- case DW_TAG_union_type:
- if (!pdi->is_declaration)
- {
- add_partial_symbol (pdi, cu);
- }
- break;
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- if (!pdi->is_declaration)
- {
- add_partial_symbol (pdi, cu);
- }
- if (cu->language == language_rust && pdi->has_children)
- scan_partial_symbols (pdi->die_child, lowpc, highpc,
- set_addrmap, cu);
- break;
- case DW_TAG_enumeration_type:
- if (!pdi->is_declaration)
- add_partial_enumeration (pdi, cu);
- break;
- case DW_TAG_base_type:
- case DW_TAG_subrange_type:
- /* File scope base type definitions are added to the partial
- symbol table. */
- add_partial_symbol (pdi, cu);
- break;
- case DW_TAG_namespace:
- add_partial_namespace (pdi, lowpc, highpc, set_addrmap, cu);
- break;
- case DW_TAG_module:
- add_partial_module (pdi, lowpc, highpc, set_addrmap, cu);
- break;
- case DW_TAG_imported_unit:
- {
- struct dwarf2_per_cu_data *per_cu;
+ gdb_assert (data == NULL);
+ gdb_assert (per_cu->is_debug_types);
+ sig_type = (struct signatured_type *) per_cu;
- /* For now we don't handle imported units in type units. */
- if (cu->per_cu->is_debug_types)
- {
- error (_("Dwarf Error: DW_TAG_imported_unit is not"
- " supported in type units [in module %s]"),
- objfile_name (cu->objfile));
- }
+ if (! has_children)
+ return;
- per_cu = dwarf2_find_containing_comp_unit (pdi->d.sect_off,
- pdi->is_dwz,
- cu->objfile);
+ attr = dwarf2_attr_no_follow (type_unit_die, DW_AT_stmt_list);
+ tu_group = get_type_unit_group (cu, attr);
- /* Go read the partial unit, if needed. */
- if (per_cu->v.psymtab == NULL)
- process_psymtab_comp_unit (per_cu, 1, cu->language);
+ VEC_safe_push (sig_type_ptr, tu_group->tus, sig_type);
- VEC_safe_push (dwarf2_per_cu_ptr,
- cu->per_cu->imported_symtabs, per_cu);
- }
- break;
- case DW_TAG_imported_declaration:
- add_partial_symbol (pdi, cu);
- break;
- default:
- break;
- }
- }
+ prepare_one_comp_unit (cu, type_unit_die, language_minimal);
+ cu->list_in_scope = &file_symbols;
+ pst = create_partial_symtab (per_cu, "");
+ pst->anonymous = 1;
- /* If the die has a sibling, skip to the sibling. */
+ first_die = load_partial_dies (reader, info_ptr, 1);
- pdi = pdi->die_sibling;
- }
+ lowpc = (CORE_ADDR) -1;
+ highpc = (CORE_ADDR) 0;
+ scan_partial_symbols (first_die, &lowpc, &highpc, 0, cu);
+
+ end_psymtab_common (objfile, pst);
}
-/* Functions used to compute the fully scoped name of a partial DIE.
+/* Struct used to sort TUs by their abbreviation table offset. */
- 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.
+struct tu_abbrev_offset
+{
+ tu_abbrev_offset (signatured_type *sig_type_, sect_offset abbrev_offset_)
+ : sig_type (sig_type_), abbrev_offset (abbrev_offset_)
+ {}
- 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. */
+ signatured_type *sig_type;
+ sect_offset abbrev_offset;
+};
-/* 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 const char *
-partial_die_parent_scope (struct partial_die_info *pdi,
- struct dwarf2_cu *cu)
+/* Helper routine for build_type_psymtabs_1, passed to std::sort. */
+
+static bool
+sort_tu_by_abbrev_offset (const struct tu_abbrev_offset &a,
+ const struct tu_abbrev_offset &b)
{
- const char *grandparent_scope;
- struct partial_die_info *parent, *real_pdi;
+ return a.abbrev_offset < b.abbrev_offset;
+}
- /* We need to look at our parent DIE; if we have a DW_AT_specification,
- then this means the parent of the specification DIE. */
+/* Efficiently read all the type units.
+ This does the bulk of the work for build_type_psymtabs.
- real_pdi = pdi;
- while (real_pdi->has_specification)
- real_pdi = find_partial_die (real_pdi->spec_offset,
- real_pdi->spec_is_dwz, cu);
+ The efficiency is because we sort TUs by the abbrev table they use and
+ only read each abbrev table once. In one program there are 200K TUs
+ sharing 8K abbrev tables.
- parent = real_pdi->die_parent;
- if (parent == NULL)
- return NULL;
+ The main purpose of this function is to support building the
+ dwarf2_per_objfile->type_unit_groups table.
+ TUs typically share the DW_AT_stmt_list of the CU they came from, so we
+ can collapse the search space by grouping them by stmt_list.
+ The savings can be significant, in the same program from above the 200K TUs
+ share 8K stmt_list tables.
- if (parent->scope_set)
- return parent->scope;
+ FUNC is expected to call get_type_unit_group, which will create the
+ struct type_unit_group if necessary and add it to
+ dwarf2_per_objfile->type_unit_groups. */
- fixup_partial_die (parent, cu);
+static void
+build_type_psymtabs_1 (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
+ abbrev_table_up abbrev_table;
+ sect_offset abbrev_offset;
- grandparent_scope = partial_die_parent_scope (parent, cu);
+ /* It's up to the caller to not call us multiple times. */
+ gdb_assert (dwarf2_per_objfile->type_unit_groups == NULL);
- /* GCC 4.0 and 4.1 had a bug (PR c++/28460) where they generated bogus
- DW_TAG_namespace DIEs with a name of "::" for the global namespace.
- Work around this problem here. */
- if (cu->language == language_cplus
- && parent->tag == DW_TAG_namespace
- && strcmp (parent->name, "::") == 0
- && grandparent_scope == NULL)
- {
- parent->scope = NULL;
- parent->scope_set = 1;
- return NULL;
- }
+ if (dwarf2_per_objfile->all_type_units.empty ())
+ return;
- if (pdi->tag == DW_TAG_enumerator)
- /* Enumerators should not get the name of the enumeration as a prefix. */
- parent->scope = grandparent_scope;
- else if (parent->tag == DW_TAG_namespace
- || parent->tag == DW_TAG_module
- || parent->tag == DW_TAG_structure_type
- || parent->tag == DW_TAG_class_type
- || parent->tag == DW_TAG_interface_type
- || parent->tag == DW_TAG_union_type
- || parent->tag == DW_TAG_enumeration_type)
- {
- if (grandparent_scope == NULL)
- parent->scope = parent->name;
- else
- parent->scope = typename_concat (&cu->comp_unit_obstack,
- grandparent_scope,
- parent->name, 0, cu);
- }
- 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, to_underlying (pdi->sect_off));
- parent->scope = grandparent_scope;
- }
+ /* TUs typically share abbrev tables, and there can be way more TUs than
+ abbrev tables. Sort by abbrev table to reduce the number of times we
+ read each abbrev table in.
+ Alternatives are to punt or to maintain a cache of abbrev tables.
+ This is simpler and efficient enough for now.
- parent->scope_set = 1;
- return parent->scope;
-}
+ Later we group TUs by their DW_AT_stmt_list value (as this defines the
+ symtab to use). Typically TUs with the same abbrev offset have the same
+ stmt_list value too so in practice this should work well.
-/* Return the fully scoped name associated with PDI, from compilation unit
- CU. The result will be allocated with malloc. */
+ The basic algorithm here is:
-static char *
-partial_die_full_name (struct partial_die_info *pdi,
- struct dwarf2_cu *cu)
-{
- const char *parent_scope;
+ sort TUs by abbrev table
+ for each TU with same abbrev table:
+ read abbrev table if first user
+ read TU top level DIE
+ [IWBN if DWO skeletons had DW_AT_stmt_list]
+ call FUNC */
- /* If this is a template instantiation, we can not work out the
- template arguments from partial DIEs. So, unfortunately, we have
- to go through the full DIEs. At least any work we do building
- types here will be reused if full symbols are loaded later. */
- if (pdi->has_template_arguments)
- {
- fixup_partial_die (pdi, cu);
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "Building type unit groups ...\n");
- if (pdi->name != NULL && strchr (pdi->name, '<') == NULL)
- {
- struct die_info *die;
- struct attribute attr;
- struct dwarf2_cu *ref_cu = cu;
+ /* Sort in a separate table to maintain the order of all_type_units
+ for .gdb_index: TU indices directly index all_type_units. */
+ std::vector<tu_abbrev_offset> sorted_by_abbrev;
+ sorted_by_abbrev.reserve (dwarf2_per_objfile->all_type_units.size ());
- /* DW_FORM_ref_addr is using section offset. */
- attr.name = (enum dwarf_attribute) 0;
- attr.form = DW_FORM_ref_addr;
- attr.u.unsnd = to_underlying (pdi->sect_off);
- die = follow_die_ref (NULL, &attr, &ref_cu);
+ for (signatured_type *sig_type : dwarf2_per_objfile->all_type_units)
+ sorted_by_abbrev.emplace_back
+ (sig_type, read_abbrev_offset (dwarf2_per_objfile,
+ sig_type->per_cu.section,
+ sig_type->per_cu.sect_off));
- return xstrdup (dwarf2_full_name (NULL, die, ref_cu));
+ std::sort (sorted_by_abbrev.begin (), sorted_by_abbrev.end (),
+ sort_tu_by_abbrev_offset);
+
+ abbrev_offset = (sect_offset) ~(unsigned) 0;
+
+ for (const tu_abbrev_offset &tu : sorted_by_abbrev)
+ {
+ /* Switch to the next abbrev table if necessary. */
+ if (abbrev_table == NULL
+ || tu.abbrev_offset != abbrev_offset)
+ {
+ abbrev_offset = tu.abbrev_offset;
+ abbrev_table =
+ abbrev_table_read_table (dwarf2_per_objfile,
+ &dwarf2_per_objfile->abbrev,
+ abbrev_offset);
+ ++tu_stats->nr_uniq_abbrev_tables;
}
- }
- parent_scope = partial_die_parent_scope (pdi, cu);
- if (parent_scope == NULL)
- return NULL;
- else
- return typename_concat (NULL, parent_scope, pdi->name, 0, cu);
+ init_cutu_and_read_dies (&tu.sig_type->per_cu, abbrev_table.get (),
+ 0, 0, false, build_type_psymtabs_reader, NULL);
+ }
}
+/* Print collected type unit statistics. */
+
static void
-add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
+print_tu_stats (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR addr = 0;
- const char *actual_name = NULL;
- CORE_ADDR baseaddr;
- char *built_actual_name;
+ struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats;
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ fprintf_unfiltered (gdb_stdlog, "Type unit statistics:\n");
+ fprintf_unfiltered (gdb_stdlog, " %zu TUs\n",
+ dwarf2_per_objfile->all_type_units.size ());
+ fprintf_unfiltered (gdb_stdlog, " %d uniq abbrev tables\n",
+ tu_stats->nr_uniq_abbrev_tables);
+ fprintf_unfiltered (gdb_stdlog, " %d symtabs from stmt_list entries\n",
+ tu_stats->nr_symtabs);
+ fprintf_unfiltered (gdb_stdlog, " %d symtab sharers\n",
+ tu_stats->nr_symtab_sharers);
+ fprintf_unfiltered (gdb_stdlog, " %d type units without a stmt_list\n",
+ tu_stats->nr_stmt_less_type_units);
+ fprintf_unfiltered (gdb_stdlog, " %d all_type_units reallocs\n",
+ tu_stats->nr_all_type_units_reallocs);
+}
- built_actual_name = partial_die_full_name (pdi, cu);
- if (built_actual_name != NULL)
- actual_name = built_actual_name;
+/* Traversal function for build_type_psymtabs. */
- if (actual_name == NULL)
- actual_name = pdi->name;
+static int
+build_type_psymtab_dependencies (void **slot, void *info)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = (struct dwarf2_per_objfile *) info;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct type_unit_group *tu_group = (struct type_unit_group *) *slot;
+ struct dwarf2_per_cu_data *per_cu = &tu_group->per_cu;
+ struct partial_symtab *pst = per_cu->v.psymtab;
+ int len = VEC_length (sig_type_ptr, tu_group->tus);
+ struct signatured_type *iter;
+ int i;
- switch (pdi->tag)
+ gdb_assert (len > 0);
+ gdb_assert (IS_TYPE_UNIT_GROUP (per_cu));
+
+ pst->number_of_dependencies = len;
+ pst->dependencies =
+ XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
+ for (i = 0;
+ VEC_iterate (sig_type_ptr, tu_group->tus, i, iter);
+ ++i)
{
- case DW_TAG_subprogram:
- addr = gdbarch_adjust_dwarf2_addr (gdbarch, pdi->lowpc + baseaddr);
- if (pdi->is_external || cu->language == language_ada)
- {
- /* brobecker/2007-12-26: Normally, only "external" DIEs are part
- of the global scope. But in Ada, we want to be able to access
- nested procedures globally. So all Ada subprograms are stored
- in the global scope. */
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_BLOCK,
- &objfile->global_psymbols,
- addr, cu->language, objfile);
- }
- else
- {
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_BLOCK,
- &objfile->static_psymbols,
- addr, cu->language, objfile);
- }
+ gdb_assert (iter->per_cu.is_debug_types);
+ pst->dependencies[i] = iter->per_cu.v.psymtab;
+ iter->type_unit_group = tu_group;
+ }
- if (pdi->main_subprogram && actual_name != NULL)
- set_objfile_main_name (objfile, actual_name, cu->language);
- break;
- case DW_TAG_constant:
- {
- std::vector<partial_symbol *> *list;
+ VEC_free (sig_type_ptr, tu_group->tus);
- if (pdi->is_external)
- list = &objfile->global_psymbols;
- else
- list = &objfile->static_psymbols;
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL, VAR_DOMAIN, LOC_STATIC,
- list, 0, cu->language, objfile);
- }
- break;
- case DW_TAG_variable:
- if (pdi->d.locdesc)
- addr = decode_locdesc (pdi->d.locdesc, cu);
+ return 1;
+}
- if (pdi->d.locdesc
- && addr == 0
- && !dwarf2_per_objfile->has_section_at_zero)
- {
- /* A global or static variable may also have been stripped
- out by the linker if unused, in which case its address
- will be nullified; do not add such variables into partial
- symbol table then. */
- }
- else 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. */
+/* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
+ Build partial symbol tables for the .debug_types comp-units. */
- if (pdi->d.locdesc || pdi->has_type)
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_STATIC,
- &objfile->global_psymbols,
- addr + baseaddr,
- cu->language, objfile);
- }
- else
- {
- int has_loc = pdi->d.locdesc != NULL;
+static void
+build_type_psymtabs (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ if (! create_all_type_units (dwarf2_per_objfile))
+ return;
- /* Static Variable. Skip symbols whose value we cannot know (those
- without location descriptors or constant values). */
- if (!has_loc && !pdi->has_const_value)
- {
- xfree (built_actual_name);
- return;
- }
+ build_type_psymtabs_1 (dwarf2_per_objfile);
+}
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_STATIC,
- &objfile->static_psymbols,
- has_loc ? addr + baseaddr : (CORE_ADDR) 0,
- cu->language, objfile);
- }
- break;
- case DW_TAG_typedef:
- case DW_TAG_base_type:
- case DW_TAG_subrange_type:
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_TYPEDEF,
- &objfile->static_psymbols,
- 0, cu->language, objfile);
- break;
- case DW_TAG_imported_declaration:
- case DW_TAG_namespace:
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_TYPEDEF,
- &objfile->global_psymbols,
- 0, cu->language, objfile);
- break;
- case DW_TAG_module:
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- MODULE_DOMAIN, LOC_TYPEDEF,
- &objfile->global_psymbols,
- 0, cu->language, objfile);
- break;
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- case DW_TAG_enumeration_type:
- /* Skip external references. The DWARF standard says in the section
- about "Structure, Union, and Class Type Entries": "An incomplete
- structure, union or class type is represented by a structure,
- union or class entry that does not have a byte size attribute
- and that has a DW_AT_declaration attribute." */
- if (!pdi->has_byte_size && pdi->is_declaration)
- {
- xfree (built_actual_name);
- return;
- }
+/* Traversal function for process_skeletonless_type_unit.
+ Read a TU in a DWO file and build partial symbols for it. */
- /* NOTE: carlton/2003-10-07: See comment in new_symbol about
- static vs. global. */
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- STRUCT_DOMAIN, LOC_TYPEDEF,
- cu->language == language_cplus
- ? &objfile->global_psymbols
- : &objfile->static_psymbols,
- 0, cu->language, objfile);
+static int
+process_skeletonless_type_unit (void **slot, void *info)
+{
+ struct dwo_unit *dwo_unit = (struct dwo_unit *) *slot;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = (struct dwarf2_per_objfile *) info;
+ struct signatured_type find_entry, *entry;
- break;
- case DW_TAG_enumerator:
- add_psymbol_to_list (actual_name, strlen (actual_name),
- built_actual_name != NULL,
- VAR_DOMAIN, LOC_CONST,
- cu->language == language_cplus
- ? &objfile->global_psymbols
- : &objfile->static_psymbols,
- 0, cu->language, objfile);
- break;
- default:
- break;
- }
-
- xfree (built_actual_name);
-}
+ /* If this TU doesn't exist in the global table, add it and read it in. */
-/* 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. */
+ if (dwarf2_per_objfile->signatured_types == NULL)
+ {
+ dwarf2_per_objfile->signatured_types
+ = allocate_signatured_type_table (dwarf2_per_objfile->objfile);
+ }
-static void
-add_partial_namespace (struct partial_die_info *pdi,
- CORE_ADDR *lowpc, CORE_ADDR *highpc,
- int set_addrmap, struct dwarf2_cu *cu)
-{
- /* Add a symbol for the namespace. */
+ find_entry.signature = dwo_unit->signature;
+ slot = htab_find_slot (dwarf2_per_objfile->signatured_types, &find_entry,
+ INSERT);
+ /* If we've already seen this type there's nothing to do. What's happening
+ is we're doing our own version of comdat-folding here. */
+ if (*slot != NULL)
+ return 1;
- add_partial_symbol (pdi, cu);
+ /* This does the job that create_all_type_units would have done for
+ this TU. */
+ entry = add_type_unit (dwarf2_per_objfile, dwo_unit->signature, slot);
+ fill_in_sig_entry_from_dwo_entry (dwarf2_per_objfile, entry, dwo_unit);
+ *slot = entry;
- /* Now scan partial symbols in that namespace. */
+ /* This does the job that build_type_psymtabs_1 would have done. */
+ init_cutu_and_read_dies (&entry->per_cu, NULL, 0, 0, false,
+ build_type_psymtabs_reader, NULL);
- if (pdi->has_children)
- scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu);
+ return 1;
}
-/* Read a partial die corresponding to a Fortran module. */
+/* Traversal function for process_skeletonless_type_units. */
-static void
-add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc,
- CORE_ADDR *highpc, int set_addrmap, struct dwarf2_cu *cu)
+static int
+process_dwo_file_for_skeletonless_type_units (void **slot, void *info)
{
- /* Add a symbol for the namespace. */
-
- add_partial_symbol (pdi, cu);
+ struct dwo_file *dwo_file = (struct dwo_file *) *slot;
- /* Now scan partial symbols in that module. */
+ if (dwo_file->tus != NULL)
+ {
+ htab_traverse_noresize (dwo_file->tus,
+ process_skeletonless_type_unit, info);
+ }
- if (pdi->has_children)
- scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu);
+ return 1;
}
-/* Read a partial die corresponding to a subprogram and create a partial
- symbol for that subprogram. When the CU language allows it, this
- routine also defines a partial symbol for each nested subprogram
- that this subprogram contains. If SET_ADDRMAP is true, record the
- covered ranges in the addrmap. Set *LOWPC and *HIGHPC to the lowest
- and highest PC values found in PDI.
-
- PDI may also be a lexical block, in which case we simply search
- recursively for subprograms defined inside that lexical block.
- Again, this is only performed when the CU language allows this
- type of definitions. */
+/* Scan all TUs of DWO files, verifying we've processed them.
+ This is needed in case a TU was emitted without its skeleton.
+ Note: This can't be done until we know what all the DWO files are. */
static void
-add_partial_subprogram (struct partial_die_info *pdi,
- CORE_ADDR *lowpc, CORE_ADDR *highpc,
- int set_addrmap, struct dwarf2_cu *cu)
+process_skeletonless_type_units (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- if (pdi->tag == DW_TAG_subprogram)
+ /* Skeletonless TUs in DWP files without .gdb_index is not supported yet. */
+ if (get_dwp_file (dwarf2_per_objfile) == NULL
+ && dwarf2_per_objfile->dwo_files != NULL)
{
- if (pdi->has_pc_info)
- {
- if (pdi->lowpc < *lowpc)
- *lowpc = pdi->lowpc;
- if (pdi->highpc > *highpc)
- *highpc = pdi->highpc;
- if (set_addrmap)
- {
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR baseaddr;
- CORE_ADDR highpc;
- CORE_ADDR lowpc;
-
- baseaddr = ANOFFSET (objfile->section_offsets,
- SECT_OFF_TEXT (objfile));
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch,
- pdi->lowpc + baseaddr);
- highpc = gdbarch_adjust_dwarf2_addr (gdbarch,
- pdi->highpc + baseaddr);
- addrmap_set_empty (objfile->psymtabs_addrmap, lowpc, highpc - 1,
- cu->per_cu->v.psymtab);
- }
- }
-
- if (pdi->has_pc_info || (!pdi->is_external && pdi->may_be_inlined))
- {
- if (!pdi->is_declaration)
- /* Ignore subprogram DIEs that do not have a name, they are
- illegal. Do not emit a complaint at this point, we will
- do so when we convert this psymtab into a symtab. */
- if (pdi->name)
- add_partial_symbol (pdi, cu);
- }
+ htab_traverse_noresize (dwarf2_per_objfile->dwo_files,
+ process_dwo_file_for_skeletonless_type_units,
+ dwarf2_per_objfile);
}
+}
- if (! pdi->has_children)
- return;
+/* Compute the 'user' field for each psymtab in DWARF2_PER_OBJFILE. */
- if (cu->language == language_ada)
+static void
+set_partial_user (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
{
- pdi = pdi->die_child;
- while (pdi != NULL)
+ struct partial_symtab *pst = per_cu->v.psymtab;
+
+ if (pst == NULL)
+ continue;
+
+ for (int j = 0; j < pst->number_of_dependencies; ++j)
{
- fixup_partial_die (pdi, cu);
- if (pdi->tag == DW_TAG_subprogram
- || pdi->tag == DW_TAG_lexical_block)
- add_partial_subprogram (pdi, lowpc, highpc, set_addrmap, cu);
- pdi = pdi->die_sibling;
+ /* Set the 'user' field only if it is not already set. */
+ if (pst->dependencies[j]->user == NULL)
+ pst->dependencies[j]->user = pst;
}
}
}
-/* Read a partial die corresponding to an enumeration type. */
+/* Build the partial symbol table by doing a quick pass through the
+ .debug_info and .debug_abbrev sections. */
static void
-add_partial_enumeration (struct partial_die_info *enum_pdi,
- struct dwarf2_cu *cu)
+dwarf2_build_psymtabs_hard (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct partial_die_info *pdi;
-
- if (enum_pdi->name != NULL)
- add_partial_symbol (enum_pdi, cu);
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- pdi = enum_pdi->die_child;
- while (pdi)
+ if (dwarf_read_debug)
{
- if (pdi->tag != DW_TAG_enumerator || pdi->name == NULL)
- complaint (&symfile_complaints, _("malformed enumerator DIE ignored"));
- else
- add_partial_symbol (pdi, cu);
- pdi = pdi->die_sibling;
+ fprintf_unfiltered (gdb_stdlog, "Building psymtabs of objfile %s ...\n",
+ objfile_name (objfile));
}
-}
-/* Return the initial uleb128 in the die at INFO_PTR. */
+ dwarf2_per_objfile->reading_partial_symbols = 1;
-static unsigned int
-peek_abbrev_code (bfd *abfd, const gdb_byte *info_ptr)
-{
- unsigned int bytes_read;
+ dwarf2_read_section (objfile, &dwarf2_per_objfile->info);
- return read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-}
+ /* Any cached compilation units will be linked by the per-objfile
+ read_in_chain. Make sure to free them when we're done. */
+ free_cached_comp_units freer (dwarf2_per_objfile);
-/* 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. */
+ build_type_psymtabs (dwarf2_per_objfile);
-static struct abbrev_info *
-peek_die_abbrev (const gdb_byte *info_ptr, unsigned int *bytes_read,
- struct dwarf2_cu *cu)
-{
- bfd *abfd = cu->objfile->obfd;
- unsigned int abbrev_number;
- struct abbrev_info *abbrev;
+ create_all_comp_units (dwarf2_per_objfile);
- abbrev_number = read_unsigned_leb128 (abfd, info_ptr, bytes_read);
+ /* Create a temporary address map on a temporary obstack. We later
+ copy this to the final obstack. */
+ auto_obstack temp_obstack;
- if (abbrev_number == 0)
- return NULL;
+ scoped_restore save_psymtabs_addrmap
+ = make_scoped_restore (&objfile->psymtabs_addrmap,
+ addrmap_create_mutable (&temp_obstack));
- abbrev = abbrev_table_lookup_abbrev (cu->abbrev_table, abbrev_number);
- if (!abbrev)
+ for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units)
+ process_psymtab_comp_unit (per_cu, 0, language_minimal);
+
+ /* This has to wait until we read the CUs, we need the list of DWOs. */
+ process_skeletonless_type_units (dwarf2_per_objfile);
+
+ /* Now that all TUs have been processed we can fill in the dependencies. */
+ if (dwarf2_per_objfile->type_unit_groups != NULL)
{
- error (_("Dwarf Error: Could not find abbrev number %d in %s"
- " at offset 0x%x [in module %s]"),
- abbrev_number, cu->per_cu->is_debug_types ? "TU" : "CU",
- to_underlying (cu->header.sect_off), bfd_get_filename (abfd));
+ htab_traverse_noresize (dwarf2_per_objfile->type_unit_groups,
+ build_type_psymtab_dependencies, dwarf2_per_objfile);
}
- return abbrev;
+ if (dwarf_read_debug)
+ print_tu_stats (dwarf2_per_objfile);
+
+ set_partial_user (dwarf2_per_objfile);
+
+ objfile->psymtabs_addrmap = addrmap_create_fixed (objfile->psymtabs_addrmap,
+ &objfile->objfile_obstack);
+ /* At this point we want to keep the address map. */
+ save_psymtabs_addrmap.release ();
+
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "Done building psymtabs of %s\n",
+ objfile_name (objfile));
}
-/* Scan the debug information for CU starting at INFO_PTR in buffer BUFFER.
- 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. */
+/* die_reader_func for load_partial_comp_unit. */
-static const gdb_byte *
-skip_children (const struct die_reader_specs *reader, const gdb_byte *info_ptr)
+static void
+load_partial_comp_unit_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *data)
{
struct dwarf2_cu *cu = reader->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 (reader, info_ptr + bytes_read, abbrev);
- }
+ prepare_one_comp_unit (cu, comp_unit_die, language_minimal);
+
+ /* 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 (has_children)
+ load_partial_dies (reader, info_ptr, 0);
}
-/* Scan the debug information for CU starting at INFO_PTR in buffer BUFFER.
- 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. */
+/* Load the partial DIEs for a secondary CU into memory.
+ This is also used when rereading a primary CU with load_all_dies. */
-static const gdb_byte *
-skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr,
- struct abbrev_info *abbrev)
+static void
+load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu)
{
- unsigned int bytes_read;
- struct attribute attr;
- bfd *abfd = reader->abfd;
- struct dwarf2_cu *cu = reader->cu;
- const gdb_byte *buffer = reader->buffer;
- const gdb_byte *buffer_end = reader->buffer_end;
- unsigned int form, i;
+ init_cutu_and_read_dies (this_cu, NULL, 1, 1, false,
+ load_partial_comp_unit_reader, NULL);
+}
- 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 (reader, &attr, &abbrev->attrs[i], info_ptr);
- if (attr.form == DW_FORM_ref_addr)
- complaint (&symfile_complaints,
- _("ignoring absolute DW_AT_sibling"));
- else
- {
- sect_offset off = dwarf2_get_ref_die_offset (&attr);
- const gdb_byte *sibling_ptr = buffer + to_underlying (off);
-
- if (sibling_ptr < info_ptr)
- complaint (&symfile_complaints,
- _("DW_AT_sibling points backwards"));
- else if (sibling_ptr > reader->buffer_end)
- dwarf2_section_buffer_overflow_complaint (reader->die_section);
- else
- return sibling_ptr;
- }
- }
-
- /* If it isn't DW_AT_sibling, skip this attribute. */
- form = abbrev->attrs[i].form;
- skip_attribute:
- switch (form)
- {
- case DW_FORM_ref_addr:
- /* In DWARF 2, DW_FORM_ref_addr is address sized; in DWARF 3
- and later it is offset sized. */
- if (cu->header.version == 2)
- info_ptr += cu->header.addr_size;
- else
- info_ptr += cu->header.offset_size;
- break;
- case DW_FORM_GNU_ref_alt:
- info_ptr += cu->header.offset_size;
- break;
- case DW_FORM_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_flag_present:
- case DW_FORM_implicit_const:
- 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:
- case DW_FORM_ref_sig8:
- info_ptr += 8;
- break;
- case DW_FORM_data16:
- info_ptr += 16;
- break;
- case DW_FORM_string:
- read_direct_string (abfd, info_ptr, &bytes_read);
- info_ptr += bytes_read;
- break;
- case DW_FORM_sec_offset:
- case DW_FORM_strp:
- case DW_FORM_GNU_strp_alt:
- info_ptr += cu->header.offset_size;
- break;
- case DW_FORM_exprloc:
- 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:
- case DW_FORM_GNU_addr_index:
- case DW_FORM_GNU_str_index:
- info_ptr = safe_skip_leb128 (info_ptr, buffer_end);
- 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 (reader, info_ptr);
- else
- return info_ptr;
-}
-
-/* Locate ORIG_PDI's sibling.
- INFO_PTR should point to the start of the next DIE after ORIG_PDI. */
-
-static const gdb_byte *
-locate_pdi_sibling (const struct die_reader_specs *reader,
- struct partial_die_info *orig_pdi,
- const gdb_byte *info_ptr)
+static void
+read_comp_units_from_section (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ struct dwarf2_section_info *abbrev_section,
+ unsigned int is_dwz)
{
- /* Do we know the sibling already? */
+ const gdb_byte *info_ptr;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- if (orig_pdi->sibling)
- return orig_pdi->sibling;
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "Reading %s for %s\n",
+ get_section_name (section),
+ get_section_file_name (section));
- /* Are there any children to deal with? */
+ dwarf2_read_section (objfile, section);
- if (!orig_pdi->has_children)
- return info_ptr;
+ info_ptr = section->buffer;
- /* Skip the children the long way. */
+ while (info_ptr < section->buffer + section->size)
+ {
+ struct dwarf2_per_cu_data *this_cu;
- return skip_children (reader, info_ptr);
-}
+ sect_offset sect_off = (sect_offset) (info_ptr - section->buffer);
-/* Expand this partial symbol table into a full symbol table. SELF is
- not NULL. */
+ comp_unit_head cu_header;
+ read_and_check_comp_unit_head (dwarf2_per_objfile, &cu_header, section,
+ abbrev_section, info_ptr,
+ rcuh_kind::COMPILE);
-static void
-dwarf2_read_symtab (struct partial_symtab *self,
- struct objfile *objfile)
-{
- if (self->readin)
- {
- warning (_("bug: psymtab for %s is already read in."),
- self->filename);
- }
- else
- {
- if (info_verbose)
+ /* Save the compilation unit for later lookup. */
+ if (cu_header.unit_type != DW_UT_type)
{
- printf_filtered (_("Reading in symbols for %s..."),
- self->filename);
- gdb_flush (gdb_stdout);
+ this_cu = XOBNEW (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_data);
+ memset (this_cu, 0, sizeof (*this_cu));
}
-
- /* Restore our global data. */
- dwarf2_per_objfile
- = (struct dwarf2_per_objfile *) objfile_data (objfile,
- dwarf2_objfile_data_key);
-
- /* If this psymtab is constructed from a debug-only objfile, the
- has_section_at_zero flag will not necessarily be correct. We
- can get the correct value for this flag by looking at the data
- associated with the (presumably stripped) associated objfile. */
- if (objfile->separate_debug_objfile_backlink)
+ else
{
- struct dwarf2_per_objfile *dpo_backlink
- = ((struct dwarf2_per_objfile *)
- objfile_data (objfile->separate_debug_objfile_backlink,
- dwarf2_objfile_data_key));
-
- dwarf2_per_objfile->has_section_at_zero
- = dpo_backlink->has_section_at_zero;
+ auto sig_type = XOBNEW (&objfile->objfile_obstack,
+ struct signatured_type);
+ memset (sig_type, 0, sizeof (*sig_type));
+ sig_type->signature = cu_header.signature;
+ sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
+ this_cu = &sig_type->per_cu;
}
+ this_cu->is_debug_types = (cu_header.unit_type == DW_UT_type);
+ this_cu->sect_off = sect_off;
+ this_cu->length = cu_header.length + cu_header.initial_length_size;
+ this_cu->is_dwz = is_dwz;
+ this_cu->dwarf2_per_objfile = dwarf2_per_objfile;
+ this_cu->section = section;
- dwarf2_per_objfile->reading_partial_symbols = 0;
-
- psymtab_to_symtab_1 (self);
+ dwarf2_per_objfile->all_comp_units.push_back (this_cu);
- /* Finish up the debug error message. */
- if (info_verbose)
- printf_filtered (_("done.\n"));
+ info_ptr = info_ptr + this_cu->length;
}
-
- process_cu_includes ();
}
-\f
-/* Reading in full CUs. */
-/* Add PER_CU to the queue. */
+/* Create a list of all compilation units in OBJFILE.
+ This is only done for -readnow and building partial symtabs. */
static void
-queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
- enum language pretend_language)
+create_all_comp_units (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct dwarf2_queue_item *item;
+ gdb_assert (dwarf2_per_objfile->all_comp_units.empty ());
+ read_comp_units_from_section (dwarf2_per_objfile, &dwarf2_per_objfile->info,
+ &dwarf2_per_objfile->abbrev, 0);
- per_cu->queued = 1;
- item = XNEW (struct dwarf2_queue_item);
- item->per_cu = per_cu;
- item->pretend_language = pretend_language;
- item->next = NULL;
+ dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+ if (dwz != NULL)
+ read_comp_units_from_section (dwarf2_per_objfile, &dwz->info, &dwz->abbrev,
+ 1);
+}
- if (dwarf2_queue == NULL)
- dwarf2_queue = item;
- else
- dwarf2_queue_tail->next = item;
+/* Process all loaded DIEs for compilation unit CU, starting at
+ FIRST_DIE. The caller should pass SET_ADDRMAP == 1 if the compilation
+ unit DIE did not have PC info (DW_AT_low_pc and DW_AT_high_pc, or
+ DW_AT_ranges). See the comments of add_partial_subprogram on how
+ SET_ADDRMAP is used and how *LOWPC and *HIGHPC are updated. */
- dwarf2_queue_tail = item;
-}
+static void
+scan_partial_symbols (struct partial_die_info *first_die, CORE_ADDR *lowpc,
+ CORE_ADDR *highpc, int set_addrmap,
+ struct dwarf2_cu *cu)
+{
+ struct partial_die_info *pdi;
-/* If PER_CU is not yet queued, add it to the queue.
- If DEPENDENT_CU is non-NULL, it has a reference to PER_CU so add a
- dependency.
- The result is non-zero if PER_CU was queued, otherwise the result is zero
- meaning either PER_CU is already queued or it is already loaded.
+ /* 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. */
- N.B. There is an invariant here that if a CU is queued then it is loaded.
- The caller is required to load PER_CU if we return non-zero. */
+ pdi = first_die;
-static int
-maybe_queue_comp_unit (struct dwarf2_cu *dependent_cu,
- struct dwarf2_per_cu_data *per_cu,
- enum language pretend_language)
-{
- /* We may arrive here during partial symbol reading, if we need full
- DIEs to process an unusual case (e.g. template arguments). Do
- not queue PER_CU, just tell our caller to load its DIEs. */
- if (dwarf2_per_objfile->reading_partial_symbols)
+ while (pdi != NULL)
{
- if (per_cu->cu == NULL || per_cu->cu->dies == NULL)
- return 1;
- return 0;
- }
+ pdi->fixup (cu);
- /* Mark the dependence relation so that we don't flush PER_CU
- too early. */
- if (dependent_cu != NULL)
- dwarf2_add_dependence (dependent_cu, per_cu);
+ /* Anonymous namespaces or modules have no name but have interesting
+ children, so we need to look at them. Ditto for anonymous
+ enums. */
- /* If it's already on the queue, we have nothing to do. */
- if (per_cu->queued)
- return 0;
+ if (pdi->name != NULL || pdi->tag == DW_TAG_namespace
+ || pdi->tag == DW_TAG_module || pdi->tag == DW_TAG_enumeration_type
+ || pdi->tag == DW_TAG_imported_unit
+ || pdi->tag == DW_TAG_inlined_subroutine)
+ {
+ switch (pdi->tag)
+ {
+ case DW_TAG_subprogram:
+ case DW_TAG_inlined_subroutine:
+ add_partial_subprogram (pdi, lowpc, highpc, set_addrmap, cu);
+ break;
+ case DW_TAG_constant:
+ case DW_TAG_variable:
+ case DW_TAG_typedef:
+ case DW_TAG_union_type:
+ if (!pdi->is_declaration)
+ {
+ add_partial_symbol (pdi, cu);
+ }
+ break;
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ if (!pdi->is_declaration)
+ {
+ add_partial_symbol (pdi, cu);
+ }
+ if ((cu->language == language_rust
+ || cu->language == language_cplus) && pdi->has_children)
+ scan_partial_symbols (pdi->die_child, lowpc, highpc,
+ set_addrmap, cu);
+ break;
+ case DW_TAG_enumeration_type:
+ if (!pdi->is_declaration)
+ add_partial_enumeration (pdi, cu);
+ break;
+ case DW_TAG_base_type:
+ case DW_TAG_subrange_type:
+ /* File scope base type definitions are added to the partial
+ symbol table. */
+ add_partial_symbol (pdi, cu);
+ break;
+ case DW_TAG_namespace:
+ add_partial_namespace (pdi, lowpc, highpc, set_addrmap, cu);
+ break;
+ case DW_TAG_module:
+ add_partial_module (pdi, lowpc, highpc, set_addrmap, cu);
+ break;
+ case DW_TAG_imported_unit:
+ {
+ struct dwarf2_per_cu_data *per_cu;
- /* If the compilation unit is already loaded, just mark it as
- used. */
- if (per_cu->cu != NULL)
- {
- per_cu->cu->last_used = 0;
- return 0;
- }
+ /* For now we don't handle imported units in type units. */
+ if (cu->per_cu->is_debug_types)
+ {
+ error (_("Dwarf Error: DW_TAG_imported_unit is not"
+ " supported in type units [in module %s]"),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ }
- /* Add it to the queue. */
- queue_comp_unit (per_cu, pretend_language);
+ per_cu = dwarf2_find_containing_comp_unit
+ (pdi->d.sect_off, pdi->is_dwz,
+ cu->per_cu->dwarf2_per_objfile);
- return 1;
-}
+ /* Go read the partial unit, if needed. */
+ if (per_cu->v.psymtab == NULL)
+ process_psymtab_comp_unit (per_cu, 1, cu->language);
-/* Process the queue. */
+ VEC_safe_push (dwarf2_per_cu_ptr,
+ cu->per_cu->imported_symtabs, per_cu);
+ }
+ break;
+ case DW_TAG_imported_declaration:
+ add_partial_symbol (pdi, cu);
+ break;
+ default:
+ break;
+ }
+ }
-static void
-process_queue (void)
-{
- struct dwarf2_queue_item *item, *next_item;
+ /* If the die has a sibling, skip to the sibling. */
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "Expanding one or more symtabs of objfile %s ...\n",
- objfile_name (dwarf2_per_objfile->objfile));
+ pdi = pdi->die_sibling;
}
+}
- /* The queue starts out with one item, but following a DIE reference
- may load a new CU, adding it to the end of the queue. */
- for (item = dwarf2_queue; item != NULL; dwarf2_queue = item = next_item)
- {
- if ((dwarf2_per_objfile->using_index
- ? !item->per_cu->v.quick->compunit_symtab
- : (item->per_cu->v.psymtab && !item->per_cu->v.psymtab->readin))
- /* Skip dummy CUs. */
- && item->per_cu->cu != NULL)
- {
- struct dwarf2_per_cu_data *per_cu = item->per_cu;
- unsigned int debug_print_threshold;
- char buf[100];
+/* Functions used to compute the fully scoped name of a partial DIE.
- if (per_cu->is_debug_types)
- {
- struct signatured_type *sig_type =
- (struct signatured_type *) per_cu;
+ 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.
- sprintf (buf, "TU %s at offset 0x%x",
- hex_string (sig_type->signature),
- to_underlying (per_cu->sect_off));
- /* There can be 100s of TUs.
- Only print them in verbose mode. */
- debug_print_threshold = 2;
- }
- else
- {
- sprintf (buf, "CU at offset 0x%x",
- to_underlying (per_cu->sect_off));
- debug_print_threshold = 1;
- }
+ 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. */
- if (dwarf_read_debug >= debug_print_threshold)
- fprintf_unfiltered (gdb_stdlog, "Expanding symtab of %s\n", buf);
+/* 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 const char *
+partial_die_parent_scope (struct partial_die_info *pdi,
+ struct dwarf2_cu *cu)
+{
+ const char *grandparent_scope;
+ struct partial_die_info *parent, *real_pdi;
- if (per_cu->is_debug_types)
- process_full_type_unit (per_cu, item->pretend_language);
- else
- process_full_comp_unit (per_cu, item->pretend_language);
+ /* We need to look at our parent DIE; if we have a DW_AT_specification,
+ then this means the parent of the specification DIE. */
- if (dwarf_read_debug >= debug_print_threshold)
- fprintf_unfiltered (gdb_stdlog, "Done expanding %s\n", buf);
- }
+ real_pdi = pdi;
+ while (real_pdi->has_specification)
+ real_pdi = find_partial_die (real_pdi->spec_offset,
+ real_pdi->spec_is_dwz, cu);
- item->per_cu->queued = 0;
- next_item = item->next;
- xfree (item);
- }
+ parent = real_pdi->die_parent;
+ if (parent == NULL)
+ return NULL;
- dwarf2_queue_tail = NULL;
+ if (parent->scope_set)
+ return parent->scope;
- if (dwarf_read_debug)
+ parent->fixup (cu);
+
+ grandparent_scope = partial_die_parent_scope (parent, cu);
+
+ /* GCC 4.0 and 4.1 had a bug (PR c++/28460) where they generated bogus
+ DW_TAG_namespace DIEs with a name of "::" for the global namespace.
+ Work around this problem here. */
+ if (cu->language == language_cplus
+ && parent->tag == DW_TAG_namespace
+ && strcmp (parent->name, "::") == 0
+ && grandparent_scope == NULL)
{
- fprintf_unfiltered (gdb_stdlog, "Done expanding symtabs of %s.\n",
- objfile_name (dwarf2_per_objfile->objfile));
+ parent->scope = NULL;
+ parent->scope_set = 1;
+ return NULL;
+ }
+
+ if (pdi->tag == DW_TAG_enumerator)
+ /* Enumerators should not get the name of the enumeration as a prefix. */
+ parent->scope = grandparent_scope;
+ else if (parent->tag == DW_TAG_namespace
+ || parent->tag == DW_TAG_module
+ || parent->tag == DW_TAG_structure_type
+ || parent->tag == DW_TAG_class_type
+ || parent->tag == DW_TAG_interface_type
+ || parent->tag == DW_TAG_union_type
+ || parent->tag == DW_TAG_enumeration_type)
+ {
+ if (grandparent_scope == NULL)
+ parent->scope = parent->name;
+ else
+ parent->scope = typename_concat (&cu->comp_unit_obstack,
+ grandparent_scope,
+ parent->name, 0, cu);
+ }
+ 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 (_("unhandled containing DIE tag %d for DIE at %s"),
+ parent->tag, sect_offset_str (pdi->sect_off));
+ parent->scope = grandparent_scope;
}
+
+ parent->scope_set = 1;
+ return parent->scope;
}
-/* Free all allocated queue entries. This function only releases anything if
- an error was thrown; if the queue was processed then it would have been
- freed as we went along. */
+/* Return the fully scoped name associated with PDI, from compilation unit
+ CU. The result will be allocated with malloc. */
-static void
-dwarf2_release_queue (void *dummy)
+static char *
+partial_die_full_name (struct partial_die_info *pdi,
+ struct dwarf2_cu *cu)
{
- struct dwarf2_queue_item *item, *last;
+ const char *parent_scope;
- item = dwarf2_queue;
- while (item)
+ /* If this is a template instantiation, we can not work out the
+ template arguments from partial DIEs. So, unfortunately, we have
+ to go through the full DIEs. At least any work we do building
+ types here will be reused if full symbols are loaded later. */
+ if (pdi->has_template_arguments)
{
- /* Anything still marked queued is likely to be in an
- inconsistent state, so discard it. */
- if (item->per_cu->queued)
+ pdi->fixup (cu);
+
+ if (pdi->name != NULL && strchr (pdi->name, '<') == NULL)
{
- if (item->per_cu->cu != NULL)
- free_one_cached_comp_unit (item->per_cu);
- item->per_cu->queued = 0;
- }
+ struct die_info *die;
+ struct attribute attr;
+ struct dwarf2_cu *ref_cu = cu;
+
+ /* DW_FORM_ref_addr is using section offset. */
+ attr.name = (enum dwarf_attribute) 0;
+ attr.form = DW_FORM_ref_addr;
+ attr.u.unsnd = to_underlying (pdi->sect_off);
+ die = follow_die_ref (NULL, &attr, &ref_cu);
- last = item;
- item = item->next;
- xfree (last);
+ return xstrdup (dwarf2_full_name (NULL, die, ref_cu));
+ }
}
- dwarf2_queue = dwarf2_queue_tail = NULL;
+ parent_scope = partial_die_parent_scope (pdi, cu);
+ if (parent_scope == NULL)
+ return NULL;
+ else
+ return typename_concat (NULL, parent_scope, pdi->name, 0, cu);
}
-/* Read in full symbols for PST, and anything it depends on. */
-
static void
-psymtab_to_symtab_1 (struct partial_symtab *pst)
+add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
{
- struct dwarf2_per_cu_data *per_cu;
- int i;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ CORE_ADDR addr = 0;
+ const char *actual_name = NULL;
+ CORE_ADDR baseaddr;
+ char *built_actual_name;
- if (pst->readin)
- return;
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- for (i = 0; i < pst->number_of_dependencies; i++)
- if (!pst->dependencies[i]->readin
- && pst->dependencies[i]->user == NULL)
- {
- /* Inform about additional files that need to be read in. */
- if (info_verbose)
- {
- /* FIXME: i18n: Need to make this a single string. */
- 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]);
- }
+ built_actual_name = partial_die_full_name (pdi, cu);
+ if (built_actual_name != NULL)
+ actual_name = built_actual_name;
- per_cu = (struct dwarf2_per_cu_data *) pst->read_symtab_private;
+ if (actual_name == NULL)
+ actual_name = pdi->name;
- if (per_cu == NULL)
+ switch (pdi->tag)
{
- /* It's an include file, no symbols to read for it.
- Everything is in the parent symtab. */
- pst->readin = 1;
- return;
- }
+ case DW_TAG_inlined_subroutine:
+ case DW_TAG_subprogram:
+ addr = gdbarch_adjust_dwarf2_addr (gdbarch, pdi->lowpc + baseaddr);
+ if (pdi->is_external || cu->language == language_ada)
+ {
+ /* brobecker/2007-12-26: Normally, only "external" DIEs are part
+ of the global scope. But in Ada, we want to be able to access
+ nested procedures globally. So all Ada subprograms are stored
+ in the global scope. */
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_BLOCK,
+ &objfile->global_psymbols,
+ addr, cu->language, objfile);
+ }
+ else
+ {
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_BLOCK,
+ &objfile->static_psymbols,
+ addr, cu->language, objfile);
+ }
- dw2_do_instantiate_symtab (per_cu);
-}
+ if (pdi->main_subprogram && actual_name != NULL)
+ set_objfile_main_name (objfile, actual_name, cu->language);
+ break;
+ case DW_TAG_constant:
+ {
+ std::vector<partial_symbol *> *list;
-/* Trivial hash function for die_info: the hash value of a DIE
- is its offset in .debug_info for this objfile. */
+ if (pdi->is_external)
+ list = &objfile->global_psymbols;
+ else
+ list = &objfile->static_psymbols;
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL, VAR_DOMAIN, LOC_STATIC,
+ list, 0, cu->language, objfile);
+ }
+ break;
+ case DW_TAG_variable:
+ if (pdi->d.locdesc)
+ addr = decode_locdesc (pdi->d.locdesc, cu);
-static hashval_t
-die_hash (const void *item)
-{
- const struct die_info *die = (const struct die_info *) item;
+ if (pdi->d.locdesc
+ && addr == 0
+ && !dwarf2_per_objfile->has_section_at_zero)
+ {
+ /* A global or static variable may also have been stripped
+ out by the linker if unused, in which case its address
+ will be nullified; do not add such variables into partial
+ symbol table then. */
+ }
+ else 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. */
- return to_underlying (die->sect_off);
-}
+ if (pdi->d.locdesc || pdi->has_type)
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_STATIC,
+ &objfile->global_psymbols,
+ addr + baseaddr,
+ cu->language, objfile);
+ }
+ else
+ {
+ int has_loc = pdi->d.locdesc != NULL;
-/* Trivial comparison function for die_info structures: two DIEs
- are equal if they have the same offset. */
+ /* Static Variable. Skip symbols whose value we cannot know (those
+ without location descriptors or constant values). */
+ if (!has_loc && !pdi->has_const_value)
+ {
+ xfree (built_actual_name);
+ return;
+ }
-static int
-die_eq (const void *item_lhs, const void *item_rhs)
-{
- const struct die_info *die_lhs = (const struct die_info *) item_lhs;
- const struct die_info *die_rhs = (const struct die_info *) item_rhs;
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_STATIC,
+ &objfile->static_psymbols,
+ has_loc ? addr + baseaddr : (CORE_ADDR) 0,
+ cu->language, objfile);
+ }
+ break;
+ case DW_TAG_typedef:
+ case DW_TAG_base_type:
+ case DW_TAG_subrange_type:
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_TYPEDEF,
+ &objfile->static_psymbols,
+ 0, cu->language, objfile);
+ break;
+ case DW_TAG_imported_declaration:
+ case DW_TAG_namespace:
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_TYPEDEF,
+ &objfile->global_psymbols,
+ 0, cu->language, objfile);
+ break;
+ case DW_TAG_module:
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ MODULE_DOMAIN, LOC_TYPEDEF,
+ &objfile->global_psymbols,
+ 0, cu->language, objfile);
+ break;
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ case DW_TAG_enumeration_type:
+ /* Skip external references. The DWARF standard says in the section
+ about "Structure, Union, and Class Type Entries": "An incomplete
+ structure, union or class type is represented by a structure,
+ union or class entry that does not have a byte size attribute
+ and that has a DW_AT_declaration attribute." */
+ if (!pdi->has_byte_size && pdi->is_declaration)
+ {
+ xfree (built_actual_name);
+ return;
+ }
- return die_lhs->sect_off == die_rhs->sect_off;
+ /* NOTE: carlton/2003-10-07: See comment in new_symbol about
+ static vs. global. */
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ STRUCT_DOMAIN, LOC_TYPEDEF,
+ cu->language == language_cplus
+ ? &objfile->global_psymbols
+ : &objfile->static_psymbols,
+ 0, cu->language, objfile);
+
+ break;
+ case DW_TAG_enumerator:
+ add_psymbol_to_list (actual_name, strlen (actual_name),
+ built_actual_name != NULL,
+ VAR_DOMAIN, LOC_CONST,
+ cu->language == language_cplus
+ ? &objfile->global_psymbols
+ : &objfile->static_psymbols,
+ 0, cu->language, objfile);
+ break;
+ default:
+ break;
+ }
+
+ xfree (built_actual_name);
}
-/* die_reader_func for load_full_comp_unit.
- This is identical to read_signatured_type_reader,
- but is kept separate for now. */
+/* 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. */
static void
-load_full_comp_unit_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *data)
+add_partial_namespace (struct partial_die_info *pdi,
+ CORE_ADDR *lowpc, CORE_ADDR *highpc,
+ int set_addrmap, struct dwarf2_cu *cu)
{
- struct dwarf2_cu *cu = reader->cu;
- enum language *language_ptr = (enum language *) data;
+ /* Add a symbol for the namespace. */
- gdb_assert (cu->die_hash == NULL);
- cu->die_hash =
- htab_create_alloc_ex (cu->header.length / 12,
- die_hash,
- die_eq,
- NULL,
- &cu->comp_unit_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ add_partial_symbol (pdi, cu);
- if (has_children)
- comp_unit_die->child = read_die_and_siblings (reader, info_ptr,
- &info_ptr, comp_unit_die);
- cu->dies = comp_unit_die;
- /* comp_unit_die is not stored in die_hash, no need. */
+ /* Now scan partial symbols in that namespace. */
- /* We try not to read any attributes in this function, because not
- all CUs needed for references have been loaded yet, and symbol
- table processing isn't initialized. But we have to set the CU language,
- or we won't be able to build types correctly.
- Similarly, if we do not read the producer, we can not apply
- producer-specific interpretation. */
- prepare_one_comp_unit (cu, cu->dies, *language_ptr);
+ if (pdi->has_children)
+ scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu);
}
-/* Load the DIEs associated with PER_CU into memory. */
+/* Read a partial die corresponding to a Fortran module. */
static void
-load_full_comp_unit (struct dwarf2_per_cu_data *this_cu,
- enum language pretend_language)
+add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc,
+ CORE_ADDR *highpc, int set_addrmap, struct dwarf2_cu *cu)
{
- gdb_assert (! this_cu->is_debug_types);
+ /* Add a symbol for the namespace. */
- init_cutu_and_read_dies (this_cu, NULL, 1, 1,
- load_full_comp_unit_reader, &pretend_language);
-}
+ add_partial_symbol (pdi, cu);
-/* Add a DIE to the delayed physname list. */
+ /* Now scan partial symbols in that module. */
-static void
-add_to_method_list (struct type *type, int fnfield_index, int index,
- const char *name, struct die_info *die,
- struct dwarf2_cu *cu)
-{
- struct delayed_method_info mi;
- mi.type = type;
- mi.fnfield_index = fnfield_index;
- mi.index = index;
- mi.name = name;
- mi.die = die;
- VEC_safe_push (delayed_method_info, cu->method_list, &mi);
+ if (pdi->has_children)
+ scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu);
}
-/* A cleanup for freeing the delayed method list. */
+/* Read a partial die corresponding to a subprogram or an inlined
+ subprogram and create a partial symbol for that subprogram.
+ When the CU language allows it, this routine also defines a partial
+ symbol for each nested subprogram that this subprogram contains.
+ If SET_ADDRMAP is true, record the covered ranges in the addrmap.
+ Set *LOWPC and *HIGHPC to the lowest and highest PC values found in PDI.
+
+ PDI may also be a lexical block, in which case we simply search
+ recursively for subprograms defined inside that lexical block.
+ Again, this is only performed when the CU language allows this
+ type of definitions. */
static void
-free_delayed_list (void *ptr)
+add_partial_subprogram (struct partial_die_info *pdi,
+ CORE_ADDR *lowpc, CORE_ADDR *highpc,
+ int set_addrmap, struct dwarf2_cu *cu)
{
- struct dwarf2_cu *cu = (struct dwarf2_cu *) ptr;
- if (cu->method_list != NULL)
+ if (pdi->tag == DW_TAG_subprogram || pdi->tag == DW_TAG_inlined_subroutine)
{
- VEC_free (delayed_method_info, cu->method_list);
- cu->method_list = NULL;
- }
-}
+ if (pdi->has_pc_info)
+ {
+ if (pdi->lowpc < *lowpc)
+ *lowpc = pdi->lowpc;
+ if (pdi->highpc > *highpc)
+ *highpc = pdi->highpc;
+ if (set_addrmap)
+ {
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ CORE_ADDR baseaddr;
+ CORE_ADDR highpc;
+ CORE_ADDR lowpc;
-/* Check whether [PHYSNAME, PHYSNAME+LEN) ends with a modifier like
- "const" / "volatile". If so, decrements LEN by the length of the
- modifier and return true. Otherwise return false. */
+ baseaddr = ANOFFSET (objfile->section_offsets,
+ SECT_OFF_TEXT (objfile));
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch,
+ pdi->lowpc + baseaddr);
+ highpc = gdbarch_adjust_dwarf2_addr (gdbarch,
+ pdi->highpc + baseaddr);
+ addrmap_set_empty (objfile->psymtabs_addrmap, lowpc, highpc - 1,
+ cu->per_cu->v.psymtab);
+ }
+ }
-template<size_t N>
-static bool
-check_modifier (const char *physname, size_t &len, const char (&mod)[N])
-{
- size_t mod_len = sizeof (mod) - 1;
- if (len > mod_len && startswith (physname + (len - mod_len), mod))
- {
- len -= mod_len;
- return true;
+ if (pdi->has_pc_info || (!pdi->is_external && pdi->may_be_inlined))
+ {
+ if (!pdi->is_declaration)
+ /* Ignore subprogram DIEs that do not have a name, they are
+ illegal. Do not emit a complaint at this point, we will
+ do so when we convert this psymtab into a symtab. */
+ if (pdi->name)
+ add_partial_symbol (pdi, cu);
+ }
}
- return false;
-}
-
-/* Compute the physnames of any methods on the CU's method list.
-
- The computation of method physnames is delayed in order to avoid the
- (bad) condition that one of the method's formal parameters is of an as yet
- incomplete type. */
-
-static void
-compute_delayed_physnames (struct dwarf2_cu *cu)
-{
- int i;
- struct delayed_method_info *mi;
- /* Only C++ delays computing physnames. */
- if (VEC_empty (delayed_method_info, cu->method_list))
+ if (! pdi->has_children)
return;
- gdb_assert (cu->language == language_cplus);
- for (i = 0; VEC_iterate (delayed_method_info, cu->method_list, i, mi) ; ++i)
+ if (cu->language == language_ada)
{
- const char *physname;
- struct fn_fieldlist *fn_flp
- = &TYPE_FN_FIELDLIST (mi->type, mi->fnfield_index);
- physname = dwarf2_physname (mi->name, mi->die, cu);
- TYPE_FN_FIELD_PHYSNAME (fn_flp->fn_fields, mi->index)
- = physname ? physname : "";
-
- /* Since there's no tag to indicate whether a method is a
- const/volatile overload, extract that information out of the
- demangled name. */
- if (physname != NULL)
+ pdi = pdi->die_child;
+ while (pdi != NULL)
{
- size_t len = strlen (physname);
-
- while (1)
- {
- if (physname[len] == ')') /* shortcut */
- break;
- else if (check_modifier (physname, len, " const"))
- TYPE_FN_FIELD_CONST (fn_flp->fn_fields, mi->index) = 1;
- else if (check_modifier (physname, len, " volatile"))
- TYPE_FN_FIELD_VOLATILE (fn_flp->fn_fields, mi->index) = 1;
- else
- break;
- }
+ pdi->fixup (cu);
+ if (pdi->tag == DW_TAG_subprogram
+ || pdi->tag == DW_TAG_inlined_subroutine
+ || pdi->tag == DW_TAG_lexical_block)
+ add_partial_subprogram (pdi, lowpc, highpc, set_addrmap, cu);
+ pdi = pdi->die_sibling;
}
}
}
-/* Go objects should be embedded in a DW_TAG_module DIE,
- and it's not clear if/how imported objects will appear.
- To keep Go support simple until that's worked out,
- go back through what we've read and create something usable.
- We could do this while processing each DIE, and feels kinda cleaner,
- but that way is more invasive.
- This is to, for example, allow the user to type "p var" or "b main"
- without having to specify the package name, and allow lookups
- of module.object to work in contexts that use the expression
- parser. */
+/* Read a partial die corresponding to an enumeration type. */
static void
-fixup_go_packaging (struct dwarf2_cu *cu)
+add_partial_enumeration (struct partial_die_info *enum_pdi,
+ struct dwarf2_cu *cu)
{
- char *package_name = NULL;
- struct pending *list;
- int i;
+ struct partial_die_info *pdi;
- for (list = global_symbols; list != NULL; list = list->next)
+ if (enum_pdi->name != NULL)
+ add_partial_symbol (enum_pdi, cu);
+
+ pdi = enum_pdi->die_child;
+ while (pdi)
{
- for (i = 0; i < list->nsyms; ++i)
- {
- struct symbol *sym = list->symbol[i];
+ if (pdi->tag != DW_TAG_enumerator || pdi->name == NULL)
+ complaint (_("malformed enumerator DIE ignored"));
+ else
+ add_partial_symbol (pdi, cu);
+ pdi = pdi->die_sibling;
+ }
+}
- if (SYMBOL_LANGUAGE (sym) == language_go
- && SYMBOL_CLASS (sym) == LOC_BLOCK)
- {
- char *this_package_name = go_symbol_package_name (sym);
+/* Return the initial uleb128 in the die at INFO_PTR. */
- if (this_package_name == NULL)
- continue;
- if (package_name == NULL)
- package_name = this_package_name;
- else
- {
- if (strcmp (package_name, this_package_name) != 0)
- complaint (&symfile_complaints,
- _("Symtab %s has objects from two different Go packages: %s and %s"),
- (symbol_symtab (sym) != NULL
- ? symtab_to_filename_for_display
- (symbol_symtab (sym))
- : objfile_name (cu->objfile)),
- this_package_name, package_name);
- xfree (this_package_name);
- }
- }
- }
- }
+static unsigned int
+peek_abbrev_code (bfd *abfd, const gdb_byte *info_ptr)
+{
+ unsigned int bytes_read;
- if (package_name != NULL)
- {
- struct objfile *objfile = cu->objfile;
- const char *saved_package_name
- = (const char *) obstack_copy0 (&objfile->per_bfd->storage_obstack,
- package_name,
- strlen (package_name));
- struct type *type = init_type (objfile, TYPE_CODE_MODULE, 0,
- saved_package_name);
- struct symbol *sym;
+ return read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+}
- TYPE_TAG_NAME (type) = TYPE_NAME (type);
+/* Read the initial uleb128 in the die at INFO_PTR in compilation unit
+ READER::CU. Use READER::ABBREV_TABLE to lookup any abbreviation.
- sym = allocate_symbol (objfile);
- SYMBOL_SET_LANGUAGE (sym, language_go, &objfile->objfile_obstack);
- SYMBOL_SET_NAMES (sym, saved_package_name,
- strlen (saved_package_name), 0, objfile);
- /* This is not VAR_DOMAIN because we want a way to ensure a lookup of,
- e.g., "main" finds the "main" module and not C's main(). */
- SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- SYMBOL_TYPE (sym) = type;
+ 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. */
- add_symbol_to_list (sym, &global_symbols);
+static struct abbrev_info *
+peek_die_abbrev (const die_reader_specs &reader,
+ const gdb_byte *info_ptr, unsigned int *bytes_read)
+{
+ dwarf2_cu *cu = reader.cu;
+ bfd *abfd = cu->per_cu->dwarf2_per_objfile->objfile->obfd;
+ unsigned int abbrev_number
+ = read_unsigned_leb128 (abfd, info_ptr, bytes_read);
- xfree (package_name);
+ if (abbrev_number == 0)
+ return NULL;
+
+ abbrev_info *abbrev = reader.abbrev_table->lookup_abbrev (abbrev_number);
+ if (!abbrev)
+ {
+ error (_("Dwarf Error: Could not find abbrev number %d in %s"
+ " at offset %s [in module %s]"),
+ abbrev_number, cu->per_cu->is_debug_types ? "TU" : "CU",
+ sect_offset_str (cu->header.sect_off), bfd_get_filename (abfd));
}
+
+ return abbrev;
}
-/* Return the symtab for PER_CU. This works properly regardless of
- whether we're using the index or psymtabs. */
+/* Scan the debug information for CU starting at INFO_PTR in buffer BUFFER.
+ 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 struct compunit_symtab *
-get_compunit_symtab (struct dwarf2_per_cu_data *per_cu)
+static const gdb_byte *
+skip_children (const struct die_reader_specs *reader, const gdb_byte *info_ptr)
{
- return (dwarf2_per_objfile->using_index
- ? per_cu->v.quick->compunit_symtab
- : per_cu->v.psymtab->compunit_symtab);
+ while (1)
+ {
+ unsigned int bytes_read;
+ abbrev_info *abbrev = peek_die_abbrev (*reader, info_ptr, &bytes_read);
+
+ if (abbrev == NULL)
+ return info_ptr + bytes_read;
+ else
+ info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
+ }
}
-/* A helper function for computing the list of all symbol tables
- included by PER_CU. */
+/* Scan the debug information for CU starting at INFO_PTR in buffer BUFFER.
+ 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 void
-recursively_compute_inclusions (VEC (compunit_symtab_ptr) **result,
- htab_t all_children, htab_t all_type_symtabs,
- struct dwarf2_per_cu_data *per_cu,
- struct compunit_symtab *immediate_parent)
+static const gdb_byte *
+skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr,
+ struct abbrev_info *abbrev)
{
- void **slot;
- int ix;
- struct compunit_symtab *cust;
- struct dwarf2_per_cu_data *iter;
+ unsigned int bytes_read;
+ struct attribute attr;
+ bfd *abfd = reader->abfd;
+ struct dwarf2_cu *cu = reader->cu;
+ const gdb_byte *buffer = reader->buffer;
+ const gdb_byte *buffer_end = reader->buffer_end;
+ unsigned int form, i;
- slot = htab_find_slot (all_children, per_cu, INSERT);
- if (*slot != NULL)
+ for (i = 0; i < abbrev->num_attrs; i++)
{
- /* This inclusion and its children have been processed. */
- return;
- }
-
- *slot = per_cu;
- /* Only add a CU if it has a symbol table. */
- cust = get_compunit_symtab (per_cu);
- if (cust != NULL)
- {
- /* If this is a type unit only add its symbol table if we haven't
- seen it yet (type unit per_cu's can share symtabs). */
- if (per_cu->is_debug_types)
+ /* The only abbrev we care about is DW_AT_sibling. */
+ if (abbrev->attrs[i].name == DW_AT_sibling)
{
- slot = htab_find_slot (all_type_symtabs, cust, INSERT);
- if (*slot == NULL)
+ read_attribute (reader, &attr, &abbrev->attrs[i], info_ptr);
+ if (attr.form == DW_FORM_ref_addr)
+ complaint (_("ignoring absolute DW_AT_sibling"));
+ else
{
- *slot = cust;
- VEC_safe_push (compunit_symtab_ptr, *result, cust);
- if (cust->user == NULL)
- cust->user = immediate_parent;
+ sect_offset off = dwarf2_get_ref_die_offset (&attr);
+ const gdb_byte *sibling_ptr = buffer + to_underlying (off);
+
+ if (sibling_ptr < info_ptr)
+ complaint (_("DW_AT_sibling points backwards"));
+ else if (sibling_ptr > reader->buffer_end)
+ dwarf2_section_buffer_overflow_complaint (reader->die_section);
+ else
+ return sibling_ptr;
}
}
- else
+
+ /* If it isn't DW_AT_sibling, skip this attribute. */
+ form = abbrev->attrs[i].form;
+ skip_attribute:
+ switch (form)
{
- VEC_safe_push (compunit_symtab_ptr, *result, cust);
- if (cust->user == NULL)
- cust->user = immediate_parent;
+ case DW_FORM_ref_addr:
+ /* In DWARF 2, DW_FORM_ref_addr is address sized; in DWARF 3
+ and later it is offset sized. */
+ if (cu->header.version == 2)
+ info_ptr += cu->header.addr_size;
+ else
+ info_ptr += cu->header.offset_size;
+ break;
+ case DW_FORM_GNU_ref_alt:
+ info_ptr += cu->header.offset_size;
+ break;
+ case DW_FORM_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_flag_present:
+ case DW_FORM_implicit_const:
+ 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:
+ case DW_FORM_ref_sig8:
+ info_ptr += 8;
+ break;
+ case DW_FORM_data16:
+ info_ptr += 16;
+ break;
+ case DW_FORM_string:
+ read_direct_string (abfd, info_ptr, &bytes_read);
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_sec_offset:
+ case DW_FORM_strp:
+ case DW_FORM_GNU_strp_alt:
+ info_ptr += cu->header.offset_size;
+ break;
+ case DW_FORM_exprloc:
+ 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:
+ case DW_FORM_GNU_addr_index:
+ case DW_FORM_GNU_str_index:
+ info_ptr = safe_skip_leb128 (info_ptr, buffer_end);
+ 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));
}
}
- for (ix = 0;
- VEC_iterate (dwarf2_per_cu_ptr, per_cu->imported_symtabs, ix, iter);
- ++ix)
- {
- recursively_compute_inclusions (result, all_children,
- all_type_symtabs, iter, cust);
- }
+ if (abbrev->has_children)
+ return skip_children (reader, info_ptr);
+ else
+ return info_ptr;
}
-/* Compute the compunit_symtab 'includes' fields for the compunit_symtab of
- PER_CU. */
+/* Locate ORIG_PDI's sibling.
+ INFO_PTR should point to the start of the next DIE after ORIG_PDI. */
-static void
-compute_compunit_symtab_includes (struct dwarf2_per_cu_data *per_cu)
+static const gdb_byte *
+locate_pdi_sibling (const struct die_reader_specs *reader,
+ struct partial_die_info *orig_pdi,
+ const gdb_byte *info_ptr)
{
- gdb_assert (! per_cu->is_debug_types);
-
- if (!VEC_empty (dwarf2_per_cu_ptr, per_cu->imported_symtabs))
- {
- int ix, len;
- struct dwarf2_per_cu_data *per_cu_iter;
- struct compunit_symtab *compunit_symtab_iter;
- VEC (compunit_symtab_ptr) *result_symtabs = NULL;
- htab_t all_children, all_type_symtabs;
- struct compunit_symtab *cust = get_compunit_symtab (per_cu);
+ /* Do we know the sibling already? */
- /* If we don't have a symtab, we can just skip this case. */
- if (cust == NULL)
- return;
+ if (orig_pdi->sibling)
+ return orig_pdi->sibling;
- all_children = htab_create_alloc (1, htab_hash_pointer, htab_eq_pointer,
- NULL, xcalloc, xfree);
- all_type_symtabs = htab_create_alloc (1, htab_hash_pointer, htab_eq_pointer,
- NULL, xcalloc, xfree);
+ /* Are there any children to deal with? */
- for (ix = 0;
- VEC_iterate (dwarf2_per_cu_ptr, per_cu->imported_symtabs,
- ix, per_cu_iter);
- ++ix)
- {
- recursively_compute_inclusions (&result_symtabs, all_children,
- all_type_symtabs, per_cu_iter,
- cust);
- }
+ if (!orig_pdi->has_children)
+ return info_ptr;
- /* Now we have a transitive closure of all the included symtabs. */
- len = VEC_length (compunit_symtab_ptr, result_symtabs);
- cust->includes
- = XOBNEWVEC (&dwarf2_per_objfile->objfile->objfile_obstack,
- struct compunit_symtab *, len + 1);
- for (ix = 0;
- VEC_iterate (compunit_symtab_ptr, result_symtabs, ix,
- compunit_symtab_iter);
- ++ix)
- cust->includes[ix] = compunit_symtab_iter;
- cust->includes[len] = NULL;
+ /* Skip the children the long way. */
- VEC_free (compunit_symtab_ptr, result_symtabs);
- htab_delete (all_children);
- htab_delete (all_type_symtabs);
- }
+ return skip_children (reader, info_ptr);
}
-/* Compute the 'includes' field for the symtabs of all the CUs we just
- read. */
+/* Expand this partial symbol table into a full symbol table. SELF is
+ not NULL. */
static void
-process_cu_includes (void)
+dwarf2_read_symtab (struct partial_symtab *self,
+ struct objfile *objfile)
{
- int ix;
- struct dwarf2_per_cu_data *iter;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- for (ix = 0;
- VEC_iterate (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus,
- ix, iter);
- ++ix)
+ if (self->readin)
{
- if (! iter->is_debug_types)
- compute_compunit_symtab_includes (iter);
+ warning (_("bug: psymtab for %s is already read in."),
+ self->filename);
}
+ else
+ {
+ if (info_verbose)
+ {
+ printf_filtered (_("Reading in symbols for %s..."),
+ self->filename);
+ gdb_flush (gdb_stdout);
+ }
- VEC_free (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus);
-}
-
-/* Generate full symbol information for PER_CU, whose DIEs have
- already been loaded into memory. */
+ /* If this psymtab is constructed from a debug-only objfile, the
+ has_section_at_zero flag will not necessarily be correct. We
+ can get the correct value for this flag by looking at the data
+ associated with the (presumably stripped) associated objfile. */
+ if (objfile->separate_debug_objfile_backlink)
+ {
+ struct dwarf2_per_objfile *dpo_backlink
+ = get_dwarf2_per_objfile (objfile->separate_debug_objfile_backlink);
-static void
-process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
- enum language pretend_language)
-{
- struct dwarf2_cu *cu = per_cu->cu;
- struct objfile *objfile = per_cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR lowpc, highpc;
- struct compunit_symtab *cust;
- struct cleanup *delayed_list_cleanup;
- CORE_ADDR baseaddr;
- struct block *static_block;
- CORE_ADDR addr;
+ dwarf2_per_objfile->has_section_at_zero
+ = dpo_backlink->has_section_at_zero;
+ }
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ dwarf2_per_objfile->reading_partial_symbols = 0;
- buildsym_init ();
- scoped_free_pendings free_pending;
- delayed_list_cleanup = make_cleanup (free_delayed_list, cu);
+ psymtab_to_symtab_1 (self);
- cu->list_in_scope = &file_symbols;
+ /* Finish up the debug error message. */
+ if (info_verbose)
+ printf_filtered (_("done.\n"));
+ }
- cu->language = pretend_language;
- cu->language_defn = language_def (cu->language);
+ process_cu_includes (dwarf2_per_objfile);
+}
+\f
+/* Reading in full CUs. */
- /* Do line number decoding in read_file_scope () */
- process_die (cu->dies, cu);
+/* Add PER_CU to the queue. */
- /* For now fudge the Go package. */
- if (cu->language == language_go)
- fixup_go_packaging (cu);
+static void
+queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
+ enum language pretend_language)
+{
+ struct dwarf2_queue_item *item;
- /* Now that we have processed all the DIEs in the CU, all the types
- should be complete, and it should now be safe to compute all of the
- physnames. */
- compute_delayed_physnames (cu);
- do_cleanups (delayed_list_cleanup);
+ per_cu->queued = 1;
+ item = XNEW (struct dwarf2_queue_item);
+ item->per_cu = per_cu;
+ item->pretend_language = pretend_language;
+ item->next = NULL;
- /* 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 (cu->dies, &lowpc, &highpc, cu);
+ if (dwarf2_queue == NULL)
+ dwarf2_queue = item;
+ else
+ dwarf2_queue_tail->next = item;
- addr = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
- static_block = end_symtab_get_static_block (addr, 0, 1);
+ dwarf2_queue_tail = item;
+}
- /* If the comp unit has DW_AT_ranges, it may have discontiguous ranges.
- Also, DW_AT_ranges may record ranges not belonging to any child DIEs
- (such as virtual method tables). Record the ranges in STATIC_BLOCK's
- addrmap to help ensure it has an accurate map of pc values belonging to
- this comp unit. */
- dwarf2_record_block_ranges (cu->dies, static_block, baseaddr, cu);
+/* If PER_CU is not yet queued, add it to the queue.
+ If DEPENDENT_CU is non-NULL, it has a reference to PER_CU so add a
+ dependency.
+ The result is non-zero if PER_CU was queued, otherwise the result is zero
+ meaning either PER_CU is already queued or it is already loaded.
- cust = end_symtab_from_static_block (static_block,
- SECT_OFF_TEXT (objfile), 0);
+ N.B. There is an invariant here that if a CU is queued then it is loaded.
+ The caller is required to load PER_CU if we return non-zero. */
- if (cust != NULL)
+static int
+maybe_queue_comp_unit (struct dwarf2_cu *dependent_cu,
+ struct dwarf2_per_cu_data *per_cu,
+ enum language pretend_language)
+{
+ /* We may arrive here during partial symbol reading, if we need full
+ DIEs to process an unusual case (e.g. template arguments). Do
+ not queue PER_CU, just tell our caller to load its DIEs. */
+ if (per_cu->dwarf2_per_objfile->reading_partial_symbols)
{
- int gcc_4_minor = producer_is_gcc_ge_4 (cu->producer);
-
- /* 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 (!(cu->language == language_c
- && COMPUNIT_FILETABS (cust)->language != language_unknown))
- COMPUNIT_FILETABS (cust)->language = cu->language;
-
- /* GCC-4.0 has started to support -fvar-tracking. GCC-3.x still can
- produce DW_AT_location with location lists but it can be possibly
- invalid without -fvar-tracking. Still up to GCC-4.4.x incl. 4.4.0
- there were bugs in prologue debug info, fixed later in GCC-4.5
- by "unwind info for epilogues" patch (which is not directly related).
-
- For -gdwarf-4 type units LOCATIONS_VALID indication is fortunately not
- needed, it would be wrong due to missing DW_AT_producer there.
-
- Still one can confuse GDB by using non-standard GCC compilation
- options - this waits on GCC PR other/32998 (-frecord-gcc-switches).
- */
- if (cu->has_loclist && gcc_4_minor >= 5)
- cust->locations_valid = 1;
+ if (per_cu->cu == NULL || per_cu->cu->dies == NULL)
+ return 1;
+ return 0;
+ }
- if (gcc_4_minor >= 5)
- cust->epilogue_unwind_valid = 1;
+ /* Mark the dependence relation so that we don't flush PER_CU
+ too early. */
+ if (dependent_cu != NULL)
+ dwarf2_add_dependence (dependent_cu, per_cu);
- cust->call_site_htab = cu->call_site_htab;
- }
+ /* If it's already on the queue, we have nothing to do. */
+ if (per_cu->queued)
+ return 0;
- if (dwarf2_per_objfile->using_index)
- per_cu->v.quick->compunit_symtab = cust;
- else
+ /* If the compilation unit is already loaded, just mark it as
+ used. */
+ if (per_cu->cu != NULL)
{
- struct partial_symtab *pst = per_cu->v.psymtab;
- pst->compunit_symtab = cust;
- pst->readin = 1;
+ per_cu->cu->last_used = 0;
+ return 0;
}
- /* Push it for inclusion processing later. */
- VEC_safe_push (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus, per_cu);
+ /* Add it to the queue. */
+ queue_comp_unit (per_cu, pretend_language);
+
+ return 1;
}
-/* Generate full symbol information for type unit PER_CU, whose DIEs have
- already been loaded into memory. */
+/* Process the queue. */
static void
-process_full_type_unit (struct dwarf2_per_cu_data *per_cu,
- enum language pretend_language)
+process_queue (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct dwarf2_cu *cu = per_cu->cu;
- struct objfile *objfile = per_cu->objfile;
- struct compunit_symtab *cust;
- struct cleanup *delayed_list_cleanup;
- struct signatured_type *sig_type;
-
- gdb_assert (per_cu->is_debug_types);
- sig_type = (struct signatured_type *) per_cu;
-
- buildsym_init ();
- scoped_free_pendings free_pending;
- delayed_list_cleanup = make_cleanup (free_delayed_list, cu);
+ struct dwarf2_queue_item *item, *next_item;
- cu->list_in_scope = &file_symbols;
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog,
+ "Expanding one or more symtabs of objfile %s ...\n",
+ objfile_name (dwarf2_per_objfile->objfile));
+ }
- cu->language = pretend_language;
- cu->language_defn = language_def (cu->language);
+ /* The queue starts out with one item, but following a DIE reference
+ may load a new CU, adding it to the end of the queue. */
+ for (item = dwarf2_queue; item != NULL; dwarf2_queue = item = next_item)
+ {
+ if ((dwarf2_per_objfile->using_index
+ ? !item->per_cu->v.quick->compunit_symtab
+ : (item->per_cu->v.psymtab && !item->per_cu->v.psymtab->readin))
+ /* Skip dummy CUs. */
+ && item->per_cu->cu != NULL)
+ {
+ struct dwarf2_per_cu_data *per_cu = item->per_cu;
+ unsigned int debug_print_threshold;
+ char buf[100];
- /* The symbol tables are set up in read_type_unit_scope. */
- process_die (cu->dies, cu);
+ if (per_cu->is_debug_types)
+ {
+ struct signatured_type *sig_type =
+ (struct signatured_type *) per_cu;
- /* For now fudge the Go package. */
- if (cu->language == language_go)
- fixup_go_packaging (cu);
+ sprintf (buf, "TU %s at offset %s",
+ hex_string (sig_type->signature),
+ sect_offset_str (per_cu->sect_off));
+ /* There can be 100s of TUs.
+ Only print them in verbose mode. */
+ debug_print_threshold = 2;
+ }
+ else
+ {
+ sprintf (buf, "CU at offset %s",
+ sect_offset_str (per_cu->sect_off));
+ debug_print_threshold = 1;
+ }
- /* Now that we have processed all the DIEs in the CU, all the types
- should be complete, and it should now be safe to compute all of the
- physnames. */
- compute_delayed_physnames (cu);
- do_cleanups (delayed_list_cleanup);
+ if (dwarf_read_debug >= debug_print_threshold)
+ fprintf_unfiltered (gdb_stdlog, "Expanding symtab of %s\n", buf);
- /* TUs share symbol tables.
- If this is the first TU to use this symtab, complete the construction
- of it with end_expandable_symtab. Otherwise, complete the addition of
- this TU's symbols to the existing symtab. */
- if (sig_type->type_unit_group->compunit_symtab == NULL)
- {
- cust = end_expandable_symtab (0, SECT_OFF_TEXT (objfile));
- sig_type->type_unit_group->compunit_symtab = cust;
+ if (per_cu->is_debug_types)
+ process_full_type_unit (per_cu, item->pretend_language);
+ else
+ process_full_comp_unit (per_cu, item->pretend_language);
- if (cust != NULL)
- {
- /* 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 (!(cu->language == language_c
- && COMPUNIT_FILETABS (cust)->language != language_c))
- COMPUNIT_FILETABS (cust)->language = cu->language;
+ if (dwarf_read_debug >= debug_print_threshold)
+ fprintf_unfiltered (gdb_stdlog, "Done expanding %s\n", buf);
}
- }
- else
- {
- augment_type_symtab ();
- cust = sig_type->type_unit_group->compunit_symtab;
+
+ item->per_cu->queued = 0;
+ next_item = item->next;
+ xfree (item);
}
- if (dwarf2_per_objfile->using_index)
- per_cu->v.quick->compunit_symtab = cust;
- else
+ dwarf2_queue_tail = NULL;
+
+ if (dwarf_read_debug)
{
- struct partial_symtab *pst = per_cu->v.psymtab;
- pst->compunit_symtab = cust;
- pst->readin = 1;
+ fprintf_unfiltered (gdb_stdlog, "Done expanding symtabs of %s.\n",
+ objfile_name (dwarf2_per_objfile->objfile));
}
}
-/* Process an imported unit DIE. */
+/* Read in full symbols for PST, and anything it depends on. */
static void
-process_imported_unit_die (struct die_info *die, struct dwarf2_cu *cu)
+psymtab_to_symtab_1 (struct partial_symtab *pst)
{
- struct attribute *attr;
+ struct dwarf2_per_cu_data *per_cu;
+ int i;
- /* For now we don't handle imported units in type units. */
- if (cu->per_cu->is_debug_types)
+ if (pst->readin)
+ return;
+
+ for (i = 0; i < pst->number_of_dependencies; i++)
+ if (!pst->dependencies[i]->readin
+ && pst->dependencies[i]->user == NULL)
+ {
+ /* Inform about additional files that need to be read in. */
+ if (info_verbose)
+ {
+ /* FIXME: i18n: Need to make this a single string. */
+ 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]);
+ }
+
+ per_cu = (struct dwarf2_per_cu_data *) pst->read_symtab_private;
+
+ if (per_cu == NULL)
{
- error (_("Dwarf Error: DW_TAG_imported_unit is not"
- " supported in type units [in module %s]"),
- objfile_name (cu->objfile));
+ /* It's an include file, no symbols to read for it.
+ Everything is in the parent symtab. */
+ pst->readin = 1;
+ return;
}
- attr = dwarf2_attr (die, DW_AT_import, cu);
- if (attr != NULL)
- {
- sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
- bool is_dwz = (attr->form == DW_FORM_GNU_ref_alt || cu->per_cu->is_dwz);
- dwarf2_per_cu_data *per_cu
- = dwarf2_find_containing_comp_unit (sect_off, is_dwz, cu->objfile);
+ dw2_do_instantiate_symtab (per_cu, false);
+}
- /* If necessary, add it to the queue and load its DIEs. */
- if (maybe_queue_comp_unit (cu, per_cu, cu->language))
- load_full_comp_unit (per_cu, cu->language);
+/* Trivial hash function for die_info: the hash value of a DIE
+ is its offset in .debug_info for this objfile. */
- VEC_safe_push (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs,
- per_cu);
- }
+static hashval_t
+die_hash (const void *item)
+{
+ const struct die_info *die = (const struct die_info *) item;
+
+ return to_underlying (die->sect_off);
}
-/* RAII object that represents a process_die scope: i.e.,
- starts/finishes processing a DIE. */
-class process_die_scope
+/* Trivial comparison function for die_info structures: two DIEs
+ are equal if they have the same offset. */
+
+static int
+die_eq (const void *item_lhs, const void *item_rhs)
{
-public:
- process_die_scope (die_info *die, dwarf2_cu *cu)
- : m_die (die), m_cu (cu)
- {
- /* We should only be processing DIEs not already in process. */
- gdb_assert (!m_die->in_process);
- m_die->in_process = true;
- }
+ const struct die_info *die_lhs = (const struct die_info *) item_lhs;
+ const struct die_info *die_rhs = (const struct die_info *) item_rhs;
- ~process_die_scope ()
- {
- m_die->in_process = false;
+ return die_lhs->sect_off == die_rhs->sect_off;
+}
- /* If we're done processing the DIE for the CU that owns the line
- header, we don't need the line header anymore. */
- if (m_cu->line_header_die_owner == m_die)
- {
- delete m_cu->line_header;
- m_cu->line_header = NULL;
- m_cu->line_header_die_owner = NULL;
- }
- }
+/* die_reader_func for load_full_comp_unit.
+ This is identical to read_signatured_type_reader,
+ but is kept separate for now. */
-private:
- die_info *m_die;
- dwarf2_cu *m_cu;
-};
+static void
+load_full_comp_unit_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *data)
+{
+ struct dwarf2_cu *cu = reader->cu;
+ enum language *language_ptr = (enum language *) data;
-/* Process a die and its children. */
+ gdb_assert (cu->die_hash == NULL);
+ cu->die_hash =
+ htab_create_alloc_ex (cu->header.length / 12,
+ die_hash,
+ die_eq,
+ NULL,
+ &cu->comp_unit_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+
+ if (has_children)
+ comp_unit_die->child = read_die_and_siblings (reader, info_ptr,
+ &info_ptr, comp_unit_die);
+ cu->dies = comp_unit_die;
+ /* comp_unit_die is not stored in die_hash, no need. */
+
+ /* We try not to read any attributes in this function, because not
+ all CUs needed for references have been loaded yet, and symbol
+ table processing isn't initialized. But we have to set the CU language,
+ or we won't be able to build types correctly.
+ Similarly, if we do not read the producer, we can not apply
+ producer-specific interpretation. */
+ prepare_one_comp_unit (cu, cu->dies, *language_ptr);
+}
+
+/* Load the DIEs associated with PER_CU into memory. */
static void
-process_die (struct die_info *die, struct dwarf2_cu *cu)
+load_full_comp_unit (struct dwarf2_per_cu_data *this_cu,
+ bool skip_partial,
+ enum language pretend_language)
{
- process_die_scope scope (die, cu);
-
- switch (die->tag)
- {
- case DW_TAG_padding:
- break;
- case DW_TAG_compile_unit:
- case DW_TAG_partial_unit:
- read_file_scope (die, cu);
- break;
- case DW_TAG_type_unit:
- read_type_unit_scope (die, cu);
- break;
- case DW_TAG_subprogram:
- case DW_TAG_inlined_subroutine:
- read_func_scope (die, cu);
- break;
- case DW_TAG_lexical_block:
- case DW_TAG_try_block:
- case DW_TAG_catch_block:
- read_lexical_block_scope (die, cu);
- break;
- case DW_TAG_call_site:
- case DW_TAG_GNU_call_site:
- read_call_site_scope (die, cu);
- break;
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- process_structure_scope (die, cu);
- break;
- case DW_TAG_enumeration_type:
- process_enumeration_scope (die, cu);
- break;
+ gdb_assert (! this_cu->is_debug_types);
- /* These dies have a type, but processing them does not create
- a symbol or recurse to process the children. Therefore we can
- read them on-demand through read_type_die. */
- case DW_TAG_subroutine_type:
- case DW_TAG_set_type:
- case DW_TAG_array_type:
- case DW_TAG_pointer_type:
- case DW_TAG_ptr_to_member_type:
- case DW_TAG_reference_type:
- case DW_TAG_rvalue_reference_type:
- case DW_TAG_string_type:
- break;
+ init_cutu_and_read_dies (this_cu, NULL, 1, 1, skip_partial,
+ load_full_comp_unit_reader, &pretend_language);
+}
- case DW_TAG_base_type:
- case DW_TAG_subrange_type:
- case DW_TAG_typedef:
- /* Add a typedef symbol for the type definition, if it has a
- DW_AT_name. */
- new_symbol (die, read_type_die (die, cu), cu);
- break;
- case DW_TAG_common_block:
- read_common_block (die, cu);
- break;
- case DW_TAG_common_inclusion:
- break;
- case DW_TAG_namespace:
- cu->processing_has_namespace_info = 1;
- read_namespace (die, cu);
- break;
- case DW_TAG_module:
- cu->processing_has_namespace_info = 1;
- read_module (die, cu);
- break;
- case DW_TAG_imported_declaration:
- cu->processing_has_namespace_info = 1;
- if (read_namespace_alias (die, cu))
- break;
- /* The declaration is not a global namespace alias: fall through. */
- case DW_TAG_imported_module:
- cu->processing_has_namespace_info = 1;
- if (die->child != NULL && (die->tag == DW_TAG_imported_declaration
- || cu->language != language_fortran))
- complaint (&symfile_complaints, _("Tag '%s' has unexpected children"),
- dwarf_tag_name (die->tag));
- read_import_statement (die, cu);
- break;
+/* Add a DIE to the delayed physname list. */
- case DW_TAG_imported_unit:
- process_imported_unit_die (die, cu);
- break;
+static void
+add_to_method_list (struct type *type, int fnfield_index, int index,
+ const char *name, struct die_info *die,
+ struct dwarf2_cu *cu)
+{
+ struct delayed_method_info mi;
+ mi.type = type;
+ mi.fnfield_index = fnfield_index;
+ mi.index = index;
+ mi.name = name;
+ mi.die = die;
+ cu->method_list.push_back (mi);
+}
- case DW_TAG_variable:
- read_variable (die, cu);
- break;
+/* Check whether [PHYSNAME, PHYSNAME+LEN) ends with a modifier like
+ "const" / "volatile". If so, decrements LEN by the length of the
+ modifier and return true. Otherwise return false. */
- default:
- new_symbol (die, NULL, cu);
- break;
+template<size_t N>
+static bool
+check_modifier (const char *physname, size_t &len, const char (&mod)[N])
+{
+ size_t mod_len = sizeof (mod) - 1;
+ if (len > mod_len && startswith (physname + (len - mod_len), mod))
+ {
+ len -= mod_len;
+ return true;
}
+ return false;
}
-\f
-/* DWARF name computation. */
-/* A helper function for dwarf2_compute_name which determines whether DIE
- needs to have the name of the scope prepended to the name listed in the
- die. */
+/* Compute the physnames of any methods on the CU's method list.
-static int
-die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
+ The computation of method physnames is delayed in order to avoid the
+ (bad) condition that one of the method's formal parameters is of an as yet
+ incomplete type. */
+
+static void
+compute_delayed_physnames (struct dwarf2_cu *cu)
{
- struct attribute *attr;
+ /* Only C++ delays computing physnames. */
+ if (cu->method_list.empty ())
+ return;
+ gdb_assert (cu->language == language_cplus);
- switch (die->tag)
+ for (const delayed_method_info &mi : cu->method_list)
{
- case DW_TAG_namespace:
- case DW_TAG_typedef:
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- case DW_TAG_enumeration_type:
- case DW_TAG_enumerator:
- case DW_TAG_subprogram:
- case DW_TAG_inlined_subroutine:
- case DW_TAG_member:
- case DW_TAG_imported_declaration:
- return 1;
-
- case DW_TAG_variable:
- case DW_TAG_constant:
- /* We only need to prefix "globally" visible variables. These include
- any variable marked with DW_AT_external or any variable that
- lives in a namespace. [Variables in anonymous namespaces
- require prefixing, but they are not DW_AT_external.] */
+ const char *physname;
+ struct fn_fieldlist *fn_flp
+ = &TYPE_FN_FIELDLIST (mi.type, mi.fnfield_index);
+ physname = dwarf2_physname (mi.name, mi.die, cu);
+ TYPE_FN_FIELD_PHYSNAME (fn_flp->fn_fields, mi.index)
+ = physname ? physname : "";
- if (dwarf2_attr (die, DW_AT_specification, cu))
+ /* Since there's no tag to indicate whether a method is a
+ const/volatile overload, extract that information out of the
+ demangled name. */
+ if (physname != NULL)
{
- struct dwarf2_cu *spec_cu = cu;
+ size_t len = strlen (physname);
- return die_needs_namespace (die_specification (die, &spec_cu),
- spec_cu);
+ while (1)
+ {
+ if (physname[len] == ')') /* shortcut */
+ break;
+ else if (check_modifier (physname, len, " const"))
+ TYPE_FN_FIELD_CONST (fn_flp->fn_fields, mi.index) = 1;
+ else if (check_modifier (physname, len, " volatile"))
+ TYPE_FN_FIELD_VOLATILE (fn_flp->fn_fields, mi.index) = 1;
+ else
+ break;
+ }
}
-
- attr = dwarf2_attr (die, DW_AT_external, cu);
- if (attr == NULL && die->parent->tag != DW_TAG_namespace
- && die->parent->tag != DW_TAG_module)
- return 0;
- /* A variable in a lexical block of some kind does not need a
- namespace, even though in C++ such variables may be external
- and have a mangled name. */
- if (die->parent->tag == DW_TAG_lexical_block
- || die->parent->tag == DW_TAG_try_block
- || die->parent->tag == DW_TAG_catch_block
- || die->parent->tag == DW_TAG_subprogram)
- return 0;
- return 1;
-
- default:
- return 0;
}
+
+ /* The list is no longer needed. */
+ cu->method_list.clear ();
}
-/* Return the DIE's linkage name attribute, either DW_AT_linkage_name
- or DW_AT_MIPS_linkage_name. Returns NULL if the attribute is not
- defined for the given DIE. */
+/* Go objects should be embedded in a DW_TAG_module DIE,
+ and it's not clear if/how imported objects will appear.
+ To keep Go support simple until that's worked out,
+ go back through what we've read and create something usable.
+ We could do this while processing each DIE, and feels kinda cleaner,
+ but that way is more invasive.
+ This is to, for example, allow the user to type "p var" or "b main"
+ without having to specify the package name, and allow lookups
+ of module.object to work in contexts that use the expression
+ parser. */
-static struct attribute *
-dw2_linkage_name_attr (struct die_info *die, struct dwarf2_cu *cu)
+static void
+fixup_go_packaging (struct dwarf2_cu *cu)
{
- struct attribute *attr;
+ char *package_name = NULL;
+ struct pending *list;
+ int i;
- attr = dwarf2_attr (die, DW_AT_linkage_name, cu);
- if (attr == NULL)
- attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
+ for (list = global_symbols; list != NULL; list = list->next)
+ {
+ for (i = 0; i < list->nsyms; ++i)
+ {
+ struct symbol *sym = list->symbol[i];
- return attr;
+ if (SYMBOL_LANGUAGE (sym) == language_go
+ && SYMBOL_CLASS (sym) == LOC_BLOCK)
+ {
+ char *this_package_name = go_symbol_package_name (sym);
+
+ if (this_package_name == NULL)
+ continue;
+ if (package_name == NULL)
+ package_name = this_package_name;
+ else
+ {
+ struct objfile *objfile
+ = cu->per_cu->dwarf2_per_objfile->objfile;
+ if (strcmp (package_name, this_package_name) != 0)
+ complaint (_("Symtab %s has objects from two different Go packages: %s and %s"),
+ (symbol_symtab (sym) != NULL
+ ? symtab_to_filename_for_display
+ (symbol_symtab (sym))
+ : objfile_name (objfile)),
+ this_package_name, package_name);
+ xfree (this_package_name);
+ }
+ }
+ }
+ }
+
+ if (package_name != NULL)
+ {
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const char *saved_package_name
+ = (const char *) obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ package_name,
+ strlen (package_name));
+ struct type *type = init_type (objfile, TYPE_CODE_MODULE, 0,
+ saved_package_name);
+ struct symbol *sym;
+
+ sym = allocate_symbol (objfile);
+ SYMBOL_SET_LANGUAGE (sym, language_go, &objfile->objfile_obstack);
+ SYMBOL_SET_NAMES (sym, saved_package_name,
+ strlen (saved_package_name), 0, objfile);
+ /* This is not VAR_DOMAIN because we want a way to ensure a lookup of,
+ e.g., "main" finds the "main" module and not C's main(). */
+ SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ SYMBOL_TYPE (sym) = type;
+
+ add_symbol_to_list (sym, &global_symbols);
+
+ xfree (package_name);
+ }
}
-/* Return the DIE's linkage name as a string, either DW_AT_linkage_name
- or DW_AT_MIPS_linkage_name. Returns NULL if the attribute is not
- defined for the given DIE. */
+/* Allocate a fully-qualified name consisting of the two parts on the
+ obstack. */
static const char *
-dw2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
+rust_fully_qualify (struct obstack *obstack, const char *p1, const char *p2)
{
- const char *linkage_name;
+ return obconcat (obstack, p1, "::", p2, (char *) NULL);
+}
- linkage_name = dwarf2_string_attr (die, DW_AT_linkage_name, cu);
- if (linkage_name == NULL)
- linkage_name = dwarf2_string_attr (die, DW_AT_MIPS_linkage_name, cu);
+/* A helper that allocates a struct discriminant_info to attach to a
+ union type. */
- return linkage_name;
+static struct discriminant_info *
+alloc_discriminant_info (struct type *type, int discriminant_index,
+ int default_index)
+{
+ gdb_assert (TYPE_CODE (type) == TYPE_CODE_UNION);
+ gdb_assert (discriminant_index == -1
+ || (discriminant_index >= 0
+ && discriminant_index < TYPE_NFIELDS (type)));
+ gdb_assert (default_index == -1
+ || (default_index >= 0 && default_index < TYPE_NFIELDS (type)));
+
+ TYPE_FLAG_DISCRIMINATED_UNION (type) = 1;
+
+ struct discriminant_info *disc
+ = ((struct discriminant_info *)
+ TYPE_ZALLOC (type,
+ offsetof (struct discriminant_info, discriminants)
+ + TYPE_NFIELDS (type) * sizeof (disc->discriminants[0])));
+ disc->default_index = default_index;
+ disc->discriminant_index = discriminant_index;
+
+ struct dynamic_prop prop;
+ prop.kind = PROP_UNDEFINED;
+ prop.data.baton = disc;
+
+ add_dyn_prop (DYN_PROP_DISCRIMINATED, prop, type);
+
+ return disc;
}
-/* Compute the fully qualified name of DIE in CU. If PHYSNAME is nonzero,
- compute the physname for the object, which include a method's:
- - formal parameters (C++),
- - receiver type (Go),
+/* Some versions of rustc emitted enums in an unusual way.
- The term "physname" is a bit confusing.
- For C++, for example, it is the demangled name.
- For Go, for example, it's the mangled name.
+ Ordinary enums were emitted as unions. The first element of each
+ structure in the union was named "RUST$ENUM$DISR". This element
+ held the discriminant.
- For Ada, return the DIE's linkage name rather than the fully qualified
- name. PHYSNAME is ignored..
+ These versions of Rust also implemented the "non-zero"
+ optimization. When the enum had two values, and one is empty and
+ the other holds a pointer that cannot be zero, the pointer is used
+ as the discriminant, with a zero value meaning the empty variant.
+ Here, the union's first member is of the form
+ RUST$ENCODED$ENUM$<fieldno>$<fieldno>$...$<variantname>
+ where the fieldnos are the indices of the fields that should be
+ traversed in order to find the field (which may be several fields deep)
+ and the variantname is the name of the variant of the case when the
+ field is zero.
- The result is allocated on the objfile_obstack and canonicalized. */
+ This function recognizes whether TYPE is of one of these forms,
+ and, if so, smashes it to be a variant type. */
-static const char *
-dwarf2_compute_name (const char *name,
- struct die_info *die, struct dwarf2_cu *cu,
- int physname)
+static void
+quirk_rust_enum (struct type *type, struct objfile *objfile)
{
- struct objfile *objfile = cu->objfile;
+ gdb_assert (TYPE_CODE (type) == TYPE_CODE_UNION);
- if (name == NULL)
- name = dwarf2_name (die, cu);
+ /* We don't need to deal with empty enums. */
+ if (TYPE_NFIELDS (type) == 0)
+ return;
- /* For Fortran GDB prefers DW_AT_*linkage_name for the physname if present
- but otherwise compute it by typename_concat inside GDB.
- FIXME: Actually this is not really true, or at least not always true.
- It's all very confusing. SYMBOL_SET_NAMES doesn't try to demangle
- Fortran names because there is no mangling standard. So new_symbol_full
- will set the demangled name to the result of dwarf2_full_name, and it is
- the demangled name that GDB uses if it exists. */
- if (cu->language == language_ada
- || (cu->language == language_fortran && physname))
+#define RUST_ENUM_PREFIX "RUST$ENCODED$ENUM$"
+ if (TYPE_NFIELDS (type) == 1
+ && startswith (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX))
{
- /* For Ada unit, we prefer the linkage name over the name, as
- the former contains the exported name, which the user expects
- to be able to reference. Ideally, we want the user to be able
- to reference this entity using either natural or linkage name,
- but we haven't started looking at this enhancement yet. */
- const char *linkage_name = dw2_linkage_name (die, cu);
+ const char *name = TYPE_FIELD_NAME (type, 0) + strlen (RUST_ENUM_PREFIX);
- if (linkage_name != NULL)
- return linkage_name;
+ /* Decode the field name to find the offset of the
+ discriminant. */
+ ULONGEST bit_offset = 0;
+ struct type *field_type = TYPE_FIELD_TYPE (type, 0);
+ while (name[0] >= '0' && name[0] <= '9')
+ {
+ char *tail;
+ unsigned long index = strtoul (name, &tail, 10);
+ name = tail;
+ if (*name != '$'
+ || index >= TYPE_NFIELDS (field_type)
+ || (TYPE_FIELD_LOC_KIND (field_type, index)
+ != FIELD_LOC_KIND_BITPOS))
+ {
+ complaint (_("Could not parse Rust enum encoding string \"%s\""
+ "[in module %s]"),
+ TYPE_FIELD_NAME (type, 0),
+ objfile_name (objfile));
+ return;
+ }
+ ++name;
+
+ bit_offset += TYPE_FIELD_BITPOS (field_type, index);
+ field_type = TYPE_FIELD_TYPE (field_type, index);
+ }
+
+ /* Make a union to hold the variants. */
+ struct type *union_type = alloc_type (objfile);
+ TYPE_CODE (union_type) = TYPE_CODE_UNION;
+ TYPE_NFIELDS (union_type) = 3;
+ TYPE_FIELDS (union_type)
+ = (struct field *) TYPE_ZALLOC (type, 3 * sizeof (struct field));
+ TYPE_LENGTH (union_type) = TYPE_LENGTH (type);
+ set_type_align (union_type, TYPE_RAW_ALIGN (type));
+
+ /* Put the discriminant must at index 0. */
+ TYPE_FIELD_TYPE (union_type, 0) = field_type;
+ TYPE_FIELD_ARTIFICIAL (union_type, 0) = 1;
+ TYPE_FIELD_NAME (union_type, 0) = "<<discriminant>>";
+ SET_FIELD_BITPOS (TYPE_FIELD (union_type, 0), bit_offset);
+
+ /* The order of fields doesn't really matter, so put the real
+ field at index 1 and the data-less field at index 2. */
+ struct discriminant_info *disc
+ = alloc_discriminant_info (union_type, 0, 1);
+ TYPE_FIELD (union_type, 1) = TYPE_FIELD (type, 0);
+ TYPE_FIELD_NAME (union_type, 1)
+ = rust_last_path_segment (TYPE_NAME (TYPE_FIELD_TYPE (union_type, 1)));
+ TYPE_NAME (TYPE_FIELD_TYPE (union_type, 1))
+ = rust_fully_qualify (&objfile->objfile_obstack, TYPE_NAME (type),
+ TYPE_FIELD_NAME (union_type, 1));
+
+ const char *dataless_name
+ = rust_fully_qualify (&objfile->objfile_obstack, TYPE_NAME (type),
+ name);
+ struct type *dataless_type = init_type (objfile, TYPE_CODE_VOID, 0,
+ dataless_name);
+ TYPE_FIELD_TYPE (union_type, 2) = dataless_type;
+ /* NAME points into the original discriminant name, which
+ already has the correct lifetime. */
+ TYPE_FIELD_NAME (union_type, 2) = name;
+ SET_FIELD_BITPOS (TYPE_FIELD (union_type, 2), 0);
+ disc->discriminants[2] = 0;
+
+ /* Smash this type to be a structure type. We have to do this
+ because the type has already been recorded. */
+ TYPE_CODE (type) = TYPE_CODE_STRUCT;
+ TYPE_NFIELDS (type) = 1;
+ TYPE_FIELDS (type)
+ = (struct field *) TYPE_ZALLOC (type, sizeof (struct field));
+
+ /* Install the variant part. */
+ TYPE_FIELD_TYPE (type, 0) = union_type;
+ SET_FIELD_BITPOS (TYPE_FIELD (type, 0), 0);
+ TYPE_FIELD_NAME (type, 0) = "<<variants>>";
}
+ else if (TYPE_NFIELDS (type) == 1)
+ {
+ /* We assume that a union with a single field is a univariant
+ enum. */
+ /* Smash this type to be a structure type. We have to do this
+ because the type has already been recorded. */
+ TYPE_CODE (type) = TYPE_CODE_STRUCT;
- /* These are the only languages we know how to qualify names in. */
- if (name != NULL
- && (cu->language == language_cplus
- || cu->language == language_fortran || cu->language == language_d
- || cu->language == language_rust))
+ /* Make a union to hold the variants. */
+ struct type *union_type = alloc_type (objfile);
+ TYPE_CODE (union_type) = TYPE_CODE_UNION;
+ TYPE_NFIELDS (union_type) = TYPE_NFIELDS (type);
+ TYPE_LENGTH (union_type) = TYPE_LENGTH (type);
+ set_type_align (union_type, TYPE_RAW_ALIGN (type));
+ TYPE_FIELDS (union_type) = TYPE_FIELDS (type);
+
+ struct type *field_type = TYPE_FIELD_TYPE (union_type, 0);
+ const char *variant_name
+ = rust_last_path_segment (TYPE_NAME (field_type));
+ TYPE_FIELD_NAME (union_type, 0) = variant_name;
+ TYPE_NAME (field_type)
+ = rust_fully_qualify (&objfile->objfile_obstack,
+ TYPE_NAME (type), variant_name);
+
+ /* Install the union in the outer struct type. */
+ TYPE_NFIELDS (type) = 1;
+ TYPE_FIELDS (type)
+ = (struct field *) TYPE_ZALLOC (union_type, sizeof (struct field));
+ TYPE_FIELD_TYPE (type, 0) = union_type;
+ TYPE_FIELD_NAME (type, 0) = "<<variants>>";
+ SET_FIELD_BITPOS (TYPE_FIELD (type, 0), 0);
+
+ alloc_discriminant_info (union_type, -1, 0);
+ }
+ else
{
- if (die_needs_namespace (die, cu))
+ struct type *disr_type = nullptr;
+ for (int i = 0; i < TYPE_NFIELDS (type); ++i)
{
- const char *prefix;
- const char *canonical_name = NULL;
+ disr_type = TYPE_FIELD_TYPE (type, i);
- string_file buf;
-
- prefix = determine_prefix (die, cu);
- if (*prefix != '\0')
+ if (TYPE_CODE (disr_type) != TYPE_CODE_STRUCT)
{
- char *prefixed_name = typename_concat (NULL, prefix, name,
- physname, cu);
-
- buf.puts (prefixed_name);
- xfree (prefixed_name);
+ /* All fields of a true enum will be structs. */
+ return;
+ }
+ else if (TYPE_NFIELDS (disr_type) == 0)
+ {
+ /* Could be data-less variant, so keep going. */
+ disr_type = nullptr;
+ }
+ else if (strcmp (TYPE_FIELD_NAME (disr_type, 0),
+ "RUST$ENUM$DISR") != 0)
+ {
+ /* Not a Rust enum. */
+ return;
}
else
- buf.puts (name);
+ {
+ /* Found one. */
+ break;
+ }
+ }
- /* Template parameters may be specified in the DIE's DW_AT_name, or
- as children with DW_TAG_template_type_param or
- DW_TAG_value_type_param. If the latter, add them to the name
- here. If the name already has template parameters, then
- skip this step; some versions of GCC emit both, and
- it is more efficient to use the pre-computed name.
+ /* If we got here without a discriminant, then it's probably
+ just a union. */
+ if (disr_type == nullptr)
+ return;
- Something to keep in mind about this process: it is very
- unlikely, or in some cases downright impossible, to produce
- something that will match the mangled name of a function.
- If the definition of the function has the same debug info,
- we should be able to match up with it anyway. But fallbacks
- using the minimal symbol, for instance to find a method
- implemented in a stripped copy of libstdc++, will not work.
- If we do not have debug info for the definition, we will have to
- match them up some other way.
+ /* Smash this type to be a structure type. We have to do this
+ because the type has already been recorded. */
+ TYPE_CODE (type) = TYPE_CODE_STRUCT;
- When we do name matching there is a related problem with function
- templates; two instantiated function templates are allowed to
- differ only by their return types, which we do not add here. */
+ /* Make a union to hold the variants. */
+ struct field *disr_field = &TYPE_FIELD (disr_type, 0);
+ struct type *union_type = alloc_type (objfile);
+ TYPE_CODE (union_type) = TYPE_CODE_UNION;
+ TYPE_NFIELDS (union_type) = 1 + TYPE_NFIELDS (type);
+ TYPE_LENGTH (union_type) = TYPE_LENGTH (type);
+ set_type_align (union_type, TYPE_RAW_ALIGN (type));
+ TYPE_FIELDS (union_type)
+ = (struct field *) TYPE_ZALLOC (union_type,
+ (TYPE_NFIELDS (union_type)
+ * sizeof (struct field)));
+
+ memcpy (TYPE_FIELDS (union_type) + 1, TYPE_FIELDS (type),
+ TYPE_NFIELDS (type) * sizeof (struct field));
+
+ /* Install the discriminant at index 0 in the union. */
+ TYPE_FIELD (union_type, 0) = *disr_field;
+ TYPE_FIELD_ARTIFICIAL (union_type, 0) = 1;
+ TYPE_FIELD_NAME (union_type, 0) = "<<discriminant>>";
+
+ /* Install the union in the outer struct type. */
+ TYPE_FIELD_TYPE (type, 0) = union_type;
+ TYPE_FIELD_NAME (type, 0) = "<<variants>>";
+ TYPE_NFIELDS (type) = 1;
+
+ /* Set the size and offset of the union type. */
+ SET_FIELD_BITPOS (TYPE_FIELD (type, 0), 0);
+
+ /* We need a way to find the correct discriminant given a
+ variant name. For convenience we build a map here. */
+ struct type *enum_type = FIELD_TYPE (*disr_field);
+ std::unordered_map<std::string, ULONGEST> discriminant_map;
+ for (int i = 0; i < TYPE_NFIELDS (enum_type); ++i)
+ {
+ if (TYPE_FIELD_LOC_KIND (enum_type, i) == FIELD_LOC_KIND_ENUMVAL)
+ {
+ const char *name
+ = rust_last_path_segment (TYPE_FIELD_NAME (enum_type, i));
+ discriminant_map[name] = TYPE_FIELD_ENUMVAL (enum_type, i);
+ }
+ }
- if (cu->language == language_cplus && strchr (name, '<') == NULL)
+ int n_fields = TYPE_NFIELDS (union_type);
+ struct discriminant_info *disc
+ = alloc_discriminant_info (union_type, 0, -1);
+ /* Skip the discriminant here. */
+ for (int i = 1; i < n_fields; ++i)
+ {
+ /* Find the final word in the name of this variant's type.
+ That name can be used to look up the correct
+ discriminant. */
+ const char *variant_name
+ = rust_last_path_segment (TYPE_NAME (TYPE_FIELD_TYPE (union_type,
+ i)));
+
+ auto iter = discriminant_map.find (variant_name);
+ if (iter != discriminant_map.end ())
+ disc->discriminants[i] = iter->second;
+
+ /* Remove the discriminant field, if it exists. */
+ struct type *sub_type = TYPE_FIELD_TYPE (union_type, i);
+ if (TYPE_NFIELDS (sub_type) > 0)
{
- struct attribute *attr;
- struct die_info *child;
- int first = 1;
+ --TYPE_NFIELDS (sub_type);
+ ++TYPE_FIELDS (sub_type);
+ }
+ TYPE_FIELD_NAME (union_type, i) = variant_name;
+ TYPE_NAME (sub_type)
+ = rust_fully_qualify (&objfile->objfile_obstack,
+ TYPE_NAME (type), variant_name);
+ }
+ }
+}
- die->building_fullname = 1;
+/* Rewrite some Rust unions to be structures with variants parts. */
- for (child = die->child; child != NULL; child = child->sibling)
- {
- struct type *type;
- LONGEST value;
- const gdb_byte *bytes;
- struct dwarf2_locexpr_baton *baton;
- struct value *v;
+static void
+rust_union_quirks (struct dwarf2_cu *cu)
+{
+ gdb_assert (cu->language == language_rust);
+ for (type *type_ : cu->rust_unions)
+ quirk_rust_enum (type_, cu->per_cu->dwarf2_per_objfile->objfile);
+ /* We don't need this any more. */
+ cu->rust_unions.clear ();
+}
- if (child->tag != DW_TAG_template_type_param
- && child->tag != DW_TAG_template_value_param)
- continue;
+/* Return the symtab for PER_CU. This works properly regardless of
+ whether we're using the index or psymtabs. */
- if (first)
- {
- buf.puts ("<");
- first = 0;
- }
- else
- buf.puts (", ");
-
- attr = dwarf2_attr (child, DW_AT_type, cu);
- if (attr == NULL)
- {
- complaint (&symfile_complaints,
- _("template parameter missing DW_AT_type"));
- buf.puts ("UNKNOWN_TYPE");
- continue;
- }
- type = die_type (child, cu);
+static struct compunit_symtab *
+get_compunit_symtab (struct dwarf2_per_cu_data *per_cu)
+{
+ return (per_cu->dwarf2_per_objfile->using_index
+ ? per_cu->v.quick->compunit_symtab
+ : per_cu->v.psymtab->compunit_symtab);
+}
- if (child->tag == DW_TAG_template_type_param)
- {
- c_print_type (type, "", &buf, -1, 0, &type_print_raw_options);
- continue;
- }
+/* A helper function for computing the list of all symbol tables
+ included by PER_CU. */
- attr = dwarf2_attr (child, DW_AT_const_value, cu);
- if (attr == NULL)
- {
- complaint (&symfile_complaints,
- _("template parameter missing "
- "DW_AT_const_value"));
- buf.puts ("UNKNOWN_VALUE");
- continue;
- }
+static void
+recursively_compute_inclusions (VEC (compunit_symtab_ptr) **result,
+ htab_t all_children, htab_t all_type_symtabs,
+ struct dwarf2_per_cu_data *per_cu,
+ struct compunit_symtab *immediate_parent)
+{
+ void **slot;
+ int ix;
+ struct compunit_symtab *cust;
+ struct dwarf2_per_cu_data *iter;
- dwarf2_const_value_attr (attr, type, name,
- &cu->comp_unit_obstack, cu,
- &value, &bytes, &baton);
+ slot = htab_find_slot (all_children, per_cu, INSERT);
+ if (*slot != NULL)
+ {
+ /* This inclusion and its children have been processed. */
+ return;
+ }
- if (TYPE_NOSIGN (type))
- /* GDB prints characters as NUMBER 'CHAR'. If that's
- changed, this can use value_print instead. */
- c_printchar (value, type, &buf);
- else
- {
- struct value_print_options opts;
+ *slot = per_cu;
+ /* Only add a CU if it has a symbol table. */
+ cust = get_compunit_symtab (per_cu);
+ if (cust != NULL)
+ {
+ /* If this is a type unit only add its symbol table if we haven't
+ seen it yet (type unit per_cu's can share symtabs). */
+ if (per_cu->is_debug_types)
+ {
+ slot = htab_find_slot (all_type_symtabs, cust, INSERT);
+ if (*slot == NULL)
+ {
+ *slot = cust;
+ VEC_safe_push (compunit_symtab_ptr, *result, cust);
+ if (cust->user == NULL)
+ cust->user = immediate_parent;
+ }
+ }
+ else
+ {
+ VEC_safe_push (compunit_symtab_ptr, *result, cust);
+ if (cust->user == NULL)
+ cust->user = immediate_parent;
+ }
+ }
- if (baton != NULL)
- v = dwarf2_evaluate_loc_desc (type, NULL,
- baton->data,
- baton->size,
- baton->per_cu);
- else if (bytes != NULL)
- {
- v = allocate_value (type);
- memcpy (value_contents_writeable (v), bytes,
- TYPE_LENGTH (type));
- }
- else
- v = value_from_longest (type, value);
+ for (ix = 0;
+ VEC_iterate (dwarf2_per_cu_ptr, per_cu->imported_symtabs, ix, iter);
+ ++ix)
+ {
+ recursively_compute_inclusions (result, all_children,
+ all_type_symtabs, iter, cust);
+ }
+}
- /* Specify decimal so that we do not depend on
- the radix. */
- get_formatted_print_options (&opts, 'd');
- opts.raw = 1;
- value_print (v, &buf, &opts);
- release_value (v);
- value_free (v);
- }
- }
+/* Compute the compunit_symtab 'includes' fields for the compunit_symtab of
+ PER_CU. */
- die->building_fullname = 0;
+static void
+compute_compunit_symtab_includes (struct dwarf2_per_cu_data *per_cu)
+{
+ gdb_assert (! per_cu->is_debug_types);
- if (!first)
- {
- /* Close the argument list, with a space if necessary
- (nested templates). */
- if (!buf.empty () && buf.string ().back () == '>')
- buf.puts (" >");
- else
- buf.puts (">");
- }
- }
+ if (!VEC_empty (dwarf2_per_cu_ptr, per_cu->imported_symtabs))
+ {
+ int ix, len;
+ struct dwarf2_per_cu_data *per_cu_iter;
+ struct compunit_symtab *compunit_symtab_iter;
+ VEC (compunit_symtab_ptr) *result_symtabs = NULL;
+ htab_t all_children, all_type_symtabs;
+ struct compunit_symtab *cust = get_compunit_symtab (per_cu);
- /* For C++ methods, append formal parameter type
- information, if PHYSNAME. */
+ /* If we don't have a symtab, we can just skip this case. */
+ if (cust == NULL)
+ return;
- if (physname && die->tag == DW_TAG_subprogram
- && cu->language == language_cplus)
- {
- struct type *type = read_type_die (die, cu);
+ all_children = htab_create_alloc (1, htab_hash_pointer, htab_eq_pointer,
+ NULL, xcalloc, xfree);
+ all_type_symtabs = htab_create_alloc (1, htab_hash_pointer, htab_eq_pointer,
+ NULL, xcalloc, xfree);
- c_type_print_args (type, &buf, 1, cu->language,
- &type_print_raw_options);
+ for (ix = 0;
+ VEC_iterate (dwarf2_per_cu_ptr, per_cu->imported_symtabs,
+ ix, per_cu_iter);
+ ++ix)
+ {
+ recursively_compute_inclusions (&result_symtabs, all_children,
+ all_type_symtabs, per_cu_iter,
+ cust);
+ }
- if (cu->language == language_cplus)
- {
- /* Assume that an artificial first parameter is
- "this", but do not crash if it is not. RealView
- marks unnamed (and thus unused) parameters as
- artificial; there is no way to differentiate
- the two cases. */
- if (TYPE_NFIELDS (type) > 0
- && TYPE_FIELD_ARTIFICIAL (type, 0)
- && TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_PTR
- && TYPE_CONST (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type,
- 0))))
- buf.puts (" const");
- }
- }
+ /* Now we have a transitive closure of all the included symtabs. */
+ len = VEC_length (compunit_symtab_ptr, result_symtabs);
+ cust->includes
+ = XOBNEWVEC (&per_cu->dwarf2_per_objfile->objfile->objfile_obstack,
+ struct compunit_symtab *, len + 1);
+ for (ix = 0;
+ VEC_iterate (compunit_symtab_ptr, result_symtabs, ix,
+ compunit_symtab_iter);
+ ++ix)
+ cust->includes[ix] = compunit_symtab_iter;
+ cust->includes[len] = NULL;
- const std::string &intermediate_name = buf.string ();
+ VEC_free (compunit_symtab_ptr, result_symtabs);
+ htab_delete (all_children);
+ htab_delete (all_type_symtabs);
+ }
+}
- if (cu->language == language_cplus)
- canonical_name
- = dwarf2_canonicalize_name (intermediate_name.c_str (), cu,
- &objfile->per_bfd->storage_obstack);
+/* Compute the 'includes' field for the symtabs of all the CUs we just
+ read. */
- /* If we only computed INTERMEDIATE_NAME, or if
- INTERMEDIATE_NAME is already canonical, then we need to
- copy it to the appropriate obstack. */
- if (canonical_name == NULL || canonical_name == intermediate_name.c_str ())
- name = ((const char *)
- obstack_copy0 (&objfile->per_bfd->storage_obstack,
- intermediate_name.c_str (),
- intermediate_name.length ()));
- else
- name = canonical_name;
- }
+static void
+process_cu_includes (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ for (dwarf2_per_cu_data *iter : dwarf2_per_objfile->just_read_cus)
+ {
+ if (! iter->is_debug_types)
+ compute_compunit_symtab_includes (iter);
}
- return name;
+ dwarf2_per_objfile->just_read_cus.clear ();
}
-/* Return the fully qualified name of DIE, based on its DW_AT_name.
- If scope qualifiers are appropriate they will be added. The result
- will be allocated on the storage_obstack, or NULL if the DIE does
- not have a name. NAME may either be from a previous call to
- dwarf2_name or NULL.
-
- The output string will be canonicalized (if C++). */
+/* Generate full symbol information for PER_CU, whose DIEs have
+ already been loaded into memory. */
-static const char *
-dwarf2_full_name (const char *name, struct die_info *die, struct dwarf2_cu *cu)
+static void
+process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
+ enum language pretend_language)
{
- return dwarf2_compute_name (name, die, cu, 0);
-}
+ struct dwarf2_cu *cu = per_cu->cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ CORE_ADDR lowpc, highpc;
+ struct compunit_symtab *cust;
+ CORE_ADDR baseaddr;
+ struct block *static_block;
+ CORE_ADDR addr;
-/* Construct a physname for the given DIE in CU. NAME may either be
- from a previous call to dwarf2_name or NULL. The result will be
- allocated on the objfile_objstack or NULL if the DIE does not have a
- name.
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- The output string will be canonicalized (if C++). */
+ buildsym_init ();
+ scoped_free_pendings free_pending;
-static const char *
-dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- const char *retval, *mangled = NULL, *canon = NULL;
- int need_copy = 1;
+ /* Clear the list here in case something was left over. */
+ cu->method_list.clear ();
- /* In this case dwarf2_compute_name is just a shortcut not building anything
- on its own. */
- if (!die_needs_namespace (die, cu))
- return dwarf2_compute_name (name, die, cu, 1);
+ cu->list_in_scope = &file_symbols;
- mangled = dw2_linkage_name (die, cu);
+ cu->language = pretend_language;
+ cu->language_defn = language_def (cu->language);
- /* rustc emits invalid values for DW_AT_linkage_name. Ignore these.
- See https://github.com/rust-lang/rust/issues/32925. */
- if (cu->language == language_rust && mangled != NULL
- && strchr (mangled, '{') != NULL)
- mangled = NULL;
+ /* Do line number decoding in read_file_scope () */
+ process_die (cu->dies, cu);
- /* DW_AT_linkage_name is missing in some cases - depend on what GDB
- has computed. */
- gdb::unique_xmalloc_ptr<char> demangled;
- if (mangled != NULL)
- {
- /* Use DMGL_RET_DROP for C++ template functions to suppress their return
- type. It is easier for GDB users to search for such functions as
- `name(params)' than `long name(params)'. In such case the minimal
- symbol names do not match the full symbol names but for template
- functions there is never a need to look up their definition from their
- declaration so the only disadvantage remains the minimal symbol
- variant `long name(params)' does not have the proper inferior type.
- */
+ /* For now fudge the Go package. */
+ if (cu->language == language_go)
+ fixup_go_packaging (cu);
- if (cu->language == language_go)
- {
- /* This is a lie, but we already lie to the caller new_symbol_full.
- new_symbol_full assumes we return the mangled name.
- This just undoes that lie until things are cleaned up. */
- }
- else
- {
- demangled.reset (gdb_demangle (mangled,
- (DMGL_PARAMS | DMGL_ANSI
- | DMGL_RET_DROP)));
- }
- if (demangled)
- canon = demangled.get ();
- else
- {
- canon = mangled;
- need_copy = 0;
- }
- }
+ /* Now that we have processed all the DIEs in the CU, all the types
+ should be complete, and it should now be safe to compute all of the
+ physnames. */
+ compute_delayed_physnames (cu);
- if (canon == NULL || check_physname)
+ if (cu->language == language_rust)
+ rust_union_quirks (cu);
+
+ /* 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 (cu->dies, &lowpc, &highpc, cu);
+
+ addr = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
+ static_block = end_symtab_get_static_block (addr, 0, 1);
+
+ /* If the comp unit has DW_AT_ranges, it may have discontiguous ranges.
+ Also, DW_AT_ranges may record ranges not belonging to any child DIEs
+ (such as virtual method tables). Record the ranges in STATIC_BLOCK's
+ addrmap to help ensure it has an accurate map of pc values belonging to
+ this comp unit. */
+ dwarf2_record_block_ranges (cu->dies, static_block, baseaddr, cu);
+
+ cust = end_symtab_from_static_block (static_block,
+ SECT_OFF_TEXT (objfile), 0);
+
+ if (cust != NULL)
{
- const char *physname = dwarf2_compute_name (name, die, cu, 1);
+ int gcc_4_minor = producer_is_gcc_ge_4 (cu->producer);
- if (canon != NULL && strcmp (physname, canon) != 0)
- {
- /* It may not mean a bug in GDB. The compiler could also
- compute DW_AT_linkage_name incorrectly. But in such case
- GDB would need to be bug-to-bug compatible. */
+ /* 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 (!(cu->language == language_c
+ && COMPUNIT_FILETABS (cust)->language != language_unknown))
+ COMPUNIT_FILETABS (cust)->language = cu->language;
- complaint (&symfile_complaints,
- _("Computed physname <%s> does not match demangled <%s> "
- "(from linkage <%s>) - DIE at 0x%x [in module %s]"),
- physname, canon, mangled, to_underlying (die->sect_off),
- objfile_name (objfile));
+ /* GCC-4.0 has started to support -fvar-tracking. GCC-3.x still can
+ produce DW_AT_location with location lists but it can be possibly
+ invalid without -fvar-tracking. Still up to GCC-4.4.x incl. 4.4.0
+ there were bugs in prologue debug info, fixed later in GCC-4.5
+ by "unwind info for epilogues" patch (which is not directly related).
- /* Prefer DW_AT_linkage_name (in the CANON form) - when it
- is available here - over computed PHYSNAME. It is safer
- against both buggy GDB and buggy compilers. */
+ For -gdwarf-4 type units LOCATIONS_VALID indication is fortunately not
+ needed, it would be wrong due to missing DW_AT_producer there.
- retval = canon;
- }
- else
- {
- retval = physname;
- need_copy = 0;
- }
+ Still one can confuse GDB by using non-standard GCC compilation
+ options - this waits on GCC PR other/32998 (-frecord-gcc-switches).
+ */
+ if (cu->has_loclist && gcc_4_minor >= 5)
+ cust->locations_valid = 1;
+
+ if (gcc_4_minor >= 5)
+ cust->epilogue_unwind_valid = 1;
+
+ cust->call_site_htab = cu->call_site_htab;
}
- else
- retval = canon;
- if (need_copy)
- retval = ((const char *)
- obstack_copy0 (&objfile->per_bfd->storage_obstack,
- retval, strlen (retval)));
+ if (dwarf2_per_objfile->using_index)
+ per_cu->v.quick->compunit_symtab = cust;
+ else
+ {
+ struct partial_symtab *pst = per_cu->v.psymtab;
+ pst->compunit_symtab = cust;
+ pst->readin = 1;
+ }
- return retval;
+ /* Push it for inclusion processing later. */
+ dwarf2_per_objfile->just_read_cus.push_back (per_cu);
}
-/* Inspect DIE in CU for a namespace alias. If one exists, record
- a new symbol for it.
-
- Returns 1 if a namespace alias was recorded, 0 otherwise. */
+/* Generate full symbol information for type unit PER_CU, whose DIEs have
+ already been loaded into memory. */
-static int
-read_namespace_alias (struct die_info *die, struct dwarf2_cu *cu)
+static void
+process_full_type_unit (struct dwarf2_per_cu_data *per_cu,
+ enum language pretend_language)
{
- struct attribute *attr;
+ struct dwarf2_cu *cu = per_cu->cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct compunit_symtab *cust;
+ struct signatured_type *sig_type;
- /* If the die does not have a name, this is not a namespace
- alias. */
- attr = dwarf2_attr (die, DW_AT_name, cu);
- if (attr != NULL)
- {
- int num;
- struct die_info *d = die;
- struct dwarf2_cu *imported_cu = cu;
+ gdb_assert (per_cu->is_debug_types);
+ sig_type = (struct signatured_type *) per_cu;
- /* If the compiler has nested DW_AT_imported_declaration DIEs,
- keep inspecting DIEs until we hit the underlying import. */
-#define MAX_NESTED_IMPORTED_DECLARATIONS 100
- for (num = 0; num < MAX_NESTED_IMPORTED_DECLARATIONS; ++num)
- {
- attr = dwarf2_attr (d, DW_AT_import, cu);
- if (attr == NULL)
- break;
+ buildsym_init ();
+ scoped_free_pendings free_pending;
- d = follow_die_ref (d, attr, &imported_cu);
- if (d->tag != DW_TAG_imported_declaration)
- break;
- }
+ /* Clear the list here in case something was left over. */
+ cu->method_list.clear ();
- if (num == MAX_NESTED_IMPORTED_DECLARATIONS)
- {
- complaint (&symfile_complaints,
- _("DIE at 0x%x has too many recursively imported "
- "declarations"), to_underlying (d->sect_off));
- return 0;
- }
+ cu->list_in_scope = &file_symbols;
- if (attr != NULL)
- {
- struct type *type;
- sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
+ cu->language = pretend_language;
+ cu->language_defn = language_def (cu->language);
- type = get_die_type_at_offset (sect_off, cu->per_cu);
- if (type != NULL && TYPE_CODE (type) == TYPE_CODE_NAMESPACE)
- {
- /* This declaration is a global namespace alias. Add
- a symbol for it whose type is the aliased namespace. */
- new_symbol (die, type, cu);
- return 1;
- }
- }
- }
+ /* The symbol tables are set up in read_type_unit_scope. */
+ process_die (cu->dies, cu);
- return 0;
-}
+ /* For now fudge the Go package. */
+ if (cu->language == language_go)
+ fixup_go_packaging (cu);
-/* Return the using directives repository (global or local?) to use in the
- current context for LANGUAGE.
+ /* Now that we have processed all the DIEs in the CU, all the types
+ should be complete, and it should now be safe to compute all of the
+ physnames. */
+ compute_delayed_physnames (cu);
- For Ada, imported declarations can materialize renamings, which *may* be
- global. However it is impossible (for now?) in DWARF to distinguish
- "external" imported declarations and "static" ones. As all imported
- declarations seem to be static in all other languages, make them all CU-wide
- global only in Ada. */
+ if (cu->language == language_rust)
+ rust_union_quirks (cu);
-static struct using_direct **
-using_directives (enum language language)
-{
- if (language == language_ada && context_stack_depth == 0)
- return &global_using_directives;
+ /* TUs share symbol tables.
+ If this is the first TU to use this symtab, complete the construction
+ of it with end_expandable_symtab. Otherwise, complete the addition of
+ this TU's symbols to the existing symtab. */
+ if (sig_type->type_unit_group->compunit_symtab == NULL)
+ {
+ cust = end_expandable_symtab (0, SECT_OFF_TEXT (objfile));
+ sig_type->type_unit_group->compunit_symtab = cust;
+
+ if (cust != NULL)
+ {
+ /* 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 (!(cu->language == language_c
+ && COMPUNIT_FILETABS (cust)->language != language_c))
+ COMPUNIT_FILETABS (cust)->language = cu->language;
+ }
+ }
else
- return &local_using_directives;
+ {
+ augment_type_symtab ();
+ cust = sig_type->type_unit_group->compunit_symtab;
+ }
+
+ if (dwarf2_per_objfile->using_index)
+ per_cu->v.quick->compunit_symtab = cust;
+ else
+ {
+ struct partial_symtab *pst = per_cu->v.psymtab;
+ pst->compunit_symtab = cust;
+ pst->readin = 1;
+ }
}
-/* Read the import statement specified by the given die and record it. */
+/* Process an imported unit DIE. */
static void
-read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+process_imported_unit_die (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- struct attribute *import_attr;
- struct die_info *imported_die, *child_die;
- struct dwarf2_cu *imported_cu;
- const char *imported_name;
- const char *imported_name_prefix;
- const char *canonical_name;
- const char *import_alias;
- const char *imported_declaration = NULL;
- const char *import_prefix;
- std::vector<const char *> excludes;
+ struct attribute *attr;
- import_attr = dwarf2_attr (die, DW_AT_import, cu);
- if (import_attr == NULL)
+ /* For now we don't handle imported units in type units. */
+ if (cu->per_cu->is_debug_types)
{
- complaint (&symfile_complaints, _("Tag '%s' has no DW_AT_import"),
- dwarf_tag_name (die->tag));
- return;
+ error (_("Dwarf Error: DW_TAG_imported_unit is not"
+ " supported in type units [in module %s]"),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
}
- imported_cu = cu;
- imported_die = follow_die_ref_or_sig (die, import_attr, &imported_cu);
- imported_name = dwarf2_name (imported_die, imported_cu);
- if (imported_name == NULL)
+ attr = dwarf2_attr (die, DW_AT_import, cu);
+ if (attr != NULL)
{
- /* GCC bug: https://bugzilla.redhat.com/show_bug.cgi?id=506524
-
- The import in the following code:
- namespace A
- {
- typedef int B;
- }
-
- int main ()
- {
- using A::B;
- B b;
- return b;
- }
+ sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
+ bool is_dwz = (attr->form == DW_FORM_GNU_ref_alt || cu->per_cu->is_dwz);
+ dwarf2_per_cu_data *per_cu
+ = dwarf2_find_containing_comp_unit (sect_off, is_dwz,
+ cu->per_cu->dwarf2_per_objfile);
- ...
- <2><51>: Abbrev Number: 3 (DW_TAG_imported_declaration)
- <52> DW_AT_decl_file : 1
- <53> DW_AT_decl_line : 6
- <54> DW_AT_import : <0x75>
- <2><58>: Abbrev Number: 4 (DW_TAG_typedef)
- <59> DW_AT_name : B
- <5b> DW_AT_decl_file : 1
- <5c> DW_AT_decl_line : 2
- <5d> DW_AT_type : <0x6e>
- ...
- <1><75>: Abbrev Number: 7 (DW_TAG_base_type)
- <76> DW_AT_byte_size : 4
- <77> DW_AT_encoding : 5 (signed)
+ /* If necessary, add it to the queue and load its DIEs. */
+ if (maybe_queue_comp_unit (cu, per_cu, cu->language))
+ load_full_comp_unit (per_cu, false, cu->language);
- imports the wrong die ( 0x75 instead of 0x58 ).
- This case will be ignored until the gcc bug is fixed. */
- return;
+ VEC_safe_push (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs,
+ per_cu);
}
+}
- /* Figure out the local name after import. */
- import_alias = dwarf2_name (die, cu);
-
- /* Figure out where the statement is being imported to. */
- import_prefix = determine_prefix (die, cu);
-
- /* Figure out what the scope of the imported die is and prepend it
- to the name of the imported die. */
- imported_name_prefix = determine_prefix (imported_die, imported_cu);
+/* RAII object that represents a process_die scope: i.e.,
+ starts/finishes processing a DIE. */
+class process_die_scope
+{
+public:
+ process_die_scope (die_info *die, dwarf2_cu *cu)
+ : m_die (die), m_cu (cu)
+ {
+ /* We should only be processing DIEs not already in process. */
+ gdb_assert (!m_die->in_process);
+ m_die->in_process = true;
+ }
- if (imported_die->tag != DW_TAG_namespace
- && imported_die->tag != DW_TAG_module)
- {
- imported_declaration = imported_name;
- canonical_name = imported_name_prefix;
- }
- else if (strlen (imported_name_prefix) > 0)
- canonical_name = obconcat (&objfile->objfile_obstack,
- imported_name_prefix,
- (cu->language == language_d ? "." : "::"),
- imported_name, (char *) NULL);
- else
- canonical_name = imported_name;
+ ~process_die_scope ()
+ {
+ m_die->in_process = false;
- if (die->tag == DW_TAG_imported_module && cu->language == language_fortran)
- for (child_die = die->child; child_die && child_die->tag;
- child_die = sibling_die (child_die))
+ /* If we're done processing the DIE for the CU that owns the line
+ header, we don't need the line header anymore. */
+ if (m_cu->line_header_die_owner == m_die)
{
- /* DWARF-4: A Fortran use statement with a “rename list” may be
- represented by an imported module entry with an import attribute
- referring to the module and owned entries corresponding to those
- entities that are renamed as part of being imported. */
+ delete m_cu->line_header;
+ m_cu->line_header = NULL;
+ m_cu->line_header_die_owner = NULL;
+ }
+ }
- if (child_die->tag != DW_TAG_imported_declaration)
- {
- complaint (&symfile_complaints,
- _("child DW_TAG_imported_declaration expected "
- "- DIE at 0x%x [in module %s]"),
- to_underlying (child_die->sect_off), objfile_name (objfile));
- continue;
- }
+private:
+ die_info *m_die;
+ dwarf2_cu *m_cu;
+};
- import_attr = dwarf2_attr (child_die, DW_AT_import, cu);
- if (import_attr == NULL)
- {
- complaint (&symfile_complaints, _("Tag '%s' has no DW_AT_import"),
- dwarf_tag_name (child_die->tag));
- continue;
- }
+/* Process a die and its children. */
- imported_cu = cu;
- imported_die = follow_die_ref_or_sig (child_die, import_attr,
- &imported_cu);
- imported_name = dwarf2_name (imported_die, imported_cu);
- if (imported_name == NULL)
- {
- complaint (&symfile_complaints,
- _("child DW_TAG_imported_declaration has unknown "
- "imported name - DIE at 0x%x [in module %s]"),
- to_underlying (child_die->sect_off), objfile_name (objfile));
- continue;
- }
+static void
+process_die (struct die_info *die, struct dwarf2_cu *cu)
+{
+ process_die_scope scope (die, cu);
- excludes.push_back (imported_name);
+ switch (die->tag)
+ {
+ case DW_TAG_padding:
+ break;
+ case DW_TAG_compile_unit:
+ case DW_TAG_partial_unit:
+ read_file_scope (die, cu);
+ break;
+ case DW_TAG_type_unit:
+ read_type_unit_scope (die, cu);
+ break;
+ case DW_TAG_subprogram:
+ case DW_TAG_inlined_subroutine:
+ read_func_scope (die, cu);
+ break;
+ case DW_TAG_lexical_block:
+ case DW_TAG_try_block:
+ case DW_TAG_catch_block:
+ read_lexical_block_scope (die, cu);
+ break;
+ case DW_TAG_call_site:
+ case DW_TAG_GNU_call_site:
+ read_call_site_scope (die, cu);
+ break;
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ process_structure_scope (die, cu);
+ break;
+ case DW_TAG_enumeration_type:
+ process_enumeration_scope (die, cu);
+ break;
- process_die (child_die, cu);
- }
+ /* These dies have a type, but processing them does not create
+ a symbol or recurse to process the children. Therefore we can
+ read them on-demand through read_type_die. */
+ case DW_TAG_subroutine_type:
+ case DW_TAG_set_type:
+ case DW_TAG_array_type:
+ case DW_TAG_pointer_type:
+ case DW_TAG_ptr_to_member_type:
+ case DW_TAG_reference_type:
+ case DW_TAG_rvalue_reference_type:
+ case DW_TAG_string_type:
+ break;
- add_using_directive (using_directives (cu->language),
- import_prefix,
- canonical_name,
- import_alias,
- imported_declaration,
- excludes,
- 0,
- &objfile->objfile_obstack);
-}
+ case DW_TAG_base_type:
+ case DW_TAG_subrange_type:
+ case DW_TAG_typedef:
+ /* Add a typedef symbol for the type definition, if it has a
+ DW_AT_name. */
+ new_symbol (die, read_type_die (die, cu), cu);
+ break;
+ case DW_TAG_common_block:
+ read_common_block (die, cu);
+ break;
+ case DW_TAG_common_inclusion:
+ break;
+ case DW_TAG_namespace:
+ cu->processing_has_namespace_info = 1;
+ read_namespace (die, cu);
+ break;
+ case DW_TAG_module:
+ cu->processing_has_namespace_info = 1;
+ read_module (die, cu);
+ break;
+ case DW_TAG_imported_declaration:
+ cu->processing_has_namespace_info = 1;
+ if (read_namespace_alias (die, cu))
+ break;
+ /* The declaration is not a global namespace alias. */
+ /* Fall through. */
+ case DW_TAG_imported_module:
+ cu->processing_has_namespace_info = 1;
+ if (die->child != NULL && (die->tag == DW_TAG_imported_declaration
+ || cu->language != language_fortran))
+ complaint (_("Tag '%s' has unexpected children"),
+ dwarf_tag_name (die->tag));
+ read_import_statement (die, cu);
+ break;
-/* ICC<14 does not output the required DW_AT_declaration on incomplete
- types, but gives them a size of zero. Starting with version 14,
- ICC is compatible with GCC. */
+ case DW_TAG_imported_unit:
+ process_imported_unit_die (die, cu);
+ break;
-static int
-producer_is_icc_lt_14 (struct dwarf2_cu *cu)
-{
- if (!cu->checked_producer)
- check_producer (cu);
+ case DW_TAG_variable:
+ read_variable (die, cu);
+ break;
- return cu->producer_is_icc_lt_14;
+ default:
+ new_symbol (die, NULL, cu);
+ break;
+ }
}
+\f
+/* DWARF name computation. */
-/* Check for possibly missing DW_AT_comp_dir with relative .debug_line
- directory paths. GCC SVN r127613 (new option -fdebug-prefix-map) fixed
- this, it was first present in GCC release 4.3.0. */
+/* A helper function for dwarf2_compute_name which determines whether DIE
+ needs to have the name of the scope prepended to the name listed in the
+ die. */
static int
-producer_is_gcc_lt_4_3 (struct dwarf2_cu *cu)
-{
- if (!cu->checked_producer)
- check_producer (cu);
-
- return cu->producer_is_gcc_lt_4_3;
-}
-
-static file_and_directory
-find_file_and_directory (struct die_info *die, struct dwarf2_cu *cu)
+die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
{
- file_and_directory res;
+ struct attribute *attr;
- /* Find the filename. Do not use dwarf2_name here, since the filename
- is not a source language identifier. */
- res.name = dwarf2_string_attr (die, DW_AT_name, cu);
- res.comp_dir = dwarf2_string_attr (die, DW_AT_comp_dir, cu);
-
- if (res.comp_dir == NULL
- && producer_is_gcc_lt_4_3 (cu) && res.name != NULL
- && IS_ABSOLUTE_PATH (res.name))
- {
- res.comp_dir_storage = ldirname (res.name);
- if (!res.comp_dir_storage.empty ())
- res.comp_dir = res.comp_dir_storage.c_str ();
- }
- if (res.comp_dir != NULL)
+ switch (die->tag)
{
- /* Irix 6.2 native cc prepends <machine>.: to the compilation
- directory, get rid of it. */
- const char *cp = strchr (res.comp_dir, ':');
+ case DW_TAG_namespace:
+ case DW_TAG_typedef:
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ case DW_TAG_enumeration_type:
+ case DW_TAG_enumerator:
+ case DW_TAG_subprogram:
+ case DW_TAG_inlined_subroutine:
+ case DW_TAG_member:
+ case DW_TAG_imported_declaration:
+ return 1;
- if (cp && cp != res.comp_dir && cp[-1] == '.' && cp[1] == '/')
- res.comp_dir = cp + 1;
- }
+ case DW_TAG_variable:
+ case DW_TAG_constant:
+ /* We only need to prefix "globally" visible variables. These include
+ any variable marked with DW_AT_external or any variable that
+ lives in a namespace. [Variables in anonymous namespaces
+ require prefixing, but they are not DW_AT_external.] */
- if (res.name == NULL)
- res.name = "<unknown>";
+ if (dwarf2_attr (die, DW_AT_specification, cu))
+ {
+ struct dwarf2_cu *spec_cu = cu;
- return res;
+ return die_needs_namespace (die_specification (die, &spec_cu),
+ spec_cu);
+ }
+
+ attr = dwarf2_attr (die, DW_AT_external, cu);
+ if (attr == NULL && die->parent->tag != DW_TAG_namespace
+ && die->parent->tag != DW_TAG_module)
+ return 0;
+ /* A variable in a lexical block of some kind does not need a
+ namespace, even though in C++ such variables may be external
+ and have a mangled name. */
+ if (die->parent->tag == DW_TAG_lexical_block
+ || die->parent->tag == DW_TAG_try_block
+ || die->parent->tag == DW_TAG_catch_block
+ || die->parent->tag == DW_TAG_subprogram)
+ return 0;
+ return 1;
+
+ default:
+ return 0;
+ }
}
-/* Handle DW_AT_stmt_list for a compilation unit.
- DIE is the DW_TAG_compile_unit die for CU.
- COMP_DIR is the compilation directory. LOWPC is passed to
- dwarf_decode_lines. See dwarf_decode_lines comments about it. */
+/* Return the DIE's linkage name attribute, either DW_AT_linkage_name
+ or DW_AT_MIPS_linkage_name. Returns NULL if the attribute is not
+ defined for the given DIE. */
-static void
-handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu,
- const char *comp_dir, CORE_ADDR lowpc) /* ARI: editCase function */
+static struct attribute *
+dw2_linkage_name_attr (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
struct attribute *attr;
- struct line_header line_header_local;
- hashval_t line_header_local_hash;
- void **slot;
- int decode_mapping;
- gdb_assert (! cu->per_cu->is_debug_types);
-
- attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
+ attr = dwarf2_attr (die, DW_AT_linkage_name, cu);
if (attr == NULL)
- return;
-
- sect_offset line_offset = (sect_offset) DW_UNSND (attr);
+ attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
- /* The line header hash table is only created if needed (it exists to
- prevent redundant reading of the line table for partial_units).
- If we're given a partial_unit, we'll need it. If we're given a
- compile_unit, then use the line header hash table if it's already
- created, but don't create one just yet. */
+ return attr;
+}
- if (dwarf2_per_objfile->line_header_hash == NULL
- && die->tag == DW_TAG_partial_unit)
- {
- dwarf2_per_objfile->line_header_hash
- = htab_create_alloc_ex (127, line_header_hash_voidp,
- line_header_eq_voidp,
- free_line_header_voidp,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
- }
+/* Return the DIE's linkage name as a string, either DW_AT_linkage_name
+ or DW_AT_MIPS_linkage_name. Returns NULL if the attribute is not
+ defined for the given DIE. */
- line_header_local.sect_off = line_offset;
- line_header_local.offset_in_dwz = cu->per_cu->is_dwz;
- line_header_local_hash = line_header_hash (&line_header_local);
- if (dwarf2_per_objfile->line_header_hash != NULL)
- {
- slot = htab_find_slot_with_hash (dwarf2_per_objfile->line_header_hash,
- &line_header_local,
- line_header_local_hash, NO_INSERT);
+static const char *
+dw2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
+{
+ const char *linkage_name;
- /* For DW_TAG_compile_unit we need info like symtab::linetable which
- is not present in *SLOT (since if there is something in *SLOT then
- it will be for a partial_unit). */
- if (die->tag == DW_TAG_partial_unit && slot != NULL)
- {
- gdb_assert (*slot != NULL);
- cu->line_header = (struct line_header *) *slot;
- return;
- }
- }
+ linkage_name = dwarf2_string_attr (die, DW_AT_linkage_name, cu);
+ if (linkage_name == NULL)
+ linkage_name = dwarf2_string_attr (die, DW_AT_MIPS_linkage_name, cu);
- /* dwarf_decode_line_header does not yet provide sufficient information.
- We always have to call also dwarf_decode_lines for it. */
- line_header_up lh = dwarf_decode_line_header (line_offset, cu);
- if (lh == NULL)
- return;
+ return linkage_name;
+}
- cu->line_header = lh.release ();
- cu->line_header_die_owner = die;
+/* Compute the fully qualified name of DIE in CU. If PHYSNAME is nonzero,
+ compute the physname for the object, which include a method's:
+ - formal parameters (C++),
+ - receiver type (Go),
- if (dwarf2_per_objfile->line_header_hash == NULL)
- slot = NULL;
- else
- {
- slot = htab_find_slot_with_hash (dwarf2_per_objfile->line_header_hash,
- &line_header_local,
- line_header_local_hash, INSERT);
- gdb_assert (slot != NULL);
- }
- if (slot != NULL && *slot == NULL)
- {
- /* This newly decoded line number information unit will be owned
- by line_header_hash hash table. */
- *slot = cu->line_header;
- cu->line_header_die_owner = NULL;
- }
- else
- {
- /* We cannot free any current entry in (*slot) as that struct line_header
- may be already used by multiple CUs. Create only temporary decoded
- line_header for this CU - it may happen at most once for each line
- number information unit. And if we're not using line_header_hash
- then this is what we want as well. */
- gdb_assert (die->tag != DW_TAG_partial_unit);
- }
- decode_mapping = (die->tag != DW_TAG_partial_unit);
- dwarf_decode_lines (cu->line_header, comp_dir, cu, NULL, lowpc,
- decode_mapping);
+ The term "physname" is a bit confusing.
+ For C++, for example, it is the demangled name.
+ For Go, for example, it's the mangled name.
-}
+ For Ada, return the DIE's linkage name rather than the fully qualified
+ name. PHYSNAME is ignored..
-/* Process DW_TAG_compile_unit or DW_TAG_partial_unit. */
+ The result is allocated on the objfile_obstack and canonicalized. */
-static void
-read_file_scope (struct die_info *die, struct dwarf2_cu *cu)
+static const char *
+dwarf2_compute_name (const char *name,
+ struct die_info *die, struct dwarf2_cu *cu,
+ int physname)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR lowpc = ((CORE_ADDR) -1);
- CORE_ADDR highpc = ((CORE_ADDR) 0);
- struct attribute *attr;
- struct die_info *child_die;
- CORE_ADDR baseaddr;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-
- get_scope_pc_bounds (die, &lowpc, &highpc, cu);
+ if (name == NULL)
+ name = dwarf2_name (die, cu);
- /* If we didn't find a lowpc, set it to highpc to avoid complaints
- from finish_block. */
- if (lowpc == ((CORE_ADDR) -1))
- lowpc = highpc;
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
+ /* For Fortran GDB prefers DW_AT_*linkage_name for the physname if present
+ but otherwise compute it by typename_concat inside GDB.
+ FIXME: Actually this is not really true, or at least not always true.
+ It's all very confusing. SYMBOL_SET_NAMES doesn't try to demangle
+ Fortran names because there is no mangling standard. So new_symbol
+ will set the demangled name to the result of dwarf2_full_name, and it is
+ the demangled name that GDB uses if it exists. */
+ if (cu->language == language_ada
+ || (cu->language == language_fortran && physname))
+ {
+ /* For Ada unit, we prefer the linkage name over the name, as
+ the former contains the exported name, which the user expects
+ to be able to reference. Ideally, we want the user to be able
+ to reference this entity using either natural or linkage name,
+ but we haven't started looking at this enhancement yet. */
+ const char *linkage_name = dw2_linkage_name (die, cu);
- file_and_directory fnd = find_file_and_directory (die, cu);
+ if (linkage_name != NULL)
+ return linkage_name;
+ }
- prepare_one_comp_unit (cu, die, cu->language);
+ /* These are the only languages we know how to qualify names in. */
+ if (name != NULL
+ && (cu->language == language_cplus
+ || cu->language == language_fortran || cu->language == language_d
+ || cu->language == language_rust))
+ {
+ if (die_needs_namespace (die, cu))
+ {
+ const char *prefix;
+ const char *canonical_name = NULL;
- /* The XLCL doesn't generate DW_LANG_OpenCL because this attribute is not
- standardised yet. As a workaround for the language detection we fall
- back to the DW_AT_producer string. */
- if (cu->producer && strstr (cu->producer, "IBM XL C for OpenCL") != NULL)
- cu->language = language_opencl;
+ string_file buf;
- /* Similar hack for Go. */
- if (cu->producer && strstr (cu->producer, "GNU Go ") != NULL)
- set_cu_language (DW_LANG_Go, cu);
+ prefix = determine_prefix (die, cu);
+ if (*prefix != '\0')
+ {
+ char *prefixed_name = typename_concat (NULL, prefix, name,
+ physname, cu);
- dwarf2_start_symtab (cu, fnd.name, fnd.comp_dir, lowpc);
+ buf.puts (prefixed_name);
+ xfree (prefixed_name);
+ }
+ else
+ buf.puts (name);
- /* Decode line number information if present. We do this before
- processing child DIEs, so that the line header table is available
- for DW_AT_decl_file. */
- handle_DW_AT_stmt_list (die, cu, fnd.comp_dir, lowpc);
+ /* Template parameters may be specified in the DIE's DW_AT_name, or
+ as children with DW_TAG_template_type_param or
+ DW_TAG_value_type_param. If the latter, add them to the name
+ here. If the name already has template parameters, then
+ skip this step; some versions of GCC emit both, and
+ it is more efficient to use the pre-computed name.
- /* Process all dies in compilation unit. */
- if (die->child != NULL)
- {
- child_die = die->child;
- while (child_die && child_die->tag)
- {
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
- }
- }
+ Something to keep in mind about this process: it is very
+ unlikely, or in some cases downright impossible, to produce
+ something that will match the mangled name of a function.
+ If the definition of the function has the same debug info,
+ we should be able to match up with it anyway. But fallbacks
+ using the minimal symbol, for instance to find a method
+ implemented in a stripped copy of libstdc++, will not work.
+ If we do not have debug info for the definition, we will have to
+ match them up some other way.
- /* 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. */
- attr = dwarf2_attr (die, DW_AT_macros, cu);
- if (attr == NULL)
- attr = dwarf2_attr (die, DW_AT_GNU_macros, cu);
- if (attr && cu->line_header)
- {
- if (dwarf2_attr (die, DW_AT_macro_info, cu))
- complaint (&symfile_complaints,
- _("CU refers to both DW_AT_macros and DW_AT_macro_info"));
+ When we do name matching there is a related problem with function
+ templates; two instantiated function templates are allowed to
+ differ only by their return types, which we do not add here. */
- dwarf_decode_macros (cu, DW_UNSND (attr), 1);
- }
- else
- {
- attr = dwarf2_attr (die, DW_AT_macro_info, cu);
- if (attr && cu->line_header)
- {
- unsigned int macro_offset = DW_UNSND (attr);
+ if (cu->language == language_cplus && strchr (name, '<') == NULL)
+ {
+ struct attribute *attr;
+ struct die_info *child;
+ int first = 1;
- dwarf_decode_macros (cu, macro_offset, 0);
- }
- }
-}
+ die->building_fullname = 1;
-/* TU version of handle_DW_AT_stmt_list for read_type_unit_scope.
- Create the set of symtabs used by this TU, or if this TU is sharing
- symtabs with another TU and the symtabs have already been created
- then restore those symtabs in the line header.
- We don't need the pc/line-number mapping for type units. */
+ for (child = die->child; child != NULL; child = child->sibling)
+ {
+ struct type *type;
+ LONGEST value;
+ const gdb_byte *bytes;
+ struct dwarf2_locexpr_baton *baton;
+ struct value *v;
-static void
-setup_type_unit_groups (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct dwarf2_per_cu_data *per_cu = cu->per_cu;
- struct type_unit_group *tu_group;
- int first_time;
- struct attribute *attr;
- unsigned int i;
- struct signatured_type *sig_type;
+ if (child->tag != DW_TAG_template_type_param
+ && child->tag != DW_TAG_template_value_param)
+ continue;
- gdb_assert (per_cu->is_debug_types);
- sig_type = (struct signatured_type *) per_cu;
+ if (first)
+ {
+ buf.puts ("<");
+ first = 0;
+ }
+ else
+ buf.puts (", ");
- attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
+ attr = dwarf2_attr (child, DW_AT_type, cu);
+ if (attr == NULL)
+ {
+ complaint (_("template parameter missing DW_AT_type"));
+ buf.puts ("UNKNOWN_TYPE");
+ continue;
+ }
+ type = die_type (child, cu);
- /* If we're using .gdb_index (includes -readnow) then
- per_cu->type_unit_group may not have been set up yet. */
- if (sig_type->type_unit_group == NULL)
- sig_type->type_unit_group = get_type_unit_group (cu, attr);
- tu_group = sig_type->type_unit_group;
+ if (child->tag == DW_TAG_template_type_param)
+ {
+ c_print_type (type, "", &buf, -1, 0, cu->language,
+ &type_print_raw_options);
+ continue;
+ }
- /* If we've already processed this stmt_list there's no real need to
- do it again, we could fake it and just recreate the part we need
- (file name,index -> symtab mapping). If data shows this optimization
- is useful we can do it then. */
- first_time = tu_group->compunit_symtab == NULL;
+ attr = dwarf2_attr (child, DW_AT_const_value, cu);
+ if (attr == NULL)
+ {
+ complaint (_("template parameter missing "
+ "DW_AT_const_value"));
+ buf.puts ("UNKNOWN_VALUE");
+ continue;
+ }
- /* We have to handle the case of both a missing DW_AT_stmt_list or bad
- debug info. */
- line_header_up lh;
- if (attr != NULL)
- {
- sect_offset line_offset = (sect_offset) DW_UNSND (attr);
- lh = dwarf_decode_line_header (line_offset, cu);
- }
- if (lh == NULL)
- {
- if (first_time)
- dwarf2_start_symtab (cu, "", NULL, 0);
- else
- {
- gdb_assert (tu_group->symtabs == NULL);
- restart_symtab (tu_group->compunit_symtab, "", 0);
- }
- return;
- }
+ dwarf2_const_value_attr (attr, type, name,
+ &cu->comp_unit_obstack, cu,
+ &value, &bytes, &baton);
- cu->line_header = lh.release ();
- cu->line_header_die_owner = die;
+ if (TYPE_NOSIGN (type))
+ /* GDB prints characters as NUMBER 'CHAR'. If that's
+ changed, this can use value_print instead. */
+ c_printchar (value, type, &buf);
+ else
+ {
+ struct value_print_options opts;
- if (first_time)
- {
- struct compunit_symtab *cust = dwarf2_start_symtab (cu, "", NULL, 0);
+ if (baton != NULL)
+ v = dwarf2_evaluate_loc_desc (type, NULL,
+ baton->data,
+ baton->size,
+ baton->per_cu);
+ else if (bytes != NULL)
+ {
+ v = allocate_value (type);
+ memcpy (value_contents_writeable (v), bytes,
+ TYPE_LENGTH (type));
+ }
+ else
+ v = value_from_longest (type, value);
- /* Note: We don't assign tu_group->compunit_symtab yet because we're
- still initializing it, and our caller (a few levels up)
- process_full_type_unit still needs to know if this is the first
- time. */
+ /* Specify decimal so that we do not depend on
+ the radix. */
+ get_formatted_print_options (&opts, 'd');
+ opts.raw = 1;
+ value_print (v, &buf, &opts);
+ release_value (v);
+ }
+ }
- tu_group->num_symtabs = cu->line_header->file_names.size ();
- tu_group->symtabs = XNEWVEC (struct symtab *,
- cu->line_header->file_names.size ());
+ die->building_fullname = 0;
- for (i = 0; i < cu->line_header->file_names.size (); ++i)
- {
- file_entry &fe = cu->line_header->file_names[i];
+ if (!first)
+ {
+ /* Close the argument list, with a space if necessary
+ (nested templates). */
+ if (!buf.empty () && buf.string ().back () == '>')
+ buf.puts (" >");
+ else
+ buf.puts (">");
+ }
+ }
- dwarf2_start_subfile (fe.name, fe.include_dir (cu->line_header));
+ /* For C++ methods, append formal parameter type
+ information, if PHYSNAME. */
- if (current_subfile->symtab == NULL)
+ if (physname && die->tag == DW_TAG_subprogram
+ && cu->language == language_cplus)
{
- /* NOTE: start_subfile will recognize when it's been
- passed a file it has already seen. So we can't
- assume there's a simple mapping from
- cu->line_header->file_names to subfiles, plus
- cu->line_header->file_names may contain dups. */
- current_subfile->symtab
- = allocate_symtab (cust, current_subfile->name);
+ struct type *type = read_type_die (die, cu);
+
+ c_type_print_args (type, &buf, 1, cu->language,
+ &type_print_raw_options);
+
+ if (cu->language == language_cplus)
+ {
+ /* Assume that an artificial first parameter is
+ "this", but do not crash if it is not. RealView
+ marks unnamed (and thus unused) parameters as
+ artificial; there is no way to differentiate
+ the two cases. */
+ if (TYPE_NFIELDS (type) > 0
+ && TYPE_FIELD_ARTIFICIAL (type, 0)
+ && TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_PTR
+ && TYPE_CONST (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type,
+ 0))))
+ buf.puts (" const");
+ }
}
- fe.symtab = current_subfile->symtab;
- tu_group->symtabs[i] = fe.symtab;
- }
- }
- else
- {
- restart_symtab (tu_group->compunit_symtab, "", 0);
+ const std::string &intermediate_name = buf.string ();
- for (i = 0; i < cu->line_header->file_names.size (); ++i)
- {
- file_entry &fe = cu->line_header->file_names[i];
+ if (cu->language == language_cplus)
+ canonical_name
+ = dwarf2_canonicalize_name (intermediate_name.c_str (), cu,
+ &objfile->per_bfd->storage_obstack);
- fe.symtab = tu_group->symtabs[i];
+ /* If we only computed INTERMEDIATE_NAME, or if
+ INTERMEDIATE_NAME is already canonical, then we need to
+ copy it to the appropriate obstack. */
+ if (canonical_name == NULL || canonical_name == intermediate_name.c_str ())
+ name = ((const char *)
+ obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ intermediate_name.c_str (),
+ intermediate_name.length ()));
+ else
+ name = canonical_name;
}
}
- /* The main symtab is allocated last. Type units don't have DW_AT_name
- so they don't have a "real" (so to speak) symtab anyway.
- There is later code that will assign the main symtab to all symbols
- that don't have one. We need to handle the case of a symbol with a
- missing symtab (DW_AT_decl_file) anyway. */
+ return name;
}
-/* Process DW_TAG_type_unit.
- For TUs we want to skip the first top level sibling if it's not the
- actual type being defined by this TU. In this case the first top
- level sibling is there to provide context only. */
+/* Return the fully qualified name of DIE, based on its DW_AT_name.
+ If scope qualifiers are appropriate they will be added. The result
+ will be allocated on the storage_obstack, or NULL if the DIE does
+ not have a name. NAME may either be from a previous call to
+ dwarf2_name or NULL.
-static void
-read_type_unit_scope (struct die_info *die, struct dwarf2_cu *cu)
+ The output string will be canonicalized (if C++). */
+
+static const char *
+dwarf2_full_name (const char *name, struct die_info *die, struct dwarf2_cu *cu)
{
- struct die_info *child_die;
+ return dwarf2_compute_name (name, die, cu, 0);
+}
- prepare_one_comp_unit (cu, die, language_minimal);
+/* Construct a physname for the given DIE in CU. NAME may either be
+ from a previous call to dwarf2_name or NULL. The result will be
+ allocated on the objfile_objstack or NULL if the DIE does not have a
+ name.
- /* Initialize (or reinitialize) the machinery for building symtabs.
- We do this before processing child DIEs, so that the line header table
- is available for DW_AT_decl_file. */
- setup_type_unit_groups (die, cu);
+ The output string will be canonicalized (if C++). */
- if (die->child != NULL)
+static const char *
+dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const char *retval, *mangled = NULL, *canon = NULL;
+ int need_copy = 1;
+
+ /* In this case dwarf2_compute_name is just a shortcut not building anything
+ on its own. */
+ if (!die_needs_namespace (die, cu))
+ return dwarf2_compute_name (name, die, cu, 1);
+
+ mangled = dw2_linkage_name (die, cu);
+
+ /* rustc emits invalid values for DW_AT_linkage_name. Ignore these.
+ See https://github.com/rust-lang/rust/issues/32925. */
+ if (cu->language == language_rust && mangled != NULL
+ && strchr (mangled, '{') != NULL)
+ mangled = NULL;
+
+ /* DW_AT_linkage_name is missing in some cases - depend on what GDB
+ has computed. */
+ gdb::unique_xmalloc_ptr<char> demangled;
+ if (mangled != NULL)
{
- child_die = die->child;
- while (child_die && child_die->tag)
+
+ if (language_def (cu->language)->la_store_sym_names_in_linkage_form_p)
{
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
+ /* Do nothing (do not demangle the symbol name). */
+ }
+ else if (cu->language == language_go)
+ {
+ /* This is a lie, but we already lie to the caller new_symbol.
+ new_symbol assumes we return the mangled name.
+ This just undoes that lie until things are cleaned up. */
+ }
+ else
+ {
+ /* Use DMGL_RET_DROP for C++ template functions to suppress
+ their return type. It is easier for GDB users to search
+ for such functions as `name(params)' than `long name(params)'.
+ In such case the minimal symbol names do not match the full
+ symbol names but for template functions there is never a need
+ to look up their definition from their declaration so
+ the only disadvantage remains the minimal symbol variant
+ `long name(params)' does not have the proper inferior type. */
+ demangled.reset (gdb_demangle (mangled,
+ (DMGL_PARAMS | DMGL_ANSI
+ | DMGL_RET_DROP)));
+ }
+ if (demangled)
+ canon = demangled.get ();
+ else
+ {
+ canon = mangled;
+ need_copy = 0;
}
}
-}
-\f
-/* DWO/DWP files.
-
- http://gcc.gnu.org/wiki/DebugFission
- http://gcc.gnu.org/wiki/DebugFissionDWP
-
- To simplify handling of both DWO files ("object" files with the DWARF info)
- and DWP files (a file with the DWOs packaged up into one file), we treat
- DWP files as having a collection of virtual DWO files. */
-static hashval_t
-hash_dwo_file (const void *item)
-{
- const struct dwo_file *dwo_file = (const struct dwo_file *) item;
- hashval_t hash;
+ if (canon == NULL || check_physname)
+ {
+ const char *physname = dwarf2_compute_name (name, die, cu, 1);
- hash = htab_hash_string (dwo_file->dwo_name);
- if (dwo_file->comp_dir != NULL)
- hash += htab_hash_string (dwo_file->comp_dir);
- return hash;
-}
+ if (canon != NULL && strcmp (physname, canon) != 0)
+ {
+ /* It may not mean a bug in GDB. The compiler could also
+ compute DW_AT_linkage_name incorrectly. But in such case
+ GDB would need to be bug-to-bug compatible. */
-static int
-eq_dwo_file (const void *item_lhs, const void *item_rhs)
-{
- const struct dwo_file *lhs = (const struct dwo_file *) item_lhs;
- const struct dwo_file *rhs = (const struct dwo_file *) item_rhs;
+ complaint (_("Computed physname <%s> does not match demangled <%s> "
+ "(from linkage <%s>) - DIE at %s [in module %s]"),
+ physname, canon, mangled, sect_offset_str (die->sect_off),
+ objfile_name (objfile));
- if (strcmp (lhs->dwo_name, rhs->dwo_name) != 0)
- return 0;
- if (lhs->comp_dir == NULL || rhs->comp_dir == NULL)
- return lhs->comp_dir == rhs->comp_dir;
- return strcmp (lhs->comp_dir, rhs->comp_dir) == 0;
-}
+ /* Prefer DW_AT_linkage_name (in the CANON form) - when it
+ is available here - over computed PHYSNAME. It is safer
+ against both buggy GDB and buggy compilers. */
-/* Allocate a hash table for DWO files. */
+ retval = canon;
+ }
+ else
+ {
+ retval = physname;
+ need_copy = 0;
+ }
+ }
+ else
+ retval = canon;
-static htab_t
-allocate_dwo_file_hash_table (void)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
+ if (need_copy)
+ retval = ((const char *)
+ obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ retval, strlen (retval)));
- return htab_create_alloc_ex (41,
- hash_dwo_file,
- eq_dwo_file,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ return retval;
}
-/* Lookup DWO file DWO_NAME. */
+/* Inspect DIE in CU for a namespace alias. If one exists, record
+ a new symbol for it.
-static void **
-lookup_dwo_file_slot (const char *dwo_name, const char *comp_dir)
+ Returns 1 if a namespace alias was recorded, 0 otherwise. */
+
+static int
+read_namespace_alias (struct die_info *die, struct dwarf2_cu *cu)
{
- struct dwo_file find_entry;
- void **slot;
+ struct attribute *attr;
- if (dwarf2_per_objfile->dwo_files == NULL)
- dwarf2_per_objfile->dwo_files = allocate_dwo_file_hash_table ();
+ /* If the die does not have a name, this is not a namespace
+ alias. */
+ attr = dwarf2_attr (die, DW_AT_name, cu);
+ if (attr != NULL)
+ {
+ int num;
+ struct die_info *d = die;
+ struct dwarf2_cu *imported_cu = cu;
- memset (&find_entry, 0, sizeof (find_entry));
- find_entry.dwo_name = dwo_name;
- find_entry.comp_dir = comp_dir;
- slot = htab_find_slot (dwarf2_per_objfile->dwo_files, &find_entry, INSERT);
+ /* If the compiler has nested DW_AT_imported_declaration DIEs,
+ keep inspecting DIEs until we hit the underlying import. */
+#define MAX_NESTED_IMPORTED_DECLARATIONS 100
+ for (num = 0; num < MAX_NESTED_IMPORTED_DECLARATIONS; ++num)
+ {
+ attr = dwarf2_attr (d, DW_AT_import, cu);
+ if (attr == NULL)
+ break;
- return slot;
-}
+ d = follow_die_ref (d, attr, &imported_cu);
+ if (d->tag != DW_TAG_imported_declaration)
+ break;
+ }
-static hashval_t
-hash_dwo_unit (const void *item)
-{
- const struct dwo_unit *dwo_unit = (const struct dwo_unit *) item;
+ if (num == MAX_NESTED_IMPORTED_DECLARATIONS)
+ {
+ complaint (_("DIE at %s has too many recursively imported "
+ "declarations"), sect_offset_str (d->sect_off));
+ return 0;
+ }
- /* This drops the top 32 bits of the id, but is ok for a hash. */
- return dwo_unit->signature;
-}
+ if (attr != NULL)
+ {
+ struct type *type;
+ sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
-static int
-eq_dwo_unit (const void *item_lhs, const void *item_rhs)
-{
- const struct dwo_unit *lhs = (const struct dwo_unit *) item_lhs;
- const struct dwo_unit *rhs = (const struct dwo_unit *) item_rhs;
+ type = get_die_type_at_offset (sect_off, cu->per_cu);
+ if (type != NULL && TYPE_CODE (type) == TYPE_CODE_NAMESPACE)
+ {
+ /* This declaration is a global namespace alias. Add
+ a symbol for it whose type is the aliased namespace. */
+ new_symbol (die, type, cu);
+ return 1;
+ }
+ }
+ }
- /* The signature is assumed to be unique within the DWO file.
- So while object file CU dwo_id's always have the value zero,
- that's OK, assuming each object file DWO file has only one CU,
- and that's the rule for now. */
- return lhs->signature == rhs->signature;
+ return 0;
}
-/* Allocate a hash table for DWO CUs,TUs.
- There is one of these tables for each of CUs,TUs for each DWO file. */
+/* Return the using directives repository (global or local?) to use in the
+ current context for LANGUAGE.
-static htab_t
-allocate_dwo_unit_table (struct objfile *objfile)
+ For Ada, imported declarations can materialize renamings, which *may* be
+ global. However it is impossible (for now?) in DWARF to distinguish
+ "external" imported declarations and "static" ones. As all imported
+ declarations seem to be static in all other languages, make them all CU-wide
+ global only in Ada. */
+
+static struct using_direct **
+using_directives (enum language language)
{
- /* Start out with a pretty small number.
- Generally DWO files contain only one CU and maybe some TUs. */
- return htab_create_alloc_ex (3,
- hash_dwo_unit,
- eq_dwo_unit,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ if (language == language_ada && context_stack_depth == 0)
+ return &global_using_directives;
+ else
+ return &local_using_directives;
}
-/* Structure used to pass data to create_dwo_debug_info_hash_table_reader. */
+/* Read the import statement specified by the given die and record it. */
-struct create_dwo_cu_data
+static void
+read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
{
- struct dwo_file *dwo_file;
- struct dwo_unit dwo_unit;
-};
-
-/* die_reader_func for create_dwo_cu. */
-
-static void
-create_dwo_cu_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *datap)
-{
- struct dwarf2_cu *cu = reader->cu;
- sect_offset sect_off = cu->per_cu->sect_off;
- struct dwarf2_section_info *section = cu->per_cu->section;
- struct create_dwo_cu_data *data = (struct create_dwo_cu_data *) datap;
- struct dwo_file *dwo_file = data->dwo_file;
- struct dwo_unit *dwo_unit = &data->dwo_unit;
- struct attribute *attr;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct attribute *import_attr;
+ struct die_info *imported_die, *child_die;
+ struct dwarf2_cu *imported_cu;
+ const char *imported_name;
+ const char *imported_name_prefix;
+ const char *canonical_name;
+ const char *import_alias;
+ const char *imported_declaration = NULL;
+ const char *import_prefix;
+ std::vector<const char *> excludes;
- attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_id, cu);
- if (attr == NULL)
+ import_attr = dwarf2_attr (die, DW_AT_import, cu);
+ if (import_attr == NULL)
{
- complaint (&symfile_complaints,
- _("Dwarf Error: debug entry at offset 0x%x is missing"
- " its dwo_id [in module %s]"),
- to_underlying (sect_off), dwo_file->dwo_name);
+ complaint (_("Tag '%s' has no DW_AT_import"),
+ dwarf_tag_name (die->tag));
return;
}
- dwo_unit->dwo_file = dwo_file;
- dwo_unit->signature = DW_UNSND (attr);
- dwo_unit->section = section;
- dwo_unit->sect_off = sect_off;
- dwo_unit->length = cu->per_cu->length;
-
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, " offset 0x%x, dwo_id %s\n",
- to_underlying (sect_off),
- hex_string (dwo_unit->signature));
-}
-
-/* Create the dwo_units for the CUs in a DWO_FILE.
- Note: This function processes DWO files only, not DWP files. */
+ imported_cu = cu;
+ imported_die = follow_die_ref_or_sig (die, import_attr, &imported_cu);
+ imported_name = dwarf2_name (imported_die, imported_cu);
+ if (imported_name == NULL)
+ {
+ /* GCC bug: https://bugzilla.redhat.com/show_bug.cgi?id=506524
-static void
-create_cus_hash_table (struct dwo_file &dwo_file, dwarf2_section_info §ion,
- htab_t &cus_htab)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- const gdb_byte *info_ptr, *end_ptr;
+ The import in the following code:
+ namespace A
+ {
+ typedef int B;
+ }
- dwarf2_read_section (objfile, §ion);
- info_ptr = section.buffer;
+ int main ()
+ {
+ using A::B;
+ B b;
+ return b;
+ }
- if (info_ptr == NULL)
- return;
+ ...
+ <2><51>: Abbrev Number: 3 (DW_TAG_imported_declaration)
+ <52> DW_AT_decl_file : 1
+ <53> DW_AT_decl_line : 6
+ <54> DW_AT_import : <0x75>
+ <2><58>: Abbrev Number: 4 (DW_TAG_typedef)
+ <59> DW_AT_name : B
+ <5b> DW_AT_decl_file : 1
+ <5c> DW_AT_decl_line : 2
+ <5d> DW_AT_type : <0x6e>
+ ...
+ <1><75>: Abbrev Number: 7 (DW_TAG_base_type)
+ <76> DW_AT_byte_size : 4
+ <77> DW_AT_encoding : 5 (signed)
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n",
- get_section_name (§ion),
- get_section_file_name (§ion));
+ imports the wrong die ( 0x75 instead of 0x58 ).
+ This case will be ignored until the gcc bug is fixed. */
+ return;
}
- end_ptr = info_ptr + section.size;
- while (info_ptr < end_ptr)
- {
- struct dwarf2_per_cu_data per_cu;
- struct create_dwo_cu_data create_dwo_cu_data;
- struct dwo_unit *dwo_unit;
- void **slot;
- sect_offset sect_off = (sect_offset) (info_ptr - section.buffer);
+ /* Figure out the local name after import. */
+ import_alias = dwarf2_name (die, cu);
- memset (&create_dwo_cu_data.dwo_unit, 0,
- sizeof (create_dwo_cu_data.dwo_unit));
- memset (&per_cu, 0, sizeof (per_cu));
- per_cu.objfile = objfile;
- per_cu.is_debug_types = 0;
- per_cu.sect_off = sect_offset (info_ptr - section.buffer);
- per_cu.section = §ion;
- create_dwo_cu_data.dwo_file = &dwo_file;
+ /* Figure out where the statement is being imported to. */
+ import_prefix = determine_prefix (die, cu);
- init_cutu_and_read_dies_no_follow (
- &per_cu, &dwo_file, create_dwo_cu_reader, &create_dwo_cu_data);
- info_ptr += per_cu.length;
+ /* Figure out what the scope of the imported die is and prepend it
+ to the name of the imported die. */
+ imported_name_prefix = determine_prefix (imported_die, imported_cu);
- // If the unit could not be parsed, skip it.
- if (create_dwo_cu_data.dwo_unit.dwo_file == NULL)
- continue;
+ if (imported_die->tag != DW_TAG_namespace
+ && imported_die->tag != DW_TAG_module)
+ {
+ imported_declaration = imported_name;
+ canonical_name = imported_name_prefix;
+ }
+ else if (strlen (imported_name_prefix) > 0)
+ canonical_name = obconcat (&objfile->objfile_obstack,
+ imported_name_prefix,
+ (cu->language == language_d ? "." : "::"),
+ imported_name, (char *) NULL);
+ else
+ canonical_name = imported_name;
- if (cus_htab == NULL)
- cus_htab = allocate_dwo_unit_table (objfile);
+ if (die->tag == DW_TAG_imported_module && cu->language == language_fortran)
+ for (child_die = die->child; child_die && child_die->tag;
+ child_die = sibling_die (child_die))
+ {
+ /* DWARF-4: A Fortran use statement with a “rename list” may be
+ represented by an imported module entry with an import attribute
+ referring to the module and owned entries corresponding to those
+ entities that are renamed as part of being imported. */
- dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
- *dwo_unit = create_dwo_cu_data.dwo_unit;
- slot = htab_find_slot (cus_htab, dwo_unit, INSERT);
- gdb_assert (slot != NULL);
- if (*slot != NULL)
- {
- const struct dwo_unit *dup_cu = (const struct dwo_unit *)*slot;
- sect_offset dup_sect_off = dup_cu->sect_off;
+ if (child_die->tag != DW_TAG_imported_declaration)
+ {
+ complaint (_("child DW_TAG_imported_declaration expected "
+ "- DIE at %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
+ }
- complaint (&symfile_complaints,
- _("debug cu entry at offset 0x%x is duplicate to"
- " the entry at offset 0x%x, signature %s"),
- to_underlying (sect_off), to_underlying (dup_sect_off),
- hex_string (dwo_unit->signature));
- }
- *slot = (void *)dwo_unit;
- }
-}
+ import_attr = dwarf2_attr (child_die, DW_AT_import, cu);
+ if (import_attr == NULL)
+ {
+ complaint (_("Tag '%s' has no DW_AT_import"),
+ dwarf_tag_name (child_die->tag));
+ continue;
+ }
-/* DWP file .debug_{cu,tu}_index section format:
- [ref: http://gcc.gnu.org/wiki/DebugFissionDWP]
+ imported_cu = cu;
+ imported_die = follow_die_ref_or_sig (child_die, import_attr,
+ &imported_cu);
+ imported_name = dwarf2_name (imported_die, imported_cu);
+ if (imported_name == NULL)
+ {
+ complaint (_("child DW_TAG_imported_declaration has unknown "
+ "imported name - DIE at %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
+ }
- DWP Version 1:
+ excludes.push_back (imported_name);
- Both index sections have the same format, and serve to map a 64-bit
- signature to a set of section numbers. Each section begins with a header,
- followed by a hash table of 64-bit signatures, a parallel table of 32-bit
- indexes, and a pool of 32-bit section numbers. The index sections will be
- aligned at 8-byte boundaries in the file.
+ process_die (child_die, cu);
+ }
- The index section header consists of:
+ add_using_directive (using_directives (cu->language),
+ import_prefix,
+ canonical_name,
+ import_alias,
+ imported_declaration,
+ excludes,
+ 0,
+ &objfile->objfile_obstack);
+}
- V, 32 bit version number
- -, 32 bits unused
- N, 32 bit number of compilation units or type units in the index
- M, 32 bit number of slots in the hash table
+/* ICC<14 does not output the required DW_AT_declaration on incomplete
+ types, but gives them a size of zero. Starting with version 14,
+ ICC is compatible with GCC. */
- Numbers are recorded using the byte order of the application binary.
+static int
+producer_is_icc_lt_14 (struct dwarf2_cu *cu)
+{
+ if (!cu->checked_producer)
+ check_producer (cu);
- The hash table begins at offset 16 in the section, and consists of an array
- of M 64-bit slots. Each slot contains a 64-bit signature (using the byte
- order of the application binary). Unused slots in the hash table are 0.
- (We rely on the extreme unlikeliness of a signature being exactly 0.)
+ return cu->producer_is_icc_lt_14;
+}
- The parallel table begins immediately after the hash table
- (at offset 16 + 8 * M from the beginning of the section), and consists of an
- array of 32-bit indexes (using the byte order of the application binary),
- corresponding 1-1 with slots in the hash table. Each entry in the parallel
- table contains a 32-bit index into the pool of section numbers. For unused
- hash table slots, the corresponding entry in the parallel table will be 0.
+/* Check for possibly missing DW_AT_comp_dir with relative .debug_line
+ directory paths. GCC SVN r127613 (new option -fdebug-prefix-map) fixed
+ this, it was first present in GCC release 4.3.0. */
- The pool of section numbers begins immediately following the hash table
- (at offset 16 + 12 * M from the beginning of the section). The pool of
- section numbers consists of an array of 32-bit words (using the byte order
- of the application binary). Each item in the array is indexed starting
- from 0. The hash table entry provides the index of the first section
- number in the set. Additional section numbers in the set follow, and the
- set is terminated by a 0 entry (section number 0 is not used in ELF).
+static int
+producer_is_gcc_lt_4_3 (struct dwarf2_cu *cu)
+{
+ if (!cu->checked_producer)
+ check_producer (cu);
- In each set of section numbers, the .debug_info.dwo or .debug_types.dwo
- section must be the first entry in the set, and the .debug_abbrev.dwo must
- be the second entry. Other members of the set may follow in any order.
+ return cu->producer_is_gcc_lt_4_3;
+}
- ---
+static file_and_directory
+find_file_and_directory (struct die_info *die, struct dwarf2_cu *cu)
+{
+ file_and_directory res;
- DWP Version 2:
+ /* Find the filename. Do not use dwarf2_name here, since the filename
+ is not a source language identifier. */
+ res.name = dwarf2_string_attr (die, DW_AT_name, cu);
+ res.comp_dir = dwarf2_string_attr (die, DW_AT_comp_dir, cu);
- DWP Version 2 combines all the .debug_info, etc. sections into one,
- and the entries in the index tables are now offsets into these sections.
- CU offsets begin at 0. TU offsets begin at the size of the .debug_info
- section.
-
- Index Section Contents:
- Header
- Hash Table of Signatures dwp_hash_table.hash_table
- Parallel Table of Indices dwp_hash_table.unit_table
- Table of Section Offsets dwp_hash_table.v2.{section_ids,offsets}
- Table of Section Sizes dwp_hash_table.v2.sizes
-
- The index section header consists of:
+ if (res.comp_dir == NULL
+ && producer_is_gcc_lt_4_3 (cu) && res.name != NULL
+ && IS_ABSOLUTE_PATH (res.name))
+ {
+ res.comp_dir_storage = ldirname (res.name);
+ if (!res.comp_dir_storage.empty ())
+ res.comp_dir = res.comp_dir_storage.c_str ();
+ }
+ if (res.comp_dir != NULL)
+ {
+ /* Irix 6.2 native cc prepends <machine>.: to the compilation
+ directory, get rid of it. */
+ const char *cp = strchr (res.comp_dir, ':');
- V, 32 bit version number
- L, 32 bit number of columns in the table of section offsets
- N, 32 bit number of compilation units or type units in the index
- M, 32 bit number of slots in the hash table
+ if (cp && cp != res.comp_dir && cp[-1] == '.' && cp[1] == '/')
+ res.comp_dir = cp + 1;
+ }
- Numbers are recorded using the byte order of the application binary.
+ if (res.name == NULL)
+ res.name = "<unknown>";
- The hash table has the same format as version 1.
- The parallel table of indices has the same format as version 1,
- except that the entries are origin-1 indices into the table of sections
- offsets and the table of section sizes.
+ return res;
+}
- The table of offsets begins immediately following the parallel table
- (at offset 16 + 12 * M from the beginning of the section). The table is
- a two-dimensional array of 32-bit words (using the byte order of the
- application binary), with L columns and N+1 rows, in row-major order.
- Each row in the array is indexed starting from 0. The first row provides
- a key to the remaining rows: each column in this row provides an identifier
- for a debug section, and the offsets in the same column of subsequent rows
- refer to that section. The section identifiers are:
+/* Handle DW_AT_stmt_list for a compilation unit.
+ DIE is the DW_TAG_compile_unit die for CU.
+ COMP_DIR is the compilation directory. LOWPC is passed to
+ dwarf_decode_lines. See dwarf_decode_lines comments about it. */
- DW_SECT_INFO 1 .debug_info.dwo
- DW_SECT_TYPES 2 .debug_types.dwo
- DW_SECT_ABBREV 3 .debug_abbrev.dwo
- DW_SECT_LINE 4 .debug_line.dwo
- DW_SECT_LOC 5 .debug_loc.dwo
- DW_SECT_STR_OFFSETS 6 .debug_str_offsets.dwo
- DW_SECT_MACINFO 7 .debug_macinfo.dwo
- DW_SECT_MACRO 8 .debug_macro.dwo
+static void
+handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu,
+ const char *comp_dir, CORE_ADDR lowpc) /* ARI: editCase function */
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct attribute *attr;
+ struct line_header line_header_local;
+ hashval_t line_header_local_hash;
+ void **slot;
+ int decode_mapping;
- The offsets provided by the CU and TU index sections are the base offsets
- for the contributions made by each CU or TU to the corresponding section
- in the package file. Each CU and TU header contains an abbrev_offset
- field, used to find the abbreviations table for that CU or TU within the
- contribution to the .debug_abbrev.dwo section for that CU or TU, and should
- be interpreted as relative to the base offset given in the index section.
- Likewise, offsets into .debug_line.dwo from DW_AT_stmt_list attributes
- should be interpreted as relative to the base offset for .debug_line.dwo,
- and offsets into other debug sections obtained from DWARF attributes should
- also be interpreted as relative to the corresponding base offset.
+ gdb_assert (! cu->per_cu->is_debug_types);
- The table of sizes begins immediately following the table of offsets.
- Like the table of offsets, it is a two-dimensional array of 32-bit words,
- with L columns and N rows, in row-major order. Each row in the array is
- indexed starting from 1 (row 0 is shared by the two tables).
+ attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
+ if (attr == NULL)
+ return;
- ---
+ sect_offset line_offset = (sect_offset) DW_UNSND (attr);
- Hash table lookup is handled the same in version 1 and 2:
+ /* The line header hash table is only created if needed (it exists to
+ prevent redundant reading of the line table for partial_units).
+ If we're given a partial_unit, we'll need it. If we're given a
+ compile_unit, then use the line header hash table if it's already
+ created, but don't create one just yet. */
- We assume that N and M will not exceed 2^32 - 1.
- The size of the hash table, M, must be 2^k such that 2^k > 3*N/2.
+ if (dwarf2_per_objfile->line_header_hash == NULL
+ && die->tag == DW_TAG_partial_unit)
+ {
+ dwarf2_per_objfile->line_header_hash
+ = htab_create_alloc_ex (127, line_header_hash_voidp,
+ line_header_eq_voidp,
+ free_line_header_voidp,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+ }
- Given a 64-bit compilation unit signature or a type signature S, an entry
- in the hash table is located as follows:
+ line_header_local.sect_off = line_offset;
+ line_header_local.offset_in_dwz = cu->per_cu->is_dwz;
+ line_header_local_hash = line_header_hash (&line_header_local);
+ if (dwarf2_per_objfile->line_header_hash != NULL)
+ {
+ slot = htab_find_slot_with_hash (dwarf2_per_objfile->line_header_hash,
+ &line_header_local,
+ line_header_local_hash, NO_INSERT);
- 1) Calculate a primary hash H = S & MASK(k), where MASK(k) is a mask with
- the low-order k bits all set to 1.
+ /* For DW_TAG_compile_unit we need info like symtab::linetable which
+ is not present in *SLOT (since if there is something in *SLOT then
+ it will be for a partial_unit). */
+ if (die->tag == DW_TAG_partial_unit && slot != NULL)
+ {
+ gdb_assert (*slot != NULL);
+ cu->line_header = (struct line_header *) *slot;
+ return;
+ }
+ }
- 2) Calculate a secondary hash H' = (((S >> 32) & MASK(k)) | 1).
+ /* dwarf_decode_line_header does not yet provide sufficient information.
+ We always have to call also dwarf_decode_lines for it. */
+ line_header_up lh = dwarf_decode_line_header (line_offset, cu);
+ if (lh == NULL)
+ return;
- 3) If the hash table entry at index H matches the signature, use that
- entry. If the hash table entry at index H is unused (all zeroes),
- terminate the search: the signature is not present in the table.
+ cu->line_header = lh.release ();
+ cu->line_header_die_owner = die;
- 4) Let H = (H + H') modulo M. Repeat at Step 3.
+ if (dwarf2_per_objfile->line_header_hash == NULL)
+ slot = NULL;
+ else
+ {
+ slot = htab_find_slot_with_hash (dwarf2_per_objfile->line_header_hash,
+ &line_header_local,
+ line_header_local_hash, INSERT);
+ gdb_assert (slot != NULL);
+ }
+ if (slot != NULL && *slot == NULL)
+ {
+ /* This newly decoded line number information unit will be owned
+ by line_header_hash hash table. */
+ *slot = cu->line_header;
+ cu->line_header_die_owner = NULL;
+ }
+ else
+ {
+ /* We cannot free any current entry in (*slot) as that struct line_header
+ may be already used by multiple CUs. Create only temporary decoded
+ line_header for this CU - it may happen at most once for each line
+ number information unit. And if we're not using line_header_hash
+ then this is what we want as well. */
+ gdb_assert (die->tag != DW_TAG_partial_unit);
+ }
+ decode_mapping = (die->tag != DW_TAG_partial_unit);
+ dwarf_decode_lines (cu->line_header, comp_dir, cu, NULL, lowpc,
+ decode_mapping);
- Because M > N and H' and M are relatively prime, the search is guaranteed
- to stop at an unused slot or find the match. */
+}
-/* Create a hash table to map DWO IDs to their CU/TU entry in
- .debug_{info,types}.dwo in DWP_FILE.
- Returns NULL if there isn't one.
- Note: This function processes DWP files only, not DWO files. */
+/* Process DW_TAG_compile_unit or DW_TAG_partial_unit. */
-static struct dwp_hash_table *
-create_dwp_hash_table (struct dwp_file *dwp_file, int is_debug_types)
+static void
+read_file_scope (struct die_info *die, struct dwarf2_cu *cu)
{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
struct objfile *objfile = dwarf2_per_objfile->objfile;
- bfd *dbfd = dwp_file->dbfd;
- const gdb_byte *index_ptr, *index_end;
- struct dwarf2_section_info *index;
- uint32_t version, nr_columns, nr_units, nr_slots;
- struct dwp_hash_table *htab;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ CORE_ADDR lowpc = ((CORE_ADDR) -1);
+ CORE_ADDR highpc = ((CORE_ADDR) 0);
+ struct attribute *attr;
+ struct die_info *child_die;
+ CORE_ADDR baseaddr;
- if (is_debug_types)
- index = &dwp_file->sections.tu_index;
- else
- index = &dwp_file->sections.cu_index;
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- if (dwarf2_section_empty_p (index))
- return NULL;
- dwarf2_read_section (objfile, index);
+ get_scope_pc_bounds (die, &lowpc, &highpc, cu);
- index_ptr = index->buffer;
- index_end = index_ptr + index->size;
+ /* If we didn't find a lowpc, set it to highpc to avoid complaints
+ from finish_block. */
+ if (lowpc == ((CORE_ADDR) -1))
+ lowpc = highpc;
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
- version = read_4_bytes (dbfd, index_ptr);
- index_ptr += 4;
- if (version == 2)
- nr_columns = read_4_bytes (dbfd, index_ptr);
- else
- nr_columns = 0;
- index_ptr += 4;
- nr_units = read_4_bytes (dbfd, index_ptr);
- index_ptr += 4;
- nr_slots = read_4_bytes (dbfd, index_ptr);
- index_ptr += 4;
+ file_and_directory fnd = find_file_and_directory (die, cu);
- if (version != 1 && version != 2)
- {
- error (_("Dwarf Error: unsupported DWP file version (%s)"
- " [in module %s]"),
- pulongest (version), dwp_file->name);
- }
- if (nr_slots != (nr_slots & -nr_slots))
- {
- error (_("Dwarf Error: number of slots in DWP hash table (%s)"
- " is not power of 2 [in module %s]"),
- pulongest (nr_slots), dwp_file->name);
- }
+ prepare_one_comp_unit (cu, die, cu->language);
- htab = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwp_hash_table);
- htab->version = version;
- htab->nr_columns = nr_columns;
- htab->nr_units = nr_units;
- htab->nr_slots = nr_slots;
- htab->hash_table = index_ptr;
- htab->unit_table = htab->hash_table + sizeof (uint64_t) * nr_slots;
+ /* The XLCL doesn't generate DW_LANG_OpenCL because this attribute is not
+ standardised yet. As a workaround for the language detection we fall
+ back to the DW_AT_producer string. */
+ if (cu->producer && strstr (cu->producer, "IBM XL C for OpenCL") != NULL)
+ cu->language = language_opencl;
- /* Exit early if the table is empty. */
- if (nr_slots == 0 || nr_units == 0
- || (version == 2 && nr_columns == 0))
- {
- /* All must be zero. */
- if (nr_slots != 0 || nr_units != 0
- || (version == 2 && nr_columns != 0))
- {
- complaint (&symfile_complaints,
- _("Empty DWP but nr_slots,nr_units,nr_columns not"
- " all zero [in modules %s]"),
- dwp_file->name);
- }
- return htab;
+ /* Similar hack for Go. */
+ if (cu->producer && strstr (cu->producer, "GNU Go ") != NULL)
+ set_cu_language (DW_LANG_Go, cu);
+
+ dwarf2_start_symtab (cu, fnd.name, fnd.comp_dir, lowpc);
+
+ /* Decode line number information if present. We do this before
+ processing child DIEs, so that the line header table is available
+ for DW_AT_decl_file. */
+ handle_DW_AT_stmt_list (die, cu, fnd.comp_dir, lowpc);
+
+ /* Process all dies in compilation unit. */
+ if (die->child != NULL)
+ {
+ child_die = die->child;
+ while (child_die && child_die->tag)
+ {
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
+ }
}
- if (version == 1)
+ /* 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. */
+ attr = dwarf2_attr (die, DW_AT_macros, cu);
+ if (attr == NULL)
+ attr = dwarf2_attr (die, DW_AT_GNU_macros, cu);
+ if (attr && cu->line_header)
{
- htab->section_pool.v1.indices =
- htab->unit_table + sizeof (uint32_t) * nr_slots;
- /* It's harder to decide whether the section is too small in v1.
- V1 is deprecated anyway so we punt. */
+ if (dwarf2_attr (die, DW_AT_macro_info, cu))
+ complaint (_("CU refers to both DW_AT_macros and DW_AT_macro_info"));
+
+ dwarf_decode_macros (cu, DW_UNSND (attr), 1);
}
else
{
- const gdb_byte *ids_ptr = htab->unit_table + sizeof (uint32_t) * nr_slots;
- int *ids = htab->section_pool.v2.section_ids;
- /* Reverse map for error checking. */
- int ids_seen[DW_SECT_MAX + 1];
- int i;
-
- if (nr_columns < 2)
+ attr = dwarf2_attr (die, DW_AT_macro_info, cu);
+ if (attr && cu->line_header)
{
- error (_("Dwarf Error: bad DWP hash table, too few columns"
- " in section table [in module %s]"),
- dwp_file->name);
+ unsigned int macro_offset = DW_UNSND (attr);
+
+ dwarf_decode_macros (cu, macro_offset, 0);
}
- if (nr_columns > MAX_NR_V2_DWO_SECTIONS)
+ }
+}
+
+/* TU version of handle_DW_AT_stmt_list for read_type_unit_scope.
+ Create the set of symtabs used by this TU, or if this TU is sharing
+ symtabs with another TU and the symtabs have already been created
+ then restore those symtabs in the line header.
+ We don't need the pc/line-number mapping for type units. */
+
+static void
+setup_type_unit_groups (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct dwarf2_per_cu_data *per_cu = cu->per_cu;
+ struct type_unit_group *tu_group;
+ int first_time;
+ struct attribute *attr;
+ unsigned int i;
+ struct signatured_type *sig_type;
+
+ gdb_assert (per_cu->is_debug_types);
+ sig_type = (struct signatured_type *) per_cu;
+
+ attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
+
+ /* If we're using .gdb_index (includes -readnow) then
+ per_cu->type_unit_group may not have been set up yet. */
+ if (sig_type->type_unit_group == NULL)
+ sig_type->type_unit_group = get_type_unit_group (cu, attr);
+ tu_group = sig_type->type_unit_group;
+
+ /* If we've already processed this stmt_list there's no real need to
+ do it again, we could fake it and just recreate the part we need
+ (file name,index -> symtab mapping). If data shows this optimization
+ is useful we can do it then. */
+ first_time = tu_group->compunit_symtab == NULL;
+
+ /* We have to handle the case of both a missing DW_AT_stmt_list or bad
+ debug info. */
+ line_header_up lh;
+ if (attr != NULL)
+ {
+ sect_offset line_offset = (sect_offset) DW_UNSND (attr);
+ lh = dwarf_decode_line_header (line_offset, cu);
+ }
+ if (lh == NULL)
+ {
+ if (first_time)
+ dwarf2_start_symtab (cu, "", NULL, 0);
+ else
{
- error (_("Dwarf Error: bad DWP hash table, too many columns"
- " in section table [in module %s]"),
- dwp_file->name);
+ gdb_assert (tu_group->symtabs == NULL);
+ restart_symtab (tu_group->compunit_symtab, "", 0);
}
- memset (ids, 255, (DW_SECT_MAX + 1) * sizeof (int32_t));
- memset (ids_seen, 255, (DW_SECT_MAX + 1) * sizeof (int32_t));
- for (i = 0; i < nr_columns; ++i)
+ return;
+ }
+
+ cu->line_header = lh.release ();
+ cu->line_header_die_owner = die;
+
+ if (first_time)
+ {
+ struct compunit_symtab *cust = dwarf2_start_symtab (cu, "", NULL, 0);
+
+ /* Note: We don't assign tu_group->compunit_symtab yet because we're
+ still initializing it, and our caller (a few levels up)
+ process_full_type_unit still needs to know if this is the first
+ time. */
+
+ tu_group->num_symtabs = cu->line_header->file_names.size ();
+ tu_group->symtabs = XNEWVEC (struct symtab *,
+ cu->line_header->file_names.size ());
+
+ for (i = 0; i < cu->line_header->file_names.size (); ++i)
{
- int id = read_4_bytes (dbfd, ids_ptr + i * sizeof (uint32_t));
+ file_entry &fe = cu->line_header->file_names[i];
- if (id < DW_SECT_MIN || id > DW_SECT_MAX)
- {
- error (_("Dwarf Error: bad DWP hash table, bad section id %d"
- " in section table [in module %s]"),
- id, dwp_file->name);
- }
- if (ids_seen[id] != -1)
+ dwarf2_start_subfile (fe.name, fe.include_dir (cu->line_header));
+
+ if (current_subfile->symtab == NULL)
{
- error (_("Dwarf Error: bad DWP hash table, duplicate section"
- " id %d in section table [in module %s]"),
- id, dwp_file->name);
+ /* NOTE: start_subfile will recognize when it's been
+ passed a file it has already seen. So we can't
+ assume there's a simple mapping from
+ cu->line_header->file_names to subfiles, plus
+ cu->line_header->file_names may contain dups. */
+ current_subfile->symtab
+ = allocate_symtab (cust, current_subfile->name);
}
- ids_seen[id] = i;
- ids[i] = id;
- }
- /* Must have exactly one info or types section. */
- if (((ids_seen[DW_SECT_INFO] != -1)
- + (ids_seen[DW_SECT_TYPES] != -1))
- != 1)
- {
- error (_("Dwarf Error: bad DWP hash table, missing/duplicate"
- " DWO info/types section [in module %s]"),
- dwp_file->name);
+
+ fe.symtab = current_subfile->symtab;
+ tu_group->symtabs[i] = fe.symtab;
}
- /* Must have an abbrev section. */
- if (ids_seen[DW_SECT_ABBREV] == -1)
+ }
+ else
+ {
+ restart_symtab (tu_group->compunit_symtab, "", 0);
+
+ for (i = 0; i < cu->line_header->file_names.size (); ++i)
{
- error (_("Dwarf Error: bad DWP hash table, missing DWO abbrev"
- " section [in module %s]"),
- dwp_file->name);
+ file_entry &fe = cu->line_header->file_names[i];
+
+ fe.symtab = tu_group->symtabs[i];
}
- htab->section_pool.v2.offsets = ids_ptr + sizeof (uint32_t) * nr_columns;
- htab->section_pool.v2.sizes =
- htab->section_pool.v2.offsets + (sizeof (uint32_t)
- * nr_units * nr_columns);
- if ((htab->section_pool.v2.sizes + (sizeof (uint32_t)
- * nr_units * nr_columns))
- > index_end)
+ }
+
+ /* The main symtab is allocated last. Type units don't have DW_AT_name
+ so they don't have a "real" (so to speak) symtab anyway.
+ There is later code that will assign the main symtab to all symbols
+ that don't have one. We need to handle the case of a symbol with a
+ missing symtab (DW_AT_decl_file) anyway. */
+}
+
+/* Process DW_TAG_type_unit.
+ For TUs we want to skip the first top level sibling if it's not the
+ actual type being defined by this TU. In this case the first top
+ level sibling is there to provide context only. */
+
+static void
+read_type_unit_scope (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct die_info *child_die;
+
+ prepare_one_comp_unit (cu, die, language_minimal);
+
+ /* Initialize (or reinitialize) the machinery for building symtabs.
+ We do this before processing child DIEs, so that the line header table
+ is available for DW_AT_decl_file. */
+ setup_type_unit_groups (die, cu);
+
+ if (die->child != NULL)
+ {
+ child_die = die->child;
+ while (child_die && child_die->tag)
{
- error (_("Dwarf Error: DWP index section is corrupt (too small)"
- " [in module %s]"),
- dwp_file->name);
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
}
}
-
- return htab;
}
+\f
+/* DWO/DWP files.
-/* Update SECTIONS with the data from SECTP.
+ http://gcc.gnu.org/wiki/DebugFission
+ http://gcc.gnu.org/wiki/DebugFissionDWP
- This function is like the other "locate" section routines that are
- passed to bfd_map_over_sections, but in this context the sections to
- read comes from the DWP V1 hash table, not the full ELF section table.
+ To simplify handling of both DWO files ("object" files with the DWARF info)
+ and DWP files (a file with the DWOs packaged up into one file), we treat
+ DWP files as having a collection of virtual DWO files. */
- The result is non-zero for success, or zero if an error was found. */
+static hashval_t
+hash_dwo_file (const void *item)
+{
+ const struct dwo_file *dwo_file = (const struct dwo_file *) item;
+ hashval_t hash;
+
+ hash = htab_hash_string (dwo_file->dwo_name);
+ if (dwo_file->comp_dir != NULL)
+ hash += htab_hash_string (dwo_file->comp_dir);
+ return hash;
+}
static int
-locate_v1_virtual_dwo_sections (asection *sectp,
- struct virtual_v1_dwo_sections *sections)
+eq_dwo_file (const void *item_lhs, const void *item_rhs)
{
- const struct dwop_section_names *names = &dwop_section_names;
+ const struct dwo_file *lhs = (const struct dwo_file *) item_lhs;
+ const struct dwo_file *rhs = (const struct dwo_file *) item_rhs;
- if (section_is_p (sectp->name, &names->abbrev_dwo))
- {
- /* There can be only one. */
- if (sections->abbrev.s.section != NULL)
- return 0;
- sections->abbrev.s.section = sectp;
- sections->abbrev.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->info_dwo)
- || section_is_p (sectp->name, &names->types_dwo))
- {
- /* There can be only one. */
- if (sections->info_or_types.s.section != NULL)
- return 0;
- sections->info_or_types.s.section = sectp;
- sections->info_or_types.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->line_dwo))
- {
- /* There can be only one. */
- if (sections->line.s.section != NULL)
- return 0;
- sections->line.s.section = sectp;
- sections->line.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->loc_dwo))
- {
- /* There can be only one. */
- if (sections->loc.s.section != NULL)
- return 0;
- sections->loc.s.section = sectp;
- sections->loc.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->macinfo_dwo))
- {
- /* There can be only one. */
- if (sections->macinfo.s.section != NULL)
- return 0;
- sections->macinfo.s.section = sectp;
- sections->macinfo.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->macro_dwo))
- {
- /* There can be only one. */
- if (sections->macro.s.section != NULL)
- return 0;
- sections->macro.s.section = sectp;
- sections->macro.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->str_offsets_dwo))
- {
- /* There can be only one. */
- if (sections->str_offsets.s.section != NULL)
- return 0;
- sections->str_offsets.s.section = sectp;
- sections->str_offsets.size = bfd_get_section_size (sectp);
- }
- else
- {
- /* No other kind of section is valid. */
- return 0;
- }
+ if (strcmp (lhs->dwo_name, rhs->dwo_name) != 0)
+ return 0;
+ if (lhs->comp_dir == NULL || rhs->comp_dir == NULL)
+ return lhs->comp_dir == rhs->comp_dir;
+ return strcmp (lhs->comp_dir, rhs->comp_dir) == 0;
+}
- return 1;
+/* Allocate a hash table for DWO files. */
+
+static htab_t
+allocate_dwo_file_hash_table (struct objfile *objfile)
+{
+ return htab_create_alloc_ex (41,
+ hash_dwo_file,
+ eq_dwo_file,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
}
-/* Create a dwo_unit object for the DWO unit with signature SIGNATURE.
- UNIT_INDEX is the index of the DWO unit in the DWP hash table.
- COMP_DIR is the DW_AT_comp_dir attribute of the referencing CU.
- This is for DWP version 1 files. */
+/* Lookup DWO file DWO_NAME. */
-static struct dwo_unit *
-create_dwo_unit_in_dwp_v1 (struct dwp_file *dwp_file,
- uint32_t unit_index,
- const char *comp_dir,
- ULONGEST signature, int is_debug_types)
+static void **
+lookup_dwo_file_slot (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const char *dwo_name,
+ const char *comp_dir)
+{
+ struct dwo_file find_entry;
+ void **slot;
+
+ if (dwarf2_per_objfile->dwo_files == NULL)
+ dwarf2_per_objfile->dwo_files
+ = allocate_dwo_file_hash_table (dwarf2_per_objfile->objfile);
+
+ memset (&find_entry, 0, sizeof (find_entry));
+ find_entry.dwo_name = dwo_name;
+ find_entry.comp_dir = comp_dir;
+ slot = htab_find_slot (dwarf2_per_objfile->dwo_files, &find_entry, INSERT);
+
+ return slot;
+}
+
+static hashval_t
+hash_dwo_unit (const void *item)
+{
+ const struct dwo_unit *dwo_unit = (const struct dwo_unit *) item;
+
+ /* This drops the top 32 bits of the id, but is ok for a hash. */
+ return dwo_unit->signature;
+}
+
+static int
+eq_dwo_unit (const void *item_lhs, const void *item_rhs)
+{
+ const struct dwo_unit *lhs = (const struct dwo_unit *) item_lhs;
+ const struct dwo_unit *rhs = (const struct dwo_unit *) item_rhs;
+
+ /* The signature is assumed to be unique within the DWO file.
+ So while object file CU dwo_id's always have the value zero,
+ that's OK, assuming each object file DWO file has only one CU,
+ and that's the rule for now. */
+ return lhs->signature == rhs->signature;
+}
+
+/* Allocate a hash table for DWO CUs,TUs.
+ There is one of these tables for each of CUs,TUs for each DWO file. */
+
+static htab_t
+allocate_dwo_unit_table (struct objfile *objfile)
+{
+ /* Start out with a pretty small number.
+ Generally DWO files contain only one CU and maybe some TUs. */
+ return htab_create_alloc_ex (3,
+ hash_dwo_unit,
+ eq_dwo_unit,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+}
+
+/* Structure used to pass data to create_dwo_debug_info_hash_table_reader. */
+
+struct create_dwo_cu_data
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- const struct dwp_hash_table *dwp_htab =
- is_debug_types ? dwp_file->tus : dwp_file->cus;
- bfd *dbfd = dwp_file->dbfd;
- const char *kind = is_debug_types ? "TU" : "CU";
struct dwo_file *dwo_file;
- struct dwo_unit *dwo_unit;
- struct virtual_v1_dwo_sections sections;
- void **dwo_file_slot;
- int i;
+ struct dwo_unit dwo_unit;
+};
- gdb_assert (dwp_file->version == 1);
+/* die_reader_func for create_dwo_cu. */
- if (dwarf_read_debug)
+static void
+create_dwo_cu_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *datap)
+{
+ struct dwarf2_cu *cu = reader->cu;
+ sect_offset sect_off = cu->per_cu->sect_off;
+ struct dwarf2_section_info *section = cu->per_cu->section;
+ struct create_dwo_cu_data *data = (struct create_dwo_cu_data *) datap;
+ struct dwo_file *dwo_file = data->dwo_file;
+ struct dwo_unit *dwo_unit = &data->dwo_unit;
+ struct attribute *attr;
+
+ attr = dwarf2_attr (comp_unit_die, DW_AT_GNU_dwo_id, cu);
+ if (attr == NULL)
{
- fprintf_unfiltered (gdb_stdlog, "Reading %s %s/%s in DWP V1 file: %s\n",
- kind,
- pulongest (unit_index), hex_string (signature),
- dwp_file->name);
+ complaint (_("Dwarf Error: debug entry at offset %s is missing"
+ " its dwo_id [in module %s]"),
+ sect_offset_str (sect_off), dwo_file->dwo_name);
+ return;
}
- /* Fetch the sections of this DWO unit.
- Put a limit on the number of sections we look for so that bad data
- doesn't cause us to loop forever. */
+ dwo_unit->dwo_file = dwo_file;
+ dwo_unit->signature = DW_UNSND (attr);
+ dwo_unit->section = section;
+ dwo_unit->sect_off = sect_off;
+ dwo_unit->length = cu->per_cu->length;
-#define MAX_NR_V1_DWO_SECTIONS \
- (1 /* .debug_info or .debug_types */ \
- + 1 /* .debug_abbrev */ \
- + 1 /* .debug_line */ \
- + 1 /* .debug_loc */ \
- + 1 /* .debug_str_offsets */ \
- + 1 /* .debug_macro or .debug_macinfo */ \
- + 1 /* trailing zero */)
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, " offset %s, dwo_id %s\n",
+ sect_offset_str (sect_off),
+ hex_string (dwo_unit->signature));
+}
- memset (§ions, 0, sizeof (sections));
+/* Create the dwo_units for the CUs in a DWO_FILE.
+ Note: This function processes DWO files only, not DWP files. */
- for (i = 0; i < MAX_NR_V1_DWO_SECTIONS; ++i)
- {
- asection *sectp;
- uint32_t section_nr =
- read_4_bytes (dbfd,
- dwp_htab->section_pool.v1.indices
- + (unit_index + i) * sizeof (uint32_t));
+static void
+create_cus_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwo_file &dwo_file, dwarf2_section_info §ion,
+ htab_t &cus_htab)
+{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ const gdb_byte *info_ptr, *end_ptr;
- if (section_nr == 0)
- break;
- if (section_nr >= dwp_file->num_sections)
- {
- error (_("Dwarf Error: bad DWP hash table, section number too large"
- " [in module %s]"),
- dwp_file->name);
- }
+ dwarf2_read_section (objfile, §ion);
+ info_ptr = section.buffer;
- sectp = dwp_file->elf_sections[section_nr];
- if (! locate_v1_virtual_dwo_sections (sectp, §ions))
- {
- error (_("Dwarf Error: bad DWP hash table, invalid section found"
- " [in module %s]"),
- dwp_file->name);
- }
- }
+ if (info_ptr == NULL)
+ return;
- if (i < 2
- || dwarf2_section_empty_p (§ions.info_or_types)
- || dwarf2_section_empty_p (§ions.abbrev))
+ if (dwarf_read_debug)
{
- error (_("Dwarf Error: bad DWP hash table, missing DWO sections"
- " [in module %s]"),
- dwp_file->name);
+ fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n",
+ get_section_name (§ion),
+ get_section_file_name (§ion));
}
- if (i == MAX_NR_V1_DWO_SECTIONS)
+
+ end_ptr = info_ptr + section.size;
+ while (info_ptr < end_ptr)
{
- error (_("Dwarf Error: bad DWP hash table, too many DWO sections"
- " [in module %s]"),
- dwp_file->name);
- }
+ struct dwarf2_per_cu_data per_cu;
+ struct create_dwo_cu_data create_dwo_cu_data;
+ struct dwo_unit *dwo_unit;
+ void **slot;
+ sect_offset sect_off = (sect_offset) (info_ptr - section.buffer);
- /* It's easier for the rest of the code if we fake a struct dwo_file and
- have dwo_unit "live" in that. At least for now.
+ memset (&create_dwo_cu_data.dwo_unit, 0,
+ sizeof (create_dwo_cu_data.dwo_unit));
+ memset (&per_cu, 0, sizeof (per_cu));
+ per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
+ per_cu.is_debug_types = 0;
+ per_cu.sect_off = sect_offset (info_ptr - section.buffer);
+ per_cu.section = §ion;
+ create_dwo_cu_data.dwo_file = &dwo_file;
- The DWP file can be made up of a random collection of CUs and TUs.
- However, for each CU + set of TUs that came from the same original DWO
- file, we can combine them back into a virtual DWO file to save space
- (fewer struct dwo_file objects to allocate). Remember that for really
- large apps there can be on the order of 8K CUs and 200K TUs, or more. */
+ init_cutu_and_read_dies_no_follow (
+ &per_cu, &dwo_file, create_dwo_cu_reader, &create_dwo_cu_data);
+ info_ptr += per_cu.length;
- std::string virtual_dwo_name =
- string_printf ("virtual-dwo/%d-%d-%d-%d",
- get_section_id (§ions.abbrev),
- get_section_id (§ions.line),
- get_section_id (§ions.loc),
- get_section_id (§ions.str_offsets));
- /* Can we use an existing virtual DWO file? */
- dwo_file_slot = lookup_dwo_file_slot (virtual_dwo_name.c_str (), comp_dir);
- /* Create one if necessary. */
- if (*dwo_file_slot == NULL)
- {
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Creating virtual DWO: %s\n",
- virtual_dwo_name.c_str ());
- }
- dwo_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_file);
- dwo_file->dwo_name
- = (const char *) obstack_copy0 (&objfile->objfile_obstack,
- virtual_dwo_name.c_str (),
- virtual_dwo_name.size ());
- dwo_file->comp_dir = comp_dir;
- dwo_file->sections.abbrev = sections.abbrev;
- dwo_file->sections.line = sections.line;
- dwo_file->sections.loc = sections.loc;
- dwo_file->sections.macinfo = sections.macinfo;
- dwo_file->sections.macro = sections.macro;
- dwo_file->sections.str_offsets = sections.str_offsets;
- /* The "str" section is global to the entire DWP file. */
- dwo_file->sections.str = dwp_file->sections.str;
- /* The info or types section is assigned below to dwo_unit,
- there's no need to record it in dwo_file.
- Also, we can't simply record type sections in dwo_file because
- we record a pointer into the vector in dwo_unit. As we collect more
- types we'll grow the vector and eventually have to reallocate space
- for it, invalidating all copies of pointers into the previous
- contents. */
- *dwo_file_slot = dwo_file;
- }
- else
- {
- if (dwarf_read_debug)
+ // If the unit could not be parsed, skip it.
+ if (create_dwo_cu_data.dwo_unit.dwo_file == NULL)
+ continue;
+
+ if (cus_htab == NULL)
+ cus_htab = allocate_dwo_unit_table (objfile);
+
+ dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
+ *dwo_unit = create_dwo_cu_data.dwo_unit;
+ slot = htab_find_slot (cus_htab, dwo_unit, INSERT);
+ gdb_assert (slot != NULL);
+ if (*slot != NULL)
{
- fprintf_unfiltered (gdb_stdlog, "Using existing virtual DWO: %s\n",
- virtual_dwo_name.c_str ());
+ const struct dwo_unit *dup_cu = (const struct dwo_unit *)*slot;
+ sect_offset dup_sect_off = dup_cu->sect_off;
+
+ complaint (_("debug cu entry at offset %s is duplicate to"
+ " the entry at offset %s, signature %s"),
+ sect_offset_str (sect_off), sect_offset_str (dup_sect_off),
+ hex_string (dwo_unit->signature));
}
- dwo_file = (struct dwo_file *) *dwo_file_slot;
+ *slot = (void *)dwo_unit;
}
-
- dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
- dwo_unit->dwo_file = dwo_file;
- dwo_unit->signature = signature;
- dwo_unit->section =
- XOBNEW (&objfile->objfile_obstack, struct dwarf2_section_info);
- *dwo_unit->section = sections.info_or_types;
- /* dwo_unit->{offset,length,type_offset_in_tu} are set later. */
-
- return dwo_unit;
}
-/* Subroutine of create_dwo_unit_in_dwp_v2 to simplify it.
- Given a pointer to the containing section SECTION, and OFFSET,SIZE of the
- piece within that section used by a TU/CU, return a virtual section
- of just that piece. */
+/* DWP file .debug_{cu,tu}_index section format:
+ [ref: http://gcc.gnu.org/wiki/DebugFissionDWP]
-static struct dwarf2_section_info
-create_dwp_v2_section (struct dwarf2_section_info *section,
- bfd_size_type offset, bfd_size_type size)
-{
- struct dwarf2_section_info result;
- asection *sectp;
+ DWP Version 1:
- gdb_assert (section != NULL);
- gdb_assert (!section->is_virtual);
+ Both index sections have the same format, and serve to map a 64-bit
+ signature to a set of section numbers. Each section begins with a header,
+ followed by a hash table of 64-bit signatures, a parallel table of 32-bit
+ indexes, and a pool of 32-bit section numbers. The index sections will be
+ aligned at 8-byte boundaries in the file.
- memset (&result, 0, sizeof (result));
- result.s.containing_section = section;
- result.is_virtual = 1;
+ The index section header consists of:
- if (size == 0)
- return result;
+ V, 32 bit version number
+ -, 32 bits unused
+ N, 32 bit number of compilation units or type units in the index
+ M, 32 bit number of slots in the hash table
- sectp = get_section_bfd_section (section);
+ Numbers are recorded using the byte order of the application binary.
- /* Flag an error if the piece denoted by OFFSET,SIZE is outside the
- bounds of the real section. This is a pretty-rare event, so just
- flag an error (easier) instead of a warning and trying to cope. */
- if (sectp == NULL
- || offset + size > bfd_get_section_size (sectp))
- {
- error (_("Dwarf Error: Bad DWP V2 section info, doesn't fit"
- " in section %s [in module %s]"),
- sectp ? bfd_section_name (abfd, sectp) : "<unknown>",
- objfile_name (dwarf2_per_objfile->objfile));
- }
+ The hash table begins at offset 16 in the section, and consists of an array
+ of M 64-bit slots. Each slot contains a 64-bit signature (using the byte
+ order of the application binary). Unused slots in the hash table are 0.
+ (We rely on the extreme unlikeliness of a signature being exactly 0.)
- result.virtual_offset = offset;
- result.size = size;
- return result;
-}
+ The parallel table begins immediately after the hash table
+ (at offset 16 + 8 * M from the beginning of the section), and consists of an
+ array of 32-bit indexes (using the byte order of the application binary),
+ corresponding 1-1 with slots in the hash table. Each entry in the parallel
+ table contains a 32-bit index into the pool of section numbers. For unused
+ hash table slots, the corresponding entry in the parallel table will be 0.
-/* Create a dwo_unit object for the DWO unit with signature SIGNATURE.
- UNIT_INDEX is the index of the DWO unit in the DWP hash table.
- COMP_DIR is the DW_AT_comp_dir attribute of the referencing CU.
- This is for DWP version 2 files. */
+ The pool of section numbers begins immediately following the hash table
+ (at offset 16 + 12 * M from the beginning of the section). The pool of
+ section numbers consists of an array of 32-bit words (using the byte order
+ of the application binary). Each item in the array is indexed starting
+ from 0. The hash table entry provides the index of the first section
+ number in the set. Additional section numbers in the set follow, and the
+ set is terminated by a 0 entry (section number 0 is not used in ELF).
-static struct dwo_unit *
-create_dwo_unit_in_dwp_v2 (struct dwp_file *dwp_file,
- uint32_t unit_index,
- const char *comp_dir,
- ULONGEST signature, int is_debug_types)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- const struct dwp_hash_table *dwp_htab =
- is_debug_types ? dwp_file->tus : dwp_file->cus;
- bfd *dbfd = dwp_file->dbfd;
- const char *kind = is_debug_types ? "TU" : "CU";
- struct dwo_file *dwo_file;
- struct dwo_unit *dwo_unit;
- struct virtual_v2_dwo_sections sections;
- void **dwo_file_slot;
- int i;
+ In each set of section numbers, the .debug_info.dwo or .debug_types.dwo
+ section must be the first entry in the set, and the .debug_abbrev.dwo must
+ be the second entry. Other members of the set may follow in any order.
- gdb_assert (dwp_file->version == 2);
+ ---
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Reading %s %s/%s in DWP V2 file: %s\n",
- kind,
- pulongest (unit_index), hex_string (signature),
- dwp_file->name);
- }
+ DWP Version 2:
- /* Fetch the section offsets of this DWO unit. */
+ DWP Version 2 combines all the .debug_info, etc. sections into one,
+ and the entries in the index tables are now offsets into these sections.
+ CU offsets begin at 0. TU offsets begin at the size of the .debug_info
+ section.
- memset (§ions, 0, sizeof (sections));
+ Index Section Contents:
+ Header
+ Hash Table of Signatures dwp_hash_table.hash_table
+ Parallel Table of Indices dwp_hash_table.unit_table
+ Table of Section Offsets dwp_hash_table.v2.{section_ids,offsets}
+ Table of Section Sizes dwp_hash_table.v2.sizes
- for (i = 0; i < dwp_htab->nr_columns; ++i)
- {
- uint32_t offset = read_4_bytes (dbfd,
- dwp_htab->section_pool.v2.offsets
- + (((unit_index - 1) * dwp_htab->nr_columns
- + i)
- * sizeof (uint32_t)));
- uint32_t size = read_4_bytes (dbfd,
- dwp_htab->section_pool.v2.sizes
- + (((unit_index - 1) * dwp_htab->nr_columns
- + i)
- * sizeof (uint32_t)));
+ The index section header consists of:
- switch (dwp_htab->section_pool.v2.section_ids[i])
- {
- case DW_SECT_INFO:
- case DW_SECT_TYPES:
- sections.info_or_types_offset = offset;
- sections.info_or_types_size = size;
- break;
- case DW_SECT_ABBREV:
- sections.abbrev_offset = offset;
- sections.abbrev_size = size;
- break;
- case DW_SECT_LINE:
- sections.line_offset = offset;
- sections.line_size = size;
- break;
- case DW_SECT_LOC:
- sections.loc_offset = offset;
- sections.loc_size = size;
- break;
- case DW_SECT_STR_OFFSETS:
- sections.str_offsets_offset = offset;
- sections.str_offsets_size = size;
- break;
- case DW_SECT_MACINFO:
- sections.macinfo_offset = offset;
- sections.macinfo_size = size;
- break;
- case DW_SECT_MACRO:
- sections.macro_offset = offset;
- sections.macro_size = size;
- break;
- }
- }
+ V, 32 bit version number
+ L, 32 bit number of columns in the table of section offsets
+ N, 32 bit number of compilation units or type units in the index
+ M, 32 bit number of slots in the hash table
- /* It's easier for the rest of the code if we fake a struct dwo_file and
- have dwo_unit "live" in that. At least for now.
+ Numbers are recorded using the byte order of the application binary.
- The DWP file can be made up of a random collection of CUs and TUs.
- However, for each CU + set of TUs that came from the same original DWO
- file, we can combine them back into a virtual DWO file to save space
- (fewer struct dwo_file objects to allocate). Remember that for really
- large apps there can be on the order of 8K CUs and 200K TUs, or more. */
+ The hash table has the same format as version 1.
+ The parallel table of indices has the same format as version 1,
+ except that the entries are origin-1 indices into the table of sections
+ offsets and the table of section sizes.
- std::string virtual_dwo_name =
- string_printf ("virtual-dwo/%ld-%ld-%ld-%ld",
- (long) (sections.abbrev_size ? sections.abbrev_offset : 0),
- (long) (sections.line_size ? sections.line_offset : 0),
- (long) (sections.loc_size ? sections.loc_offset : 0),
- (long) (sections.str_offsets_size
- ? sections.str_offsets_offset : 0));
- /* Can we use an existing virtual DWO file? */
- dwo_file_slot = lookup_dwo_file_slot (virtual_dwo_name.c_str (), comp_dir);
- /* Create one if necessary. */
- if (*dwo_file_slot == NULL)
- {
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Creating virtual DWO: %s\n",
- virtual_dwo_name.c_str ());
- }
- dwo_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_file);
- dwo_file->dwo_name
- = (const char *) obstack_copy0 (&objfile->objfile_obstack,
- virtual_dwo_name.c_str (),
- virtual_dwo_name.size ());
- dwo_file->comp_dir = comp_dir;
- dwo_file->sections.abbrev =
- create_dwp_v2_section (&dwp_file->sections.abbrev,
- sections.abbrev_offset, sections.abbrev_size);
- dwo_file->sections.line =
- create_dwp_v2_section (&dwp_file->sections.line,
- sections.line_offset, sections.line_size);
- dwo_file->sections.loc =
- create_dwp_v2_section (&dwp_file->sections.loc,
- sections.loc_offset, sections.loc_size);
- dwo_file->sections.macinfo =
- create_dwp_v2_section (&dwp_file->sections.macinfo,
- sections.macinfo_offset, sections.macinfo_size);
- dwo_file->sections.macro =
- create_dwp_v2_section (&dwp_file->sections.macro,
- sections.macro_offset, sections.macro_size);
- dwo_file->sections.str_offsets =
- create_dwp_v2_section (&dwp_file->sections.str_offsets,
- sections.str_offsets_offset,
- sections.str_offsets_size);
- /* The "str" section is global to the entire DWP file. */
- dwo_file->sections.str = dwp_file->sections.str;
- /* The info or types section is assigned below to dwo_unit,
- there's no need to record it in dwo_file.
- Also, we can't simply record type sections in dwo_file because
- we record a pointer into the vector in dwo_unit. As we collect more
- types we'll grow the vector and eventually have to reallocate space
- for it, invalidating all copies of pointers into the previous
- contents. */
- *dwo_file_slot = dwo_file;
- }
- else
- {
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Using existing virtual DWO: %s\n",
- virtual_dwo_name.c_str ());
- }
- dwo_file = (struct dwo_file *) *dwo_file_slot;
- }
+ The table of offsets begins immediately following the parallel table
+ (at offset 16 + 12 * M from the beginning of the section). The table is
+ a two-dimensional array of 32-bit words (using the byte order of the
+ application binary), with L columns and N+1 rows, in row-major order.
+ Each row in the array is indexed starting from 0. The first row provides
+ a key to the remaining rows: each column in this row provides an identifier
+ for a debug section, and the offsets in the same column of subsequent rows
+ refer to that section. The section identifiers are:
- dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
- dwo_unit->dwo_file = dwo_file;
- dwo_unit->signature = signature;
- dwo_unit->section =
- XOBNEW (&objfile->objfile_obstack, struct dwarf2_section_info);
- *dwo_unit->section = create_dwp_v2_section (is_debug_types
- ? &dwp_file->sections.types
- : &dwp_file->sections.info,
- sections.info_or_types_offset,
- sections.info_or_types_size);
- /* dwo_unit->{offset,length,type_offset_in_tu} are set later. */
+ DW_SECT_INFO 1 .debug_info.dwo
+ DW_SECT_TYPES 2 .debug_types.dwo
+ DW_SECT_ABBREV 3 .debug_abbrev.dwo
+ DW_SECT_LINE 4 .debug_line.dwo
+ DW_SECT_LOC 5 .debug_loc.dwo
+ DW_SECT_STR_OFFSETS 6 .debug_str_offsets.dwo
+ DW_SECT_MACINFO 7 .debug_macinfo.dwo
+ DW_SECT_MACRO 8 .debug_macro.dwo
- return dwo_unit;
-}
+ The offsets provided by the CU and TU index sections are the base offsets
+ for the contributions made by each CU or TU to the corresponding section
+ in the package file. Each CU and TU header contains an abbrev_offset
+ field, used to find the abbreviations table for that CU or TU within the
+ contribution to the .debug_abbrev.dwo section for that CU or TU, and should
+ be interpreted as relative to the base offset given in the index section.
+ Likewise, offsets into .debug_line.dwo from DW_AT_stmt_list attributes
+ should be interpreted as relative to the base offset for .debug_line.dwo,
+ and offsets into other debug sections obtained from DWARF attributes should
+ also be interpreted as relative to the corresponding base offset.
-/* Lookup the DWO unit with SIGNATURE in DWP_FILE.
- Returns NULL if the signature isn't found. */
+ The table of sizes begins immediately following the table of offsets.
+ Like the table of offsets, it is a two-dimensional array of 32-bit words,
+ with L columns and N rows, in row-major order. Each row in the array is
+ indexed starting from 1 (row 0 is shared by the two tables).
-static struct dwo_unit *
-lookup_dwo_unit_in_dwp (struct dwp_file *dwp_file, const char *comp_dir,
- ULONGEST signature, int is_debug_types)
-{
- const struct dwp_hash_table *dwp_htab =
- is_debug_types ? dwp_file->tus : dwp_file->cus;
- bfd *dbfd = dwp_file->dbfd;
- uint32_t mask = dwp_htab->nr_slots - 1;
- uint32_t hash = signature & mask;
- uint32_t hash2 = ((signature >> 32) & mask) | 1;
- unsigned int i;
- void **slot;
- struct dwo_unit find_dwo_cu;
+ ---
- memset (&find_dwo_cu, 0, sizeof (find_dwo_cu));
- find_dwo_cu.signature = signature;
- slot = htab_find_slot (is_debug_types
- ? dwp_file->loaded_tus
- : dwp_file->loaded_cus,
- &find_dwo_cu, INSERT);
+ Hash table lookup is handled the same in version 1 and 2:
- if (*slot != NULL)
- return (struct dwo_unit *) *slot;
+ We assume that N and M will not exceed 2^32 - 1.
+ The size of the hash table, M, must be 2^k such that 2^k > 3*N/2.
- /* Use a for loop so that we don't loop forever on bad debug info. */
- for (i = 0; i < dwp_htab->nr_slots; ++i)
- {
- ULONGEST signature_in_table;
+ Given a 64-bit compilation unit signature or a type signature S, an entry
+ in the hash table is located as follows:
- signature_in_table =
- read_8_bytes (dbfd, dwp_htab->hash_table + hash * sizeof (uint64_t));
- if (signature_in_table == signature)
- {
- uint32_t unit_index =
- read_4_bytes (dbfd,
- dwp_htab->unit_table + hash * sizeof (uint32_t));
+ 1) Calculate a primary hash H = S & MASK(k), where MASK(k) is a mask with
+ the low-order k bits all set to 1.
- if (dwp_file->version == 1)
- {
- *slot = create_dwo_unit_in_dwp_v1 (dwp_file, unit_index,
- comp_dir, signature,
- is_debug_types);
- }
- else
- {
- *slot = create_dwo_unit_in_dwp_v2 (dwp_file, unit_index,
- comp_dir, signature,
- is_debug_types);
- }
- return (struct dwo_unit *) *slot;
- }
- if (signature_in_table == 0)
- return NULL;
- hash = (hash + hash2) & mask;
- }
+ 2) Calculate a secondary hash H' = (((S >> 32) & MASK(k)) | 1).
- error (_("Dwarf Error: bad DWP hash table, lookup didn't terminate"
- " [in module %s]"),
- dwp_file->name);
-}
+ 3) If the hash table entry at index H matches the signature, use that
+ entry. If the hash table entry at index H is unused (all zeroes),
+ terminate the search: the signature is not present in the table.
-/* Subroutine of open_dwo_file,open_dwp_file to simplify them.
- Open the file specified by FILE_NAME and hand it off to BFD for
- preliminary analysis. Return a newly initialized bfd *, which
- includes a canonicalized copy of FILE_NAME.
- If IS_DWP is TRUE, we're opening a DWP file, otherwise a DWO file.
- SEARCH_CWD is true if the current directory is to be searched.
- It will be searched before debug-file-directory.
- If successful, the file is added to the bfd include table of the
- objfile's bfd (see gdb_bfd_record_inclusion).
- If unable to find/open the file, return NULL.
- NOTE: This function is derived from symfile_bfd_open. */
+ 4) Let H = (H + H') modulo M. Repeat at Step 3.
-static gdb_bfd_ref_ptr
-try_open_dwop_file (const char *file_name, int is_dwp, int search_cwd)
+ Because M > N and H' and M are relatively prime, the search is guaranteed
+ to stop at an unused slot or find the match. */
+
+/* Create a hash table to map DWO IDs to their CU/TU entry in
+ .debug_{info,types}.dwo in DWP_FILE.
+ Returns NULL if there isn't one.
+ Note: This function processes DWP files only, not DWO files. */
+
+static struct dwp_hash_table *
+create_dwp_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwp_file *dwp_file, int is_debug_types)
{
- int desc, flags;
- char *absolute_name;
- /* Blech. OPF_TRY_CWD_FIRST also disables searching the path list if
- FILE_NAME contains a '/'. So we can't use it. Instead prepend "."
- to debug_file_directory. */
- char *search_path;
- static const char dirname_separator_string[] = { DIRNAME_SEPARATOR, '\0' };
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *dbfd = dwp_file->dbfd.get ();
+ const gdb_byte *index_ptr, *index_end;
+ struct dwarf2_section_info *index;
+ uint32_t version, nr_columns, nr_units, nr_slots;
+ struct dwp_hash_table *htab;
- if (search_cwd)
- {
- if (*debug_file_directory != '\0')
- search_path = concat (".", dirname_separator_string,
- debug_file_directory, (char *) NULL);
- else
- search_path = xstrdup (".");
- }
+ if (is_debug_types)
+ index = &dwp_file->sections.tu_index;
else
- search_path = xstrdup (debug_file_directory);
+ index = &dwp_file->sections.cu_index;
- flags = OPF_RETURN_REALPATH;
- if (is_dwp)
- flags |= OPF_SEARCH_IN_PATH;
- desc = openp (search_path, flags, file_name,
- O_RDONLY | O_BINARY, &absolute_name);
- xfree (search_path);
- if (desc < 0)
+ if (dwarf2_section_empty_p (index))
return NULL;
+ dwarf2_read_section (objfile, index);
- gdb_bfd_ref_ptr sym_bfd (gdb_bfd_open (absolute_name, gnutarget, desc));
- xfree (absolute_name);
- if (sym_bfd == NULL)
- return NULL;
- bfd_set_cacheable (sym_bfd.get (), 1);
+ index_ptr = index->buffer;
+ index_end = index_ptr + index->size;
- if (!bfd_check_format (sym_bfd.get (), bfd_object))
- return NULL;
+ version = read_4_bytes (dbfd, index_ptr);
+ index_ptr += 4;
+ if (version == 2)
+ nr_columns = read_4_bytes (dbfd, index_ptr);
+ else
+ nr_columns = 0;
+ index_ptr += 4;
+ nr_units = read_4_bytes (dbfd, index_ptr);
+ index_ptr += 4;
+ nr_slots = read_4_bytes (dbfd, index_ptr);
+ index_ptr += 4;
- /* Success. Record the bfd as having been included by the objfile's bfd.
- This is important because things like demangled_names_hash lives in the
- objfile's per_bfd space and may have references to things like symbol
- names that live in the DWO/DWP file's per_bfd space. PR 16426. */
- gdb_bfd_record_inclusion (dwarf2_per_objfile->objfile->obfd, sym_bfd.get ());
+ if (version != 1 && version != 2)
+ {
+ error (_("Dwarf Error: unsupported DWP file version (%s)"
+ " [in module %s]"),
+ pulongest (version), dwp_file->name);
+ }
+ if (nr_slots != (nr_slots & -nr_slots))
+ {
+ error (_("Dwarf Error: number of slots in DWP hash table (%s)"
+ " is not power of 2 [in module %s]"),
+ pulongest (nr_slots), dwp_file->name);
+ }
- return sym_bfd;
-}
+ htab = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwp_hash_table);
+ htab->version = version;
+ htab->nr_columns = nr_columns;
+ htab->nr_units = nr_units;
+ htab->nr_slots = nr_slots;
+ htab->hash_table = index_ptr;
+ htab->unit_table = htab->hash_table + sizeof (uint64_t) * nr_slots;
-/* Try to open DWO file FILE_NAME.
- COMP_DIR is the DW_AT_comp_dir attribute.
- The result is the bfd handle of the file.
- If there is a problem finding or opening the file, return NULL.
- Upon success, the canonicalized path of the file is stored in the bfd,
- same as symfile_bfd_open. */
-
-static gdb_bfd_ref_ptr
-open_dwo_file (const char *file_name, const char *comp_dir)
-{
- if (IS_ABSOLUTE_PATH (file_name))
- return try_open_dwop_file (file_name, 0 /*is_dwp*/, 0 /*search_cwd*/);
-
- /* Before trying the search path, try DWO_NAME in COMP_DIR. */
-
- if (comp_dir != NULL)
+ /* Exit early if the table is empty. */
+ if (nr_slots == 0 || nr_units == 0
+ || (version == 2 && nr_columns == 0))
{
- char *path_to_try = concat (comp_dir, SLASH_STRING,
- file_name, (char *) NULL);
+ /* All must be zero. */
+ if (nr_slots != 0 || nr_units != 0
+ || (version == 2 && nr_columns != 0))
+ {
+ complaint (_("Empty DWP but nr_slots,nr_units,nr_columns not"
+ " all zero [in modules %s]"),
+ dwp_file->name);
+ }
+ return htab;
+ }
- /* NOTE: If comp_dir is a relative path, this will also try the
- search path, which seems useful. */
- gdb_bfd_ref_ptr abfd (try_open_dwop_file (path_to_try, 0 /*is_dwp*/,
- 1 /*search_cwd*/));
- xfree (path_to_try);
- if (abfd != NULL)
- return abfd;
+ if (version == 1)
+ {
+ htab->section_pool.v1.indices =
+ htab->unit_table + sizeof (uint32_t) * nr_slots;
+ /* It's harder to decide whether the section is too small in v1.
+ V1 is deprecated anyway so we punt. */
}
+ else
+ {
+ const gdb_byte *ids_ptr = htab->unit_table + sizeof (uint32_t) * nr_slots;
+ int *ids = htab->section_pool.v2.section_ids;
+ /* Reverse map for error checking. */
+ int ids_seen[DW_SECT_MAX + 1];
+ int i;
- /* That didn't work, try debug-file-directory, which, despite its name,
- is a list of paths. */
+ if (nr_columns < 2)
+ {
+ error (_("Dwarf Error: bad DWP hash table, too few columns"
+ " in section table [in module %s]"),
+ dwp_file->name);
+ }
+ if (nr_columns > MAX_NR_V2_DWO_SECTIONS)
+ {
+ error (_("Dwarf Error: bad DWP hash table, too many columns"
+ " in section table [in module %s]"),
+ dwp_file->name);
+ }
+ memset (ids, 255, (DW_SECT_MAX + 1) * sizeof (int32_t));
+ memset (ids_seen, 255, (DW_SECT_MAX + 1) * sizeof (int32_t));
+ for (i = 0; i < nr_columns; ++i)
+ {
+ int id = read_4_bytes (dbfd, ids_ptr + i * sizeof (uint32_t));
- if (*debug_file_directory == '\0')
- return NULL;
+ if (id < DW_SECT_MIN || id > DW_SECT_MAX)
+ {
+ error (_("Dwarf Error: bad DWP hash table, bad section id %d"
+ " in section table [in module %s]"),
+ id, dwp_file->name);
+ }
+ if (ids_seen[id] != -1)
+ {
+ error (_("Dwarf Error: bad DWP hash table, duplicate section"
+ " id %d in section table [in module %s]"),
+ id, dwp_file->name);
+ }
+ ids_seen[id] = i;
+ ids[i] = id;
+ }
+ /* Must have exactly one info or types section. */
+ if (((ids_seen[DW_SECT_INFO] != -1)
+ + (ids_seen[DW_SECT_TYPES] != -1))
+ != 1)
+ {
+ error (_("Dwarf Error: bad DWP hash table, missing/duplicate"
+ " DWO info/types section [in module %s]"),
+ dwp_file->name);
+ }
+ /* Must have an abbrev section. */
+ if (ids_seen[DW_SECT_ABBREV] == -1)
+ {
+ error (_("Dwarf Error: bad DWP hash table, missing DWO abbrev"
+ " section [in module %s]"),
+ dwp_file->name);
+ }
+ htab->section_pool.v2.offsets = ids_ptr + sizeof (uint32_t) * nr_columns;
+ htab->section_pool.v2.sizes =
+ htab->section_pool.v2.offsets + (sizeof (uint32_t)
+ * nr_units * nr_columns);
+ if ((htab->section_pool.v2.sizes + (sizeof (uint32_t)
+ * nr_units * nr_columns))
+ > index_end)
+ {
+ error (_("Dwarf Error: DWP index section is corrupt (too small)"
+ " [in module %s]"),
+ dwp_file->name);
+ }
+ }
- return try_open_dwop_file (file_name, 0 /*is_dwp*/, 1 /*search_cwd*/);
+ return htab;
}
-/* This function is mapped across the sections and remembers the offset and
- size of each of the DWO debugging sections we are interested in. */
+/* Update SECTIONS with the data from SECTP.
-static void
-dwarf2_locate_dwo_sections (bfd *abfd, asection *sectp, void *dwo_sections_ptr)
+ This function is like the other "locate" section routines that are
+ passed to bfd_map_over_sections, but in this context the sections to
+ read comes from the DWP V1 hash table, not the full ELF section table.
+
+ The result is non-zero for success, or zero if an error was found. */
+
+static int
+locate_v1_virtual_dwo_sections (asection *sectp,
+ struct virtual_v1_dwo_sections *sections)
{
- struct dwo_sections *dwo_sections = (struct dwo_sections *) dwo_sections_ptr;
const struct dwop_section_names *names = &dwop_section_names;
if (section_is_p (sectp->name, &names->abbrev_dwo))
{
- dwo_sections->abbrev.s.section = sectp;
- dwo_sections->abbrev.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->abbrev.s.section != NULL)
+ return 0;
+ sections->abbrev.s.section = sectp;
+ sections->abbrev.size = bfd_get_section_size (sectp);
}
- else if (section_is_p (sectp->name, &names->info_dwo))
+ else if (section_is_p (sectp->name, &names->info_dwo)
+ || section_is_p (sectp->name, &names->types_dwo))
{
- dwo_sections->info.s.section = sectp;
- dwo_sections->info.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->info_or_types.s.section != NULL)
+ return 0;
+ sections->info_or_types.s.section = sectp;
+ sections->info_or_types.size = bfd_get_section_size (sectp);
}
else if (section_is_p (sectp->name, &names->line_dwo))
{
- dwo_sections->line.s.section = sectp;
- dwo_sections->line.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->line.s.section != NULL)
+ return 0;
+ sections->line.s.section = sectp;
+ sections->line.size = bfd_get_section_size (sectp);
}
else if (section_is_p (sectp->name, &names->loc_dwo))
{
- dwo_sections->loc.s.section = sectp;
- dwo_sections->loc.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->loc.s.section != NULL)
+ return 0;
+ sections->loc.s.section = sectp;
+ sections->loc.size = bfd_get_section_size (sectp);
}
else if (section_is_p (sectp->name, &names->macinfo_dwo))
{
- dwo_sections->macinfo.s.section = sectp;
- dwo_sections->macinfo.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->macinfo.s.section != NULL)
+ return 0;
+ sections->macinfo.s.section = sectp;
+ sections->macinfo.size = bfd_get_section_size (sectp);
}
else if (section_is_p (sectp->name, &names->macro_dwo))
{
- dwo_sections->macro.s.section = sectp;
- dwo_sections->macro.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->str_dwo))
- {
- dwo_sections->str.s.section = sectp;
- dwo_sections->str.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->macro.s.section != NULL)
+ return 0;
+ sections->macro.s.section = sectp;
+ sections->macro.size = bfd_get_section_size (sectp);
}
else if (section_is_p (sectp->name, &names->str_offsets_dwo))
{
- dwo_sections->str_offsets.s.section = sectp;
- dwo_sections->str_offsets.size = bfd_get_section_size (sectp);
+ /* There can be only one. */
+ if (sections->str_offsets.s.section != NULL)
+ return 0;
+ sections->str_offsets.s.section = sectp;
+ sections->str_offsets.size = bfd_get_section_size (sectp);
}
- else if (section_is_p (sectp->name, &names->types_dwo))
+ else
{
- struct dwarf2_section_info type_section;
-
- memset (&type_section, 0, sizeof (type_section));
- type_section.s.section = sectp;
- type_section.size = bfd_get_section_size (sectp);
- VEC_safe_push (dwarf2_section_info_def, dwo_sections->types,
- &type_section);
+ /* No other kind of section is valid. */
+ return 0;
}
+
+ return 1;
}
-/* Initialize the use of the DWO file specified by DWO_NAME and referenced
- by PER_CU. This is for the non-DWP case.
- The result is NULL if DWO_NAME can't be found. */
+/* Create a dwo_unit object for the DWO unit with signature SIGNATURE.
+ UNIT_INDEX is the index of the DWO unit in the DWP hash table.
+ COMP_DIR is the DW_AT_comp_dir attribute of the referencing CU.
+ This is for DWP version 1 files. */
-static struct dwo_file *
-open_and_init_dwo_file (struct dwarf2_per_cu_data *per_cu,
- const char *dwo_name, const char *comp_dir)
+static struct dwo_unit *
+create_dwo_unit_in_dwp_v1 (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwp_file *dwp_file,
+ uint32_t unit_index,
+ const char *comp_dir,
+ ULONGEST signature, int is_debug_types)
{
struct objfile *objfile = dwarf2_per_objfile->objfile;
+ const struct dwp_hash_table *dwp_htab =
+ is_debug_types ? dwp_file->tus : dwp_file->cus;
+ bfd *dbfd = dwp_file->dbfd.get ();
+ const char *kind = is_debug_types ? "TU" : "CU";
struct dwo_file *dwo_file;
- struct cleanup *cleanups;
+ struct dwo_unit *dwo_unit;
+ struct virtual_v1_dwo_sections sections;
+ void **dwo_file_slot;
+ int i;
- gdb_bfd_ref_ptr dbfd (open_dwo_file (dwo_name, comp_dir));
- if (dbfd == NULL)
+ gdb_assert (dwp_file->version == 1);
+
+ if (dwarf_read_debug)
{
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "DWO file not found: %s\n", dwo_name);
- return NULL;
+ fprintf_unfiltered (gdb_stdlog, "Reading %s %s/%s in DWP V1 file: %s\n",
+ kind,
+ pulongest (unit_index), hex_string (signature),
+ dwp_file->name);
}
- dwo_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_file);
- dwo_file->dwo_name = dwo_name;
- dwo_file->comp_dir = comp_dir;
- dwo_file->dbfd = dbfd.release ();
-
- cleanups = make_cleanup (free_dwo_file_cleanup, dwo_file);
-
- bfd_map_over_sections (dwo_file->dbfd, dwarf2_locate_dwo_sections,
- &dwo_file->sections);
- create_cus_hash_table (*dwo_file, dwo_file->sections.info, dwo_file->cus);
-
- create_debug_types_hash_table (dwo_file, dwo_file->sections.types,
- dwo_file->tus);
+ /* Fetch the sections of this DWO unit.
+ Put a limit on the number of sections we look for so that bad data
+ doesn't cause us to loop forever. */
- discard_cleanups (cleanups);
+#define MAX_NR_V1_DWO_SECTIONS \
+ (1 /* .debug_info or .debug_types */ \
+ + 1 /* .debug_abbrev */ \
+ + 1 /* .debug_line */ \
+ + 1 /* .debug_loc */ \
+ + 1 /* .debug_str_offsets */ \
+ + 1 /* .debug_macro or .debug_macinfo */ \
+ + 1 /* trailing zero */)
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "DWO file found: %s\n", dwo_name);
+ memset (§ions, 0, sizeof (sections));
- return dwo_file;
-}
+ for (i = 0; i < MAX_NR_V1_DWO_SECTIONS; ++i)
+ {
+ asection *sectp;
+ uint32_t section_nr =
+ read_4_bytes (dbfd,
+ dwp_htab->section_pool.v1.indices
+ + (unit_index + i) * sizeof (uint32_t));
-/* This function is mapped across the sections and remembers the offset and
- size of each of the DWP debugging sections common to version 1 and 2 that
- we are interested in. */
-
-static void
-dwarf2_locate_common_dwp_sections (bfd *abfd, asection *sectp,
- void *dwp_file_ptr)
-{
- struct dwp_file *dwp_file = (struct dwp_file *) dwp_file_ptr;
- const struct dwop_section_names *names = &dwop_section_names;
- unsigned int elf_section_nr = elf_section_data (sectp)->this_idx;
-
- /* Record the ELF section number for later lookup: this is what the
- .debug_cu_index,.debug_tu_index tables use in DWP V1. */
- gdb_assert (elf_section_nr < dwp_file->num_sections);
- dwp_file->elf_sections[elf_section_nr] = sectp;
+ if (section_nr == 0)
+ break;
+ if (section_nr >= dwp_file->num_sections)
+ {
+ error (_("Dwarf Error: bad DWP hash table, section number too large"
+ " [in module %s]"),
+ dwp_file->name);
+ }
- /* Look for specific sections that we need. */
- if (section_is_p (sectp->name, &names->str_dwo))
- {
- dwp_file->sections.str.s.section = sectp;
- dwp_file->sections.str.size = bfd_get_section_size (sectp);
+ sectp = dwp_file->elf_sections[section_nr];
+ if (! locate_v1_virtual_dwo_sections (sectp, §ions))
+ {
+ error (_("Dwarf Error: bad DWP hash table, invalid section found"
+ " [in module %s]"),
+ dwp_file->name);
+ }
}
- else if (section_is_p (sectp->name, &names->cu_index))
+
+ if (i < 2
+ || dwarf2_section_empty_p (§ions.info_or_types)
+ || dwarf2_section_empty_p (§ions.abbrev))
{
- dwp_file->sections.cu_index.s.section = sectp;
- dwp_file->sections.cu_index.size = bfd_get_section_size (sectp);
+ error (_("Dwarf Error: bad DWP hash table, missing DWO sections"
+ " [in module %s]"),
+ dwp_file->name);
}
- else if (section_is_p (sectp->name, &names->tu_index))
+ if (i == MAX_NR_V1_DWO_SECTIONS)
{
- dwp_file->sections.tu_index.s.section = sectp;
- dwp_file->sections.tu_index.size = bfd_get_section_size (sectp);
+ error (_("Dwarf Error: bad DWP hash table, too many DWO sections"
+ " [in module %s]"),
+ dwp_file->name);
}
-}
-
-/* This function is mapped across the sections and remembers the offset and
- size of each of the DWP version 2 debugging sections that we are interested
- in. This is split into a separate function because we don't know if we
- have version 1 or 2 until we parse the cu_index/tu_index sections. */
-static void
-dwarf2_locate_v2_dwp_sections (bfd *abfd, asection *sectp, void *dwp_file_ptr)
-{
- struct dwp_file *dwp_file = (struct dwp_file *) dwp_file_ptr;
- const struct dwop_section_names *names = &dwop_section_names;
- unsigned int elf_section_nr = elf_section_data (sectp)->this_idx;
+ /* It's easier for the rest of the code if we fake a struct dwo_file and
+ have dwo_unit "live" in that. At least for now.
- /* Record the ELF section number for later lookup: this is what the
- .debug_cu_index,.debug_tu_index tables use in DWP V1. */
- gdb_assert (elf_section_nr < dwp_file->num_sections);
- dwp_file->elf_sections[elf_section_nr] = sectp;
+ The DWP file can be made up of a random collection of CUs and TUs.
+ However, for each CU + set of TUs that came from the same original DWO
+ file, we can combine them back into a virtual DWO file to save space
+ (fewer struct dwo_file objects to allocate). Remember that for really
+ large apps there can be on the order of 8K CUs and 200K TUs, or more. */
- /* Look for specific sections that we need. */
- if (section_is_p (sectp->name, &names->abbrev_dwo))
- {
- dwp_file->sections.abbrev.s.section = sectp;
- dwp_file->sections.abbrev.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->info_dwo))
- {
- dwp_file->sections.info.s.section = sectp;
- dwp_file->sections.info.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->line_dwo))
- {
- dwp_file->sections.line.s.section = sectp;
- dwp_file->sections.line.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->loc_dwo))
- {
- dwp_file->sections.loc.s.section = sectp;
- dwp_file->sections.loc.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->macinfo_dwo))
- {
- dwp_file->sections.macinfo.s.section = sectp;
- dwp_file->sections.macinfo.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->macro_dwo))
- {
- dwp_file->sections.macro.s.section = sectp;
- dwp_file->sections.macro.size = bfd_get_section_size (sectp);
- }
- else if (section_is_p (sectp->name, &names->str_offsets_dwo))
+ std::string virtual_dwo_name =
+ string_printf ("virtual-dwo/%d-%d-%d-%d",
+ get_section_id (§ions.abbrev),
+ get_section_id (§ions.line),
+ get_section_id (§ions.loc),
+ get_section_id (§ions.str_offsets));
+ /* Can we use an existing virtual DWO file? */
+ dwo_file_slot = lookup_dwo_file_slot (dwarf2_per_objfile,
+ virtual_dwo_name.c_str (),
+ comp_dir);
+ /* Create one if necessary. */
+ if (*dwo_file_slot == NULL)
{
- dwp_file->sections.str_offsets.s.section = sectp;
- dwp_file->sections.str_offsets.size = bfd_get_section_size (sectp);
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "Creating virtual DWO: %s\n",
+ virtual_dwo_name.c_str ());
+ }
+ dwo_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_file);
+ dwo_file->dwo_name
+ = (const char *) obstack_copy0 (&objfile->objfile_obstack,
+ virtual_dwo_name.c_str (),
+ virtual_dwo_name.size ());
+ dwo_file->comp_dir = comp_dir;
+ dwo_file->sections.abbrev = sections.abbrev;
+ dwo_file->sections.line = sections.line;
+ dwo_file->sections.loc = sections.loc;
+ dwo_file->sections.macinfo = sections.macinfo;
+ dwo_file->sections.macro = sections.macro;
+ dwo_file->sections.str_offsets = sections.str_offsets;
+ /* The "str" section is global to the entire DWP file. */
+ dwo_file->sections.str = dwp_file->sections.str;
+ /* The info or types section is assigned below to dwo_unit,
+ there's no need to record it in dwo_file.
+ Also, we can't simply record type sections in dwo_file because
+ we record a pointer into the vector in dwo_unit. As we collect more
+ types we'll grow the vector and eventually have to reallocate space
+ for it, invalidating all copies of pointers into the previous
+ contents. */
+ *dwo_file_slot = dwo_file;
}
- else if (section_is_p (sectp->name, &names->types_dwo))
+ else
{
- dwp_file->sections.types.s.section = sectp;
- dwp_file->sections.types.size = bfd_get_section_size (sectp);
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "Using existing virtual DWO: %s\n",
+ virtual_dwo_name.c_str ());
+ }
+ dwo_file = (struct dwo_file *) *dwo_file_slot;
}
-}
-
-/* Hash function for dwp_file loaded CUs/TUs. */
-static hashval_t
-hash_dwp_loaded_cutus (const void *item)
-{
- const struct dwo_unit *dwo_unit = (const struct dwo_unit *) item;
+ dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
+ dwo_unit->dwo_file = dwo_file;
+ dwo_unit->signature = signature;
+ dwo_unit->section =
+ XOBNEW (&objfile->objfile_obstack, struct dwarf2_section_info);
+ *dwo_unit->section = sections.info_or_types;
+ /* dwo_unit->{offset,length,type_offset_in_tu} are set later. */
- /* This drops the top 32 bits of the signature, but is ok for a hash. */
- return dwo_unit->signature;
+ return dwo_unit;
}
-/* Equality function for dwp_file loaded CUs/TUs. */
+/* Subroutine of create_dwo_unit_in_dwp_v2 to simplify it.
+ Given a pointer to the containing section SECTION, and OFFSET,SIZE of the
+ piece within that section used by a TU/CU, return a virtual section
+ of just that piece. */
-static int
-eq_dwp_loaded_cutus (const void *a, const void *b)
+static struct dwarf2_section_info
+create_dwp_v2_section (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ bfd_size_type offset, bfd_size_type size)
{
- const struct dwo_unit *dua = (const struct dwo_unit *) a;
- const struct dwo_unit *dub = (const struct dwo_unit *) b;
-
- return dua->signature == dub->signature;
-}
+ struct dwarf2_section_info result;
+ asection *sectp;
-/* Allocate a hash table for dwp_file loaded CUs/TUs. */
+ gdb_assert (section != NULL);
+ gdb_assert (!section->is_virtual);
-static htab_t
-allocate_dwp_loaded_cutus_table (struct objfile *objfile)
-{
- return htab_create_alloc_ex (3,
- hash_dwp_loaded_cutus,
- eq_dwp_loaded_cutus,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
-}
+ memset (&result, 0, sizeof (result));
+ result.s.containing_section = section;
+ result.is_virtual = 1;
-/* Try to open DWP file FILE_NAME.
- The result is the bfd handle of the file.
- If there is a problem finding or opening the file, return NULL.
- Upon success, the canonicalized path of the file is stored in the bfd,
- same as symfile_bfd_open. */
+ if (size == 0)
+ return result;
-static gdb_bfd_ref_ptr
-open_dwp_file (const char *file_name)
-{
- gdb_bfd_ref_ptr abfd (try_open_dwop_file (file_name, 1 /*is_dwp*/,
- 1 /*search_cwd*/));
- if (abfd != NULL)
- return abfd;
+ sectp = get_section_bfd_section (section);
- /* Work around upstream bug 15652.
- http://sourceware.org/bugzilla/show_bug.cgi?id=15652
- [Whether that's a "bug" is debatable, but it is getting in our way.]
- We have no real idea where the dwp file is, because gdb's realpath-ing
- of the executable's path may have discarded the needed info.
- [IWBN if the dwp file name was recorded in the executable, akin to
- .gnu_debuglink, but that doesn't exist yet.]
- Strip the directory from FILE_NAME and search again. */
- if (*debug_file_directory != '\0')
+ /* Flag an error if the piece denoted by OFFSET,SIZE is outside the
+ bounds of the real section. This is a pretty-rare event, so just
+ flag an error (easier) instead of a warning and trying to cope. */
+ if (sectp == NULL
+ || offset + size > bfd_get_section_size (sectp))
{
- /* Don't implicitly search the current directory here.
- If the user wants to search "." to handle this case,
- it must be added to debug-file-directory. */
- return try_open_dwop_file (lbasename (file_name), 1 /*is_dwp*/,
- 0 /*search_cwd*/);
+ error (_("Dwarf Error: Bad DWP V2 section info, doesn't fit"
+ " in section %s [in module %s]"),
+ sectp ? bfd_section_name (abfd, sectp) : "<unknown>",
+ objfile_name (dwarf2_per_objfile->objfile));
}
- return NULL;
+ result.virtual_offset = offset;
+ result.size = size;
+ return result;
}
-/* Initialize the use of the DWP file for the current objfile.
- By convention the name of the DWP file is ${objfile}.dwp.
- The result is NULL if it can't be found. */
+/* Create a dwo_unit object for the DWO unit with signature SIGNATURE.
+ UNIT_INDEX is the index of the DWO unit in the DWP hash table.
+ COMP_DIR is the DW_AT_comp_dir attribute of the referencing CU.
+ This is for DWP version 2 files. */
-static struct dwp_file *
-open_and_init_dwp_file (void)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwp_file *dwp_file;
+static struct dwo_unit *
+create_dwo_unit_in_dwp_v2 (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwp_file *dwp_file,
+ uint32_t unit_index,
+ const char *comp_dir,
+ ULONGEST signature, int is_debug_types)
+{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ const struct dwp_hash_table *dwp_htab =
+ is_debug_types ? dwp_file->tus : dwp_file->cus;
+ bfd *dbfd = dwp_file->dbfd.get ();
+ const char *kind = is_debug_types ? "TU" : "CU";
+ struct dwo_file *dwo_file;
+ struct dwo_unit *dwo_unit;
+ struct virtual_v2_dwo_sections sections;
+ void **dwo_file_slot;
+ int i;
- /* Try to find first .dwp for the binary file before any symbolic links
- resolving. */
+ gdb_assert (dwp_file->version == 2);
- /* If the objfile is a debug file, find the name of the real binary
- file and get the name of dwp file from there. */
- std::string dwp_name;
- if (objfile->separate_debug_objfile_backlink != NULL)
+ if (dwarf_read_debug)
{
- struct objfile *backlink = objfile->separate_debug_objfile_backlink;
- const char *backlink_basename = lbasename (backlink->original_name);
-
- dwp_name = ldirname (objfile->original_name) + SLASH_STRING + backlink_basename;
+ fprintf_unfiltered (gdb_stdlog, "Reading %s %s/%s in DWP V2 file: %s\n",
+ kind,
+ pulongest (unit_index), hex_string (signature),
+ dwp_file->name);
}
- else
- dwp_name = objfile->original_name;
- dwp_name += ".dwp";
+ /* Fetch the section offsets of this DWO unit. */
- gdb_bfd_ref_ptr dbfd (open_dwp_file (dwp_name.c_str ()));
- if (dbfd == NULL
- && strcmp (objfile->original_name, objfile_name (objfile)) != 0)
- {
- /* Try to find .dwp for the binary file after gdb_realpath resolving. */
- dwp_name = objfile_name (objfile);
- dwp_name += ".dwp";
- dbfd = open_dwp_file (dwp_name.c_str ());
- }
+ memset (§ions, 0, sizeof (sections));
- if (dbfd == NULL)
+ for (i = 0; i < dwp_htab->nr_columns; ++i)
{
- if (dwarf_read_debug)
- fprintf_unfiltered (gdb_stdlog, "DWP file not found: %s\n", dwp_name.c_str ());
- return NULL;
- }
- dwp_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwp_file);
- dwp_file->name = bfd_get_filename (dbfd.get ());
- dwp_file->dbfd = dbfd.release ();
-
- /* +1: section 0 is unused */
- dwp_file->num_sections = bfd_count_sections (dwp_file->dbfd) + 1;
- dwp_file->elf_sections =
- OBSTACK_CALLOC (&objfile->objfile_obstack,
- dwp_file->num_sections, asection *);
+ uint32_t offset = read_4_bytes (dbfd,
+ dwp_htab->section_pool.v2.offsets
+ + (((unit_index - 1) * dwp_htab->nr_columns
+ + i)
+ * sizeof (uint32_t)));
+ uint32_t size = read_4_bytes (dbfd,
+ dwp_htab->section_pool.v2.sizes
+ + (((unit_index - 1) * dwp_htab->nr_columns
+ + i)
+ * sizeof (uint32_t)));
- bfd_map_over_sections (dwp_file->dbfd, dwarf2_locate_common_dwp_sections,
- dwp_file);
+ switch (dwp_htab->section_pool.v2.section_ids[i])
+ {
+ case DW_SECT_INFO:
+ case DW_SECT_TYPES:
+ sections.info_or_types_offset = offset;
+ sections.info_or_types_size = size;
+ break;
+ case DW_SECT_ABBREV:
+ sections.abbrev_offset = offset;
+ sections.abbrev_size = size;
+ break;
+ case DW_SECT_LINE:
+ sections.line_offset = offset;
+ sections.line_size = size;
+ break;
+ case DW_SECT_LOC:
+ sections.loc_offset = offset;
+ sections.loc_size = size;
+ break;
+ case DW_SECT_STR_OFFSETS:
+ sections.str_offsets_offset = offset;
+ sections.str_offsets_size = size;
+ break;
+ case DW_SECT_MACINFO:
+ sections.macinfo_offset = offset;
+ sections.macinfo_size = size;
+ break;
+ case DW_SECT_MACRO:
+ sections.macro_offset = offset;
+ sections.macro_size = size;
+ break;
+ }
+ }
- dwp_file->cus = create_dwp_hash_table (dwp_file, 0);
+ /* It's easier for the rest of the code if we fake a struct dwo_file and
+ have dwo_unit "live" in that. At least for now.
- dwp_file->tus = create_dwp_hash_table (dwp_file, 1);
+ The DWP file can be made up of a random collection of CUs and TUs.
+ However, for each CU + set of TUs that came from the same original DWO
+ file, we can combine them back into a virtual DWO file to save space
+ (fewer struct dwo_file objects to allocate). Remember that for really
+ large apps there can be on the order of 8K CUs and 200K TUs, or more. */
- /* The DWP file version is stored in the hash table. Oh well. */
- if (dwp_file->cus && dwp_file->tus
- && dwp_file->cus->version != dwp_file->tus->version)
+ std::string virtual_dwo_name =
+ string_printf ("virtual-dwo/%ld-%ld-%ld-%ld",
+ (long) (sections.abbrev_size ? sections.abbrev_offset : 0),
+ (long) (sections.line_size ? sections.line_offset : 0),
+ (long) (sections.loc_size ? sections.loc_offset : 0),
+ (long) (sections.str_offsets_size
+ ? sections.str_offsets_offset : 0));
+ /* Can we use an existing virtual DWO file? */
+ dwo_file_slot = lookup_dwo_file_slot (dwarf2_per_objfile,
+ virtual_dwo_name.c_str (),
+ comp_dir);
+ /* Create one if necessary. */
+ if (*dwo_file_slot == NULL)
{
- /* Technically speaking, we should try to limp along, but this is
- pretty bizarre. We use pulongest here because that's the established
- portability solution (e.g, we cannot use %u for uint32_t). */
- error (_("Dwarf Error: DWP file CU version %s doesn't match"
- " TU version %s [in DWP file %s]"),
- pulongest (dwp_file->cus->version),
- pulongest (dwp_file->tus->version), dwp_name.c_str ());
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "Creating virtual DWO: %s\n",
+ virtual_dwo_name.c_str ());
+ }
+ dwo_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_file);
+ dwo_file->dwo_name
+ = (const char *) obstack_copy0 (&objfile->objfile_obstack,
+ virtual_dwo_name.c_str (),
+ virtual_dwo_name.size ());
+ dwo_file->comp_dir = comp_dir;
+ dwo_file->sections.abbrev =
+ create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.abbrev,
+ sections.abbrev_offset, sections.abbrev_size);
+ dwo_file->sections.line =
+ create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.line,
+ sections.line_offset, sections.line_size);
+ dwo_file->sections.loc =
+ create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.loc,
+ sections.loc_offset, sections.loc_size);
+ dwo_file->sections.macinfo =
+ create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.macinfo,
+ sections.macinfo_offset, sections.macinfo_size);
+ dwo_file->sections.macro =
+ create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.macro,
+ sections.macro_offset, sections.macro_size);
+ dwo_file->sections.str_offsets =
+ create_dwp_v2_section (dwarf2_per_objfile,
+ &dwp_file->sections.str_offsets,
+ sections.str_offsets_offset,
+ sections.str_offsets_size);
+ /* The "str" section is global to the entire DWP file. */
+ dwo_file->sections.str = dwp_file->sections.str;
+ /* The info or types section is assigned below to dwo_unit,
+ there's no need to record it in dwo_file.
+ Also, we can't simply record type sections in dwo_file because
+ we record a pointer into the vector in dwo_unit. As we collect more
+ types we'll grow the vector and eventually have to reallocate space
+ for it, invalidating all copies of pointers into the previous
+ contents. */
+ *dwo_file_slot = dwo_file;
}
-
- if (dwp_file->cus)
- dwp_file->version = dwp_file->cus->version;
- else if (dwp_file->tus)
- dwp_file->version = dwp_file->tus->version;
else
- dwp_file->version = 2;
-
- if (dwp_file->version == 2)
- bfd_map_over_sections (dwp_file->dbfd, dwarf2_locate_v2_dwp_sections,
- dwp_file);
-
- dwp_file->loaded_cus = allocate_dwp_loaded_cutus_table (objfile);
- dwp_file->loaded_tus = allocate_dwp_loaded_cutus_table (objfile);
-
- if (dwarf_read_debug)
{
- fprintf_unfiltered (gdb_stdlog, "DWP file found: %s\n", dwp_file->name);
- fprintf_unfiltered (gdb_stdlog,
- " %s CUs, %s TUs\n",
- pulongest (dwp_file->cus ? dwp_file->cus->nr_units : 0),
- pulongest (dwp_file->tus ? dwp_file->tus->nr_units : 0));
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "Using existing virtual DWO: %s\n",
+ virtual_dwo_name.c_str ());
+ }
+ dwo_file = (struct dwo_file *) *dwo_file_slot;
}
- return dwp_file;
-}
-
-/* Wrapper around open_and_init_dwp_file, only open it once. */
+ dwo_unit = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwo_unit);
+ dwo_unit->dwo_file = dwo_file;
+ dwo_unit->signature = signature;
+ dwo_unit->section =
+ XOBNEW (&objfile->objfile_obstack, struct dwarf2_section_info);
+ *dwo_unit->section = create_dwp_v2_section (dwarf2_per_objfile,
+ is_debug_types
+ ? &dwp_file->sections.types
+ : &dwp_file->sections.info,
+ sections.info_or_types_offset,
+ sections.info_or_types_size);
+ /* dwo_unit->{offset,length,type_offset_in_tu} are set later. */
-static struct dwp_file *
-get_dwp_file (void)
-{
- if (! dwarf2_per_objfile->dwp_checked)
- {
- dwarf2_per_objfile->dwp_file = open_and_init_dwp_file ();
- dwarf2_per_objfile->dwp_checked = 1;
- }
- return dwarf2_per_objfile->dwp_file;
+ return dwo_unit;
}
-/* Subroutine of lookup_dwo_comp_unit, lookup_dwo_type_unit.
- Look up the CU/TU with signature SIGNATURE, either in DWO file DWO_NAME
- or in the DWP file for the objfile, referenced by THIS_UNIT.
- If non-NULL, comp_dir is the DW_AT_comp_dir attribute.
- IS_DEBUG_TYPES is non-zero if reading a TU, otherwise read a CU.
-
- This is called, for example, when wanting to read a variable with a
- complex location. Therefore we don't want to do file i/o for every call.
- Therefore we don't want to look for a DWO file on every call.
- Therefore we first see if we've already seen SIGNATURE in a DWP file,
- then we check if we've already seen DWO_NAME, and only THEN do we check
- for a DWO file.
-
- The result is a pointer to the dwo_unit object or NULL if we didn't find it
- (dwo_id mismatch or couldn't find the DWO/DWP file). */
+/* Lookup the DWO unit with SIGNATURE in DWP_FILE.
+ Returns NULL if the signature isn't found. */
static struct dwo_unit *
-lookup_dwo_cutu (struct dwarf2_per_cu_data *this_unit,
- const char *dwo_name, const char *comp_dir,
- ULONGEST signature, int is_debug_types)
+lookup_dwo_unit_in_dwp (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwp_file *dwp_file, const char *comp_dir,
+ ULONGEST signature, int is_debug_types)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- const char *kind = is_debug_types ? "TU" : "CU";
- void **dwo_file_slot;
- struct dwo_file *dwo_file;
- struct dwp_file *dwp_file;
+ const struct dwp_hash_table *dwp_htab =
+ is_debug_types ? dwp_file->tus : dwp_file->cus;
+ bfd *dbfd = dwp_file->dbfd.get ();
+ uint32_t mask = dwp_htab->nr_slots - 1;
+ uint32_t hash = signature & mask;
+ uint32_t hash2 = ((signature >> 32) & mask) | 1;
+ unsigned int i;
+ void **slot;
+ struct dwo_unit find_dwo_cu;
- /* First see if there's a DWP file.
- If we have a DWP file but didn't find the DWO inside it, don't
- look for the original DWO file. It makes gdb behave differently
- depending on whether one is debugging in the build tree. */
+ memset (&find_dwo_cu, 0, sizeof (find_dwo_cu));
+ find_dwo_cu.signature = signature;
+ slot = htab_find_slot (is_debug_types
+ ? dwp_file->loaded_tus
+ : dwp_file->loaded_cus,
+ &find_dwo_cu, INSERT);
- dwp_file = get_dwp_file ();
- if (dwp_file != NULL)
- {
- const struct dwp_hash_table *dwp_htab =
- is_debug_types ? dwp_file->tus : dwp_file->cus;
+ if (*slot != NULL)
+ return (struct dwo_unit *) *slot;
- if (dwp_htab != NULL)
- {
- struct dwo_unit *dwo_cutu =
- lookup_dwo_unit_in_dwp (dwp_file, comp_dir,
- signature, is_debug_types);
-
- if (dwo_cutu != NULL)
- {
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "Virtual DWO %s %s found: @%s\n",
- kind, hex_string (signature),
- host_address_to_string (dwo_cutu));
- }
- return dwo_cutu;
- }
- }
- }
- else
+ /* Use a for loop so that we don't loop forever on bad debug info. */
+ for (i = 0; i < dwp_htab->nr_slots; ++i)
{
- /* No DWP file, look for the DWO file. */
-
- dwo_file_slot = lookup_dwo_file_slot (dwo_name, comp_dir);
- if (*dwo_file_slot == NULL)
- {
- /* Read in the file and build a table of the CUs/TUs it contains. */
- *dwo_file_slot = open_and_init_dwo_file (this_unit, dwo_name, comp_dir);
- }
- /* NOTE: This will be NULL if unable to open the file. */
- dwo_file = (struct dwo_file *) *dwo_file_slot;
+ ULONGEST signature_in_table;
- if (dwo_file != NULL)
+ signature_in_table =
+ read_8_bytes (dbfd, dwp_htab->hash_table + hash * sizeof (uint64_t));
+ if (signature_in_table == signature)
{
- struct dwo_unit *dwo_cutu = NULL;
-
- if (is_debug_types && dwo_file->tus)
- {
- struct dwo_unit find_dwo_cutu;
+ uint32_t unit_index =
+ read_4_bytes (dbfd,
+ dwp_htab->unit_table + hash * sizeof (uint32_t));
- memset (&find_dwo_cutu, 0, sizeof (find_dwo_cutu));
- find_dwo_cutu.signature = signature;
- dwo_cutu
- = (struct dwo_unit *) htab_find (dwo_file->tus, &find_dwo_cutu);
- }
- else if (!is_debug_types && dwo_file->cus)
+ if (dwp_file->version == 1)
{
- struct dwo_unit find_dwo_cutu;
-
- memset (&find_dwo_cutu, 0, sizeof (find_dwo_cutu));
- find_dwo_cutu.signature = signature;
- dwo_cutu = (struct dwo_unit *)htab_find (dwo_file->cus,
- &find_dwo_cutu);
+ *slot = create_dwo_unit_in_dwp_v1 (dwarf2_per_objfile,
+ dwp_file, unit_index,
+ comp_dir, signature,
+ is_debug_types);
}
-
- if (dwo_cutu != NULL)
+ else
{
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "DWO %s %s(%s) found: @%s\n",
- kind, dwo_name, hex_string (signature),
- host_address_to_string (dwo_cutu));
- }
- return dwo_cutu;
+ *slot = create_dwo_unit_in_dwp_v2 (dwarf2_per_objfile,
+ dwp_file, unit_index,
+ comp_dir, signature,
+ is_debug_types);
}
+ return (struct dwo_unit *) *slot;
}
+ if (signature_in_table == 0)
+ return NULL;
+ hash = (hash + hash2) & mask;
}
- /* We didn't find it. This could mean a dwo_id mismatch, or
- someone deleted the DWO/DWP file, or the search path isn't set up
- correctly to find the file. */
-
- if (dwarf_read_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "DWO %s %s(%s) not found\n",
- kind, dwo_name, hex_string (signature));
- }
-
- /* This is a warning and not a complaint because it can be caused by
- pilot error (e.g., user accidentally deleting the DWO). */
- {
- /* Print the name of the DWP file if we looked there, helps the user
- better diagnose the problem. */
- std::string dwp_text;
-
- if (dwp_file != NULL)
- dwp_text = string_printf (" [in DWP file %s]",
- lbasename (dwp_file->name));
-
- warning (_("Could not find DWO %s %s(%s)%s referenced by %s at offset 0x%x"
- " [in module %s]"),
- kind, dwo_name, hex_string (signature),
- dwp_text.c_str (),
- this_unit->is_debug_types ? "TU" : "CU",
- to_underlying (this_unit->sect_off), objfile_name (objfile));
- }
- return NULL;
-}
-
-/* Lookup the DWO CU DWO_NAME/SIGNATURE referenced from THIS_CU.
- See lookup_dwo_cutu_unit for details. */
-
-static struct dwo_unit *
-lookup_dwo_comp_unit (struct dwarf2_per_cu_data *this_cu,
- const char *dwo_name, const char *comp_dir,
- ULONGEST signature)
-{
- return lookup_dwo_cutu (this_cu, dwo_name, comp_dir, signature, 0);
-}
-
-/* Lookup the DWO TU DWO_NAME/SIGNATURE referenced from THIS_TU.
- See lookup_dwo_cutu_unit for details. */
-
-static struct dwo_unit *
-lookup_dwo_type_unit (struct signatured_type *this_tu,
- const char *dwo_name, const char *comp_dir)
-{
- return lookup_dwo_cutu (&this_tu->per_cu, dwo_name, comp_dir, this_tu->signature, 1);
+ error (_("Dwarf Error: bad DWP hash table, lookup didn't terminate"
+ " [in module %s]"),
+ dwp_file->name);
}
-/* Traversal function for queue_and_load_all_dwo_tus. */
+/* Subroutine of open_dwo_file,open_dwp_file to simplify them.
+ Open the file specified by FILE_NAME and hand it off to BFD for
+ preliminary analysis. Return a newly initialized bfd *, which
+ includes a canonicalized copy of FILE_NAME.
+ If IS_DWP is TRUE, we're opening a DWP file, otherwise a DWO file.
+ SEARCH_CWD is true if the current directory is to be searched.
+ It will be searched before debug-file-directory.
+ If successful, the file is added to the bfd include table of the
+ objfile's bfd (see gdb_bfd_record_inclusion).
+ If unable to find/open the file, return NULL.
+ NOTE: This function is derived from symfile_bfd_open. */
-static int
-queue_and_load_dwo_tu (void **slot, void *info)
+static gdb_bfd_ref_ptr
+try_open_dwop_file (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const char *file_name, int is_dwp, int search_cwd)
{
- struct dwo_unit *dwo_unit = (struct dwo_unit *) *slot;
- struct dwarf2_per_cu_data *per_cu = (struct dwarf2_per_cu_data *) info;
- ULONGEST signature = dwo_unit->signature;
- struct signatured_type *sig_type =
- lookup_dwo_signatured_type (per_cu->cu, signature);
+ int desc;
+ /* Blech. OPF_TRY_CWD_FIRST also disables searching the path list if
+ FILE_NAME contains a '/'. So we can't use it. Instead prepend "."
+ to debug_file_directory. */
+ const char *search_path;
+ static const char dirname_separator_string[] = { DIRNAME_SEPARATOR, '\0' };
- if (sig_type != NULL)
+ gdb::unique_xmalloc_ptr<char> search_path_holder;
+ if (search_cwd)
{
- struct dwarf2_per_cu_data *sig_cu = &sig_type->per_cu;
-
- /* We pass NULL for DEPENDENT_CU because we don't yet know if there's
- a real dependency of PER_CU on SIG_TYPE. That is detected later
- while processing PER_CU. */
- if (maybe_queue_comp_unit (NULL, sig_cu, per_cu->cu->language))
- load_full_type_unit (sig_cu);
- VEC_safe_push (dwarf2_per_cu_ptr, per_cu->imported_symtabs, sig_cu);
+ if (*debug_file_directory != '\0')
+ {
+ search_path_holder.reset (concat (".", dirname_separator_string,
+ debug_file_directory,
+ (char *) NULL));
+ search_path = search_path_holder.get ();
+ }
+ else
+ search_path = ".";
}
+ else
+ search_path = debug_file_directory;
- return 1;
-}
+ openp_flags flags = OPF_RETURN_REALPATH;
+ if (is_dwp)
+ flags |= OPF_SEARCH_IN_PATH;
-/* Queue all TUs contained in the DWO of PER_CU to be read in.
- The DWO may have the only definition of the type, though it may not be
- referenced anywhere in PER_CU. Thus we have to load *all* its TUs.
- http://sourceware.org/bugzilla/show_bug.cgi?id=15021 */
+ gdb::unique_xmalloc_ptr<char> absolute_name;
+ desc = openp (search_path, flags, file_name,
+ O_RDONLY | O_BINARY, &absolute_name);
+ if (desc < 0)
+ return NULL;
-static void
-queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *per_cu)
-{
- struct dwo_unit *dwo_unit;
- struct dwo_file *dwo_file;
+ gdb_bfd_ref_ptr sym_bfd (gdb_bfd_open (absolute_name.get (),
+ gnutarget, desc));
+ if (sym_bfd == NULL)
+ return NULL;
+ bfd_set_cacheable (sym_bfd.get (), 1);
- gdb_assert (!per_cu->is_debug_types);
- gdb_assert (get_dwp_file () == NULL);
- gdb_assert (per_cu->cu != NULL);
+ if (!bfd_check_format (sym_bfd.get (), bfd_object))
+ return NULL;
- dwo_unit = per_cu->cu->dwo_unit;
- gdb_assert (dwo_unit != NULL);
+ /* Success. Record the bfd as having been included by the objfile's bfd.
+ This is important because things like demangled_names_hash lives in the
+ objfile's per_bfd space and may have references to things like symbol
+ names that live in the DWO/DWP file's per_bfd space. PR 16426. */
+ gdb_bfd_record_inclusion (dwarf2_per_objfile->objfile->obfd, sym_bfd.get ());
- dwo_file = dwo_unit->dwo_file;
- if (dwo_file->tus != NULL)
- htab_traverse_noresize (dwo_file->tus, queue_and_load_dwo_tu, per_cu);
+ return sym_bfd;
}
-/* Free all resources associated with DWO_FILE.
- Close the DWO file and munmap the sections.
- All memory should be on the objfile obstack. */
+/* Try to open DWO file FILE_NAME.
+ COMP_DIR is the DW_AT_comp_dir attribute.
+ The result is the bfd handle of the file.
+ If there is a problem finding or opening the file, return NULL.
+ Upon success, the canonicalized path of the file is stored in the bfd,
+ same as symfile_bfd_open. */
-static void
-free_dwo_file (struct dwo_file *dwo_file, struct objfile *objfile)
+static gdb_bfd_ref_ptr
+open_dwo_file (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const char *file_name, const char *comp_dir)
{
+ if (IS_ABSOLUTE_PATH (file_name))
+ return try_open_dwop_file (dwarf2_per_objfile, file_name,
+ 0 /*is_dwp*/, 0 /*search_cwd*/);
- /* Note: dbfd is NULL for virtual DWO files. */
- gdb_bfd_unref (dwo_file->dbfd);
-
- VEC_free (dwarf2_section_info_def, dwo_file->sections.types);
-}
-
-/* Wrapper for free_dwo_file for use in cleanups. */
-
-static void
-free_dwo_file_cleanup (void *arg)
-{
- struct dwo_file *dwo_file = (struct dwo_file *) arg;
- struct objfile *objfile = dwarf2_per_objfile->objfile;
+ /* Before trying the search path, try DWO_NAME in COMP_DIR. */
- free_dwo_file (dwo_file, objfile);
-}
+ if (comp_dir != NULL)
+ {
+ char *path_to_try = concat (comp_dir, SLASH_STRING,
+ file_name, (char *) NULL);
-/* Traversal function for free_dwo_files. */
+ /* NOTE: If comp_dir is a relative path, this will also try the
+ search path, which seems useful. */
+ gdb_bfd_ref_ptr abfd (try_open_dwop_file (dwarf2_per_objfile,
+ path_to_try,
+ 0 /*is_dwp*/,
+ 1 /*search_cwd*/));
+ xfree (path_to_try);
+ if (abfd != NULL)
+ return abfd;
+ }
-static int
-free_dwo_file_from_slot (void **slot, void *info)
-{
- struct dwo_file *dwo_file = (struct dwo_file *) *slot;
- struct objfile *objfile = (struct objfile *) info;
+ /* That didn't work, try debug-file-directory, which, despite its name,
+ is a list of paths. */
- free_dwo_file (dwo_file, objfile);
+ if (*debug_file_directory == '\0')
+ return NULL;
- return 1;
+ return try_open_dwop_file (dwarf2_per_objfile, file_name,
+ 0 /*is_dwp*/, 1 /*search_cwd*/);
}
-/* Free all resources associated with DWO_FILES. */
+/* This function is mapped across the sections and remembers the offset and
+ size of each of the DWO debugging sections we are interested in. */
static void
-free_dwo_files (htab_t dwo_files, struct objfile *objfile)
+dwarf2_locate_dwo_sections (bfd *abfd, asection *sectp, void *dwo_sections_ptr)
{
- htab_traverse_noresize (dwo_files, free_dwo_file_from_slot, objfile);
-}
-\f
-/* Read in various DIEs. */
-
-/* DW_AT_abstract_origin inherits whole DIEs (not just their attributes).
- Inherit only the children of the DW_AT_abstract_origin DIE not being
- already referenced by DW_AT_abstract_origin from the children of the
- current DIE. */
+ struct dwo_sections *dwo_sections = (struct dwo_sections *) dwo_sections_ptr;
+ const struct dwop_section_names *names = &dwop_section_names;
-static void
-inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct die_info *child_die;
- sect_offset *offsetp;
- /* Parent of DIE - referenced by DW_AT_abstract_origin. */
- struct die_info *origin_die;
- /* Iterator of the ORIGIN_DIE children. */
- struct die_info *origin_child_die;
- struct attribute *attr;
- struct dwarf2_cu *origin_cu;
- struct pending **origin_previous_list_in_scope;
-
- attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
- if (!attr)
- return;
+ if (section_is_p (sectp->name, &names->abbrev_dwo))
+ {
+ dwo_sections->abbrev.s.section = sectp;
+ dwo_sections->abbrev.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->info_dwo))
+ {
+ dwo_sections->info.s.section = sectp;
+ dwo_sections->info.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->line_dwo))
+ {
+ dwo_sections->line.s.section = sectp;
+ dwo_sections->line.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->loc_dwo))
+ {
+ dwo_sections->loc.s.section = sectp;
+ dwo_sections->loc.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->macinfo_dwo))
+ {
+ dwo_sections->macinfo.s.section = sectp;
+ dwo_sections->macinfo.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->macro_dwo))
+ {
+ dwo_sections->macro.s.section = sectp;
+ dwo_sections->macro.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->str_dwo))
+ {
+ dwo_sections->str.s.section = sectp;
+ dwo_sections->str.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->str_offsets_dwo))
+ {
+ dwo_sections->str_offsets.s.section = sectp;
+ dwo_sections->str_offsets.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->types_dwo))
+ {
+ struct dwarf2_section_info type_section;
- /* Note that following die references may follow to a die in a
- different cu. */
+ memset (&type_section, 0, sizeof (type_section));
+ type_section.s.section = sectp;
+ type_section.size = bfd_get_section_size (sectp);
+ VEC_safe_push (dwarf2_section_info_def, dwo_sections->types,
+ &type_section);
+ }
+}
- origin_cu = cu;
- origin_die = follow_die_ref (die, attr, &origin_cu);
+/* Initialize the use of the DWO file specified by DWO_NAME and referenced
+ by PER_CU. This is for the non-DWP case.
+ The result is NULL if DWO_NAME can't be found. */
- /* We're inheriting ORIGIN's children into the scope we'd put DIE's
- symbols in. */
- origin_previous_list_in_scope = origin_cu->list_in_scope;
- origin_cu->list_in_scope = cu->list_in_scope;
+static struct dwo_file *
+open_and_init_dwo_file (struct dwarf2_per_cu_data *per_cu,
+ const char *dwo_name, const char *comp_dir)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- if (die->tag != origin_die->tag
- && !(die->tag == DW_TAG_inlined_subroutine
- && origin_die->tag == DW_TAG_subprogram))
- complaint (&symfile_complaints,
- _("DIE 0x%x and its abstract origin 0x%x have different tags"),
- to_underlying (die->sect_off),
- to_underlying (origin_die->sect_off));
+ gdb_bfd_ref_ptr dbfd (open_dwo_file (dwarf2_per_objfile, dwo_name, comp_dir));
+ if (dbfd == NULL)
+ {
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "DWO file not found: %s\n", dwo_name);
+ return NULL;
+ }
- std::vector<sect_offset> offsets;
+ /* We use a unique pointer here, despite the obstack allocation,
+ because a dwo_file needs some cleanup if it is abandoned. */
+ dwo_file_up dwo_file (OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct dwo_file));
+ dwo_file->dwo_name = dwo_name;
+ dwo_file->comp_dir = comp_dir;
+ dwo_file->dbfd = dbfd.release ();
- for (child_die = die->child;
- child_die && child_die->tag;
- child_die = sibling_die (child_die))
- {
- struct die_info *child_origin_die;
- struct dwarf2_cu *child_origin_cu;
+ bfd_map_over_sections (dwo_file->dbfd, dwarf2_locate_dwo_sections,
+ &dwo_file->sections);
- /* We are trying to process concrete instance entries:
- DW_TAG_call_site DIEs indeed have a DW_AT_abstract_origin tag, but
- it's not relevant to our analysis here. i.e. detecting DIEs that are
- present in the abstract instance but not referenced in the concrete
- one. */
- if (child_die->tag == DW_TAG_call_site
- || child_die->tag == DW_TAG_GNU_call_site)
- continue;
+ create_cus_hash_table (dwarf2_per_objfile, *dwo_file, dwo_file->sections.info,
+ dwo_file->cus);
- /* For each CHILD_DIE, find the corresponding child of
- ORIGIN_DIE. If there is more than one layer of
- DW_AT_abstract_origin, follow them all; there shouldn't be,
- but GCC versions at least through 4.4 generate this (GCC PR
- 40573). */
- child_origin_die = child_die;
- child_origin_cu = cu;
- while (1)
- {
- attr = dwarf2_attr (child_origin_die, DW_AT_abstract_origin,
- child_origin_cu);
- if (attr == NULL)
- break;
- child_origin_die = follow_die_ref (child_origin_die, attr,
- &child_origin_cu);
- }
+ create_debug_types_hash_table (dwarf2_per_objfile, dwo_file.get (),
+ dwo_file->sections.types, dwo_file->tus);
- /* According to DWARF3 3.3.8.2 #3 new entries without their abstract
- counterpart may exist. */
- if (child_origin_die != child_die)
- {
- if (child_die->tag != child_origin_die->tag
- && !(child_die->tag == DW_TAG_inlined_subroutine
- && child_origin_die->tag == DW_TAG_subprogram))
- complaint (&symfile_complaints,
- _("Child DIE 0x%x and its abstract origin 0x%x have "
- "different tags"),
- to_underlying (child_die->sect_off),
- to_underlying (child_origin_die->sect_off));
- if (child_origin_die->parent != origin_die)
- complaint (&symfile_complaints,
- _("Child DIE 0x%x and its abstract origin 0x%x have "
- "different parents"),
- to_underlying (child_die->sect_off),
- to_underlying (child_origin_die->sect_off));
- else
- offsets.push_back (child_origin_die->sect_off);
- }
- }
- std::sort (offsets.begin (), offsets.end ());
- sect_offset *offsets_end = offsets.data () + offsets.size ();
- for (offsetp = offsets.data () + 1; offsetp < offsets_end; offsetp++)
- if (offsetp[-1] == *offsetp)
- complaint (&symfile_complaints,
- _("Multiple children of DIE 0x%x refer "
- "to DIE 0x%x as their abstract origin"),
- to_underlying (die->sect_off), to_underlying (*offsetp));
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "DWO file found: %s\n", dwo_name);
- offsetp = offsets.data ();
- origin_child_die = origin_die->child;
- while (origin_child_die && origin_child_die->tag)
- {
- /* Is ORIGIN_CHILD_DIE referenced by any of the DIE children? */
- while (offsetp < offsets_end
- && *offsetp < origin_child_die->sect_off)
- offsetp++;
- if (offsetp >= offsets_end
- || *offsetp > origin_child_die->sect_off)
- {
- /* Found that ORIGIN_CHILD_DIE is really not referenced.
- Check whether we're already processing ORIGIN_CHILD_DIE.
- This can happen with mutually referenced abstract_origins.
- PR 16581. */
- if (!origin_child_die->in_process)
- process_die (origin_child_die, origin_cu);
- }
- origin_child_die = sibling_die (origin_child_die);
- }
- origin_cu->list_in_scope = origin_previous_list_in_scope;
+ return dwo_file.release ();
}
+/* This function is mapped across the sections and remembers the offset and
+ size of each of the DWP debugging sections common to version 1 and 2 that
+ we are interested in. */
+
static void
-read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+dwarf2_locate_common_dwp_sections (bfd *abfd, asection *sectp,
+ void *dwp_file_ptr)
{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct context_stack *newobj;
- CORE_ADDR lowpc;
- CORE_ADDR highpc;
- struct die_info *child_die;
- struct attribute *attr, *call_line, *call_file;
- const char *name;
- CORE_ADDR baseaddr;
- struct block *block;
- int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
- std::vector<struct symbol *> template_args;
- struct template_symbol *templ_func = NULL;
-
- if (inlined_func)
- {
- /* If we do not have call site information, we can't show the
- caller of this inlined function. That's too confusing, so
- only use the scope for local variables. */
- call_line = dwarf2_attr (die, DW_AT_call_line, cu);
- call_file = dwarf2_attr (die, DW_AT_call_file, cu);
- if (call_line == NULL || call_file == NULL)
- {
- read_lexical_block_scope (die, cu);
- return;
- }
- }
-
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ struct dwp_file *dwp_file = (struct dwp_file *) dwp_file_ptr;
+ const struct dwop_section_names *names = &dwop_section_names;
+ unsigned int elf_section_nr = elf_section_data (sectp)->this_idx;
- name = dwarf2_name (die, cu);
+ /* Record the ELF section number for later lookup: this is what the
+ .debug_cu_index,.debug_tu_index tables use in DWP V1. */
+ gdb_assert (elf_section_nr < dwp_file->num_sections);
+ dwp_file->elf_sections[elf_section_nr] = sectp;
- /* Ignore functions with missing or empty names. These are actually
- illegal according to the DWARF standard. */
- if (name == NULL)
+ /* Look for specific sections that we need. */
+ if (section_is_p (sectp->name, &names->str_dwo))
{
- complaint (&symfile_complaints,
- _("missing name for subprogram DIE at %d"),
- to_underlying (die->sect_off));
- return;
+ dwp_file->sections.str.s.section = sectp;
+ dwp_file->sections.str.size = bfd_get_section_size (sectp);
}
-
- /* Ignore functions with missing or invalid low and high pc attributes. */
- if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL)
- <= PC_BOUNDS_INVALID)
+ else if (section_is_p (sectp->name, &names->cu_index))
{
- attr = dwarf2_attr (die, DW_AT_external, cu);
- if (!attr || !DW_UNSND (attr))
- complaint (&symfile_complaints,
- _("cannot get low and high bounds "
- "for subprogram DIE at %d"),
- to_underlying (die->sect_off));
- return;
+ dwp_file->sections.cu_index.s.section = sectp;
+ dwp_file->sections.cu_index.size = bfd_get_section_size (sectp);
}
-
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
- highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
-
- /* If we have any template arguments, then we must allocate a
- different sort of symbol. */
- for (child_die = die->child; child_die; child_die = sibling_die (child_die))
+ else if (section_is_p (sectp->name, &names->tu_index))
{
- if (child_die->tag == DW_TAG_template_type_param
- || child_die->tag == DW_TAG_template_value_param)
- {
- templ_func = allocate_template_symbol (objfile);
- templ_func->subclass = SYMBOL_TEMPLATE;
- break;
- }
+ dwp_file->sections.tu_index.s.section = sectp;
+ dwp_file->sections.tu_index.size = bfd_get_section_size (sectp);
}
+}
- newobj = push_context (0, lowpc);
- newobj->name = new_symbol_full (die, read_type_die (die, cu), cu,
- (struct symbol *) templ_func);
+/* This function is mapped across the sections and remembers the offset and
+ size of each of the DWP version 2 debugging sections that we are interested
+ in. This is split into a separate function because we don't know if we
+ have version 1 or 2 until we parse the cu_index/tu_index sections. */
- /* If there is a location expression for DW_AT_frame_base, record
- it. */
- attr = dwarf2_attr (die, DW_AT_frame_base, cu);
- if (attr)
- dwarf2_symbol_mark_computed (attr, newobj->name, cu, 1);
+static void
+dwarf2_locate_v2_dwp_sections (bfd *abfd, asection *sectp, void *dwp_file_ptr)
+{
+ struct dwp_file *dwp_file = (struct dwp_file *) dwp_file_ptr;
+ const struct dwop_section_names *names = &dwop_section_names;
+ unsigned int elf_section_nr = elf_section_data (sectp)->this_idx;
- /* If there is a location for the static link, record it. */
- newobj->static_link = NULL;
- attr = dwarf2_attr (die, DW_AT_static_link, cu);
- if (attr)
+ /* Record the ELF section number for later lookup: this is what the
+ .debug_cu_index,.debug_tu_index tables use in DWP V1. */
+ gdb_assert (elf_section_nr < dwp_file->num_sections);
+ dwp_file->elf_sections[elf_section_nr] = sectp;
+
+ /* Look for specific sections that we need. */
+ if (section_is_p (sectp->name, &names->abbrev_dwo))
{
- newobj->static_link
- = XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
- attr_to_dynamic_prop (attr, die, cu, newobj->static_link);
+ dwp_file->sections.abbrev.s.section = sectp;
+ dwp_file->sections.abbrev.size = bfd_get_section_size (sectp);
}
-
- cu->list_in_scope = &local_symbols;
-
- if (die->child != NULL)
+ else if (section_is_p (sectp->name, &names->info_dwo))
{
- child_die = die->child;
- while (child_die && child_die->tag)
- {
- if (child_die->tag == DW_TAG_template_type_param
- || child_die->tag == DW_TAG_template_value_param)
- {
- struct symbol *arg = new_symbol (child_die, NULL, cu);
-
- if (arg != NULL)
- template_args.push_back (arg);
- }
- else
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
- }
+ dwp_file->sections.info.s.section = sectp;
+ dwp_file->sections.info.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->line_dwo))
+ {
+ dwp_file->sections.line.s.section = sectp;
+ dwp_file->sections.line.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->loc_dwo))
+ {
+ dwp_file->sections.loc.s.section = sectp;
+ dwp_file->sections.loc.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->macinfo_dwo))
+ {
+ dwp_file->sections.macinfo.s.section = sectp;
+ dwp_file->sections.macinfo.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->macro_dwo))
+ {
+ dwp_file->sections.macro.s.section = sectp;
+ dwp_file->sections.macro.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->str_offsets_dwo))
+ {
+ dwp_file->sections.str_offsets.s.section = sectp;
+ dwp_file->sections.str_offsets.size = bfd_get_section_size (sectp);
+ }
+ else if (section_is_p (sectp->name, &names->types_dwo))
+ {
+ dwp_file->sections.types.s.section = sectp;
+ dwp_file->sections.types.size = bfd_get_section_size (sectp);
}
+}
- inherit_abstract_dies (die, cu);
+/* Hash function for dwp_file loaded CUs/TUs. */
- /* If we have a DW_AT_specification, we might need to import using
- directives from the context of the specification DIE. See the
- comment in determine_prefix. */
- if (cu->language == language_cplus
- && dwarf2_attr (die, DW_AT_specification, cu))
- {
- struct dwarf2_cu *spec_cu = cu;
- struct die_info *spec_die = die_specification (die, &spec_cu);
+static hashval_t
+hash_dwp_loaded_cutus (const void *item)
+{
+ const struct dwo_unit *dwo_unit = (const struct dwo_unit *) item;
- while (spec_die)
- {
- child_die = spec_die->child;
- while (child_die && child_die->tag)
- {
- if (child_die->tag == DW_TAG_imported_module)
- process_die (child_die, spec_cu);
- child_die = sibling_die (child_die);
- }
+ /* This drops the top 32 bits of the signature, but is ok for a hash. */
+ return dwo_unit->signature;
+}
- /* In some cases, GCC generates specification DIEs that
- themselves contain DW_AT_specification attributes. */
- spec_die = die_specification (spec_die, &spec_cu);
- }
- }
+/* Equality function for dwp_file loaded CUs/TUs. */
- newobj = pop_context ();
- /* Make a block for the local symbols within. */
- block = finish_block (newobj->name, &local_symbols, newobj->old_blocks,
- newobj->static_link, lowpc, highpc);
+static int
+eq_dwp_loaded_cutus (const void *a, const void *b)
+{
+ const struct dwo_unit *dua = (const struct dwo_unit *) a;
+ const struct dwo_unit *dub = (const struct dwo_unit *) b;
- /* For C++, set the block's scope. */
- if ((cu->language == language_cplus
- || cu->language == language_fortran
- || cu->language == language_d
- || cu->language == language_rust)
- && cu->processing_has_namespace_info)
- block_set_scope (block, determine_prefix (die, cu),
- &objfile->objfile_obstack);
+ return dua->signature == dub->signature;
+}
- /* If we have address ranges, record them. */
- dwarf2_record_block_ranges (die, block, baseaddr, cu);
+/* Allocate a hash table for dwp_file loaded CUs/TUs. */
- gdbarch_make_symbol_special (gdbarch, newobj->name, objfile);
+static htab_t
+allocate_dwp_loaded_cutus_table (struct objfile *objfile)
+{
+ return htab_create_alloc_ex (3,
+ hash_dwp_loaded_cutus,
+ eq_dwp_loaded_cutus,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+}
- /* Attach template arguments to function. */
- if (!template_args.empty ())
- {
- gdb_assert (templ_func != NULL);
+/* Try to open DWP file FILE_NAME.
+ The result is the bfd handle of the file.
+ If there is a problem finding or opening the file, return NULL.
+ Upon success, the canonicalized path of the file is stored in the bfd,
+ same as symfile_bfd_open. */
- templ_func->n_template_arguments = template_args.size ();
- templ_func->template_arguments
- = XOBNEWVEC (&objfile->objfile_obstack, struct symbol *,
- templ_func->n_template_arguments);
- memcpy (templ_func->template_arguments,
- template_args.data (),
- (templ_func->n_template_arguments * sizeof (struct symbol *)));
- }
+static gdb_bfd_ref_ptr
+open_dwp_file (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ const char *file_name)
+{
+ gdb_bfd_ref_ptr abfd (try_open_dwop_file (dwarf2_per_objfile, file_name,
+ 1 /*is_dwp*/,
+ 1 /*search_cwd*/));
+ if (abfd != NULL)
+ return abfd;
- /* 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 = newobj->locals;
- local_using_directives = newobj->local_using_directives;
+ /* Work around upstream bug 15652.
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15652
+ [Whether that's a "bug" is debatable, but it is getting in our way.]
+ We have no real idea where the dwp file is, because gdb's realpath-ing
+ of the executable's path may have discarded the needed info.
+ [IWBN if the dwp file name was recorded in the executable, akin to
+ .gnu_debuglink, but that doesn't exist yet.]
+ Strip the directory from FILE_NAME and search again. */
+ if (*debug_file_directory != '\0')
+ {
+ /* Don't implicitly search the current directory here.
+ If the user wants to search "." to handle this case,
+ it must be added to debug-file-directory. */
+ return try_open_dwop_file (dwarf2_per_objfile,
+ lbasename (file_name), 1 /*is_dwp*/,
+ 0 /*search_cwd*/);
+ }
- /* If we've finished processing a top-level function, subsequent
- symbols go in the file symbol list. */
- if (outermost_context_p ())
- cu->list_in_scope = &file_symbols;
+ return NULL;
}
-/* Process all the DIES contained within a lexical block scope. Start
- a new scope, process the dies, and then close the scope. */
+/* Initialize the use of the DWP file for the current objfile.
+ By convention the name of the DWP file is ${objfile}.dwp.
+ The result is NULL if it can't be found. */
-static void
-read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+static std::unique_ptr<struct dwp_file>
+open_and_init_dwp_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct context_stack *newobj;
- CORE_ADDR lowpc, highpc;
- struct die_info *child_die;
- CORE_ADDR baseaddr;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ /* Try to find first .dwp for the binary file before any symbolic links
+ resolving. */
- /* Ignore blocks with missing or invalid low and high pc attributes. */
- /* ??? 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. */
- switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL))
+ /* If the objfile is a debug file, find the name of the real binary
+ file and get the name of dwp file from there. */
+ std::string dwp_name;
+ if (objfile->separate_debug_objfile_backlink != NULL)
{
- case PC_BOUNDS_NOT_PRESENT:
- /* DW_TAG_lexical_block has no attributes, process its children as if
- there was no wrapping by that DW_TAG_lexical_block.
- GCC does no longer produces such DWARF since GCC r224161. */
- for (child_die = die->child;
- child_die != NULL && child_die->tag;
- child_die = sibling_die (child_die))
- process_die (child_die, cu);
- return;
- case PC_BOUNDS_INVALID:
- return;
+ struct objfile *backlink = objfile->separate_debug_objfile_backlink;
+ const char *backlink_basename = lbasename (backlink->original_name);
+
+ dwp_name = ldirname (objfile->original_name) + SLASH_STRING + backlink_basename;
}
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
- highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
+ else
+ dwp_name = objfile->original_name;
- push_context (0, lowpc);
- if (die->child != NULL)
+ dwp_name += ".dwp";
+
+ gdb_bfd_ref_ptr dbfd (open_dwp_file (dwarf2_per_objfile, dwp_name.c_str ()));
+ if (dbfd == NULL
+ && strcmp (objfile->original_name, objfile_name (objfile)) != 0)
{
- child_die = die->child;
- while (child_die && child_die->tag)
- {
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
- }
+ /* Try to find .dwp for the binary file after gdb_realpath resolving. */
+ dwp_name = objfile_name (objfile);
+ dwp_name += ".dwp";
+ dbfd = open_dwp_file (dwarf2_per_objfile, dwp_name.c_str ());
}
- inherit_abstract_dies (die, cu);
- newobj = pop_context ();
- if (local_symbols != NULL || local_using_directives != NULL)
+ if (dbfd == NULL)
{
- struct block *block
- = finish_block (0, &local_symbols, newobj->old_blocks, NULL,
- newobj->start_addr, highpc);
+ if (dwarf_read_debug)
+ fprintf_unfiltered (gdb_stdlog, "DWP file not found: %s\n", dwp_name.c_str ());
+ return std::unique_ptr<dwp_file> ();
+ }
- /* Note that recording ranges after traversing children, as we
- do here, means that recording a parent's ranges entails
- walking across all its children's ranges as they appear in
- the address map, which is quadratic behavior.
+ const char *name = bfd_get_filename (dbfd.get ());
+ std::unique_ptr<struct dwp_file> dwp_file
+ (new struct dwp_file (name, std::move (dbfd)));
- It would be nicer to record the parent's ranges before
- traversing its children, simply overriding whatever you find
- there. But since we don't even decide whether to create a
- block until after we've traversed its children, that's hard
- to do. */
- dwarf2_record_block_ranges (die, block, baseaddr, cu);
- }
- local_symbols = newobj->locals;
- local_using_directives = newobj->local_using_directives;
-}
+ /* +1: section 0 is unused */
+ dwp_file->num_sections = bfd_count_sections (dwp_file->dbfd) + 1;
+ dwp_file->elf_sections =
+ OBSTACK_CALLOC (&objfile->objfile_obstack,
+ dwp_file->num_sections, asection *);
-/* Read in DW_TAG_call_site and insert it to CU->call_site_htab. */
+ bfd_map_over_sections (dwp_file->dbfd.get (),
+ dwarf2_locate_common_dwp_sections,
+ dwp_file.get ());
-static void
-read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR pc, baseaddr;
- struct attribute *attr;
- struct call_site *call_site, call_site_local;
- void **slot;
- int nparams;
- struct die_info *child_die;
+ dwp_file->cus = create_dwp_hash_table (dwarf2_per_objfile, dwp_file.get (),
+ 0);
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ dwp_file->tus = create_dwp_hash_table (dwarf2_per_objfile, dwp_file.get (),
+ 1);
- attr = dwarf2_attr (die, DW_AT_call_return_pc, cu);
- if (attr == NULL)
- {
- /* This was a pre-DWARF-5 GNU extension alias
- for DW_AT_call_return_pc. */
- attr = dwarf2_attr (die, DW_AT_low_pc, cu);
- }
- if (!attr)
+ /* The DWP file version is stored in the hash table. Oh well. */
+ if (dwp_file->cus && dwp_file->tus
+ && dwp_file->cus->version != dwp_file->tus->version)
{
- complaint (&symfile_complaints,
- _("missing DW_AT_call_return_pc for DW_TAG_call_site "
- "DIE 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
- return;
+ /* Technically speaking, we should try to limp along, but this is
+ pretty bizarre. We use pulongest here because that's the established
+ portability solution (e.g, we cannot use %u for uint32_t). */
+ error (_("Dwarf Error: DWP file CU version %s doesn't match"
+ " TU version %s [in DWP file %s]"),
+ pulongest (dwp_file->cus->version),
+ pulongest (dwp_file->tus->version), dwp_name.c_str ());
}
- pc = attr_value_as_address (attr) + baseaddr;
- pc = gdbarch_adjust_dwarf2_addr (gdbarch, pc);
- if (cu->call_site_htab == NULL)
- cu->call_site_htab = htab_create_alloc_ex (16, core_addr_hash, core_addr_eq,
- NULL, &objfile->objfile_obstack,
- hashtab_obstack_allocate, NULL);
- call_site_local.pc = pc;
- slot = htab_find_slot (cu->call_site_htab, &call_site_local, INSERT);
- if (*slot != NULL)
- {
- complaint (&symfile_complaints,
- _("Duplicate PC %s for DW_TAG_call_site "
- "DIE 0x%x [in module %s]"),
- paddress (gdbarch, pc), to_underlying (die->sect_off),
- objfile_name (objfile));
- return;
- }
+ if (dwp_file->cus)
+ dwp_file->version = dwp_file->cus->version;
+ else if (dwp_file->tus)
+ dwp_file->version = dwp_file->tus->version;
+ else
+ dwp_file->version = 2;
- /* Count parameters at the caller. */
+ if (dwp_file->version == 2)
+ bfd_map_over_sections (dwp_file->dbfd.get (),
+ dwarf2_locate_v2_dwp_sections,
+ dwp_file.get ());
- nparams = 0;
- for (child_die = die->child; child_die && child_die->tag;
- child_die = sibling_die (child_die))
- {
- if (child_die->tag != DW_TAG_call_site_parameter
- && child_die->tag != DW_TAG_GNU_call_site_parameter)
- {
- complaint (&symfile_complaints,
- _("Tag %d is not DW_TAG_call_site_parameter in "
- "DW_TAG_call_site child DIE 0x%x [in module %s]"),
- child_die->tag, to_underlying (child_die->sect_off),
- objfile_name (objfile));
- continue;
- }
+ dwp_file->loaded_cus = allocate_dwp_loaded_cutus_table (objfile);
+ dwp_file->loaded_tus = allocate_dwp_loaded_cutus_table (objfile);
- nparams++;
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "DWP file found: %s\n", dwp_file->name);
+ fprintf_unfiltered (gdb_stdlog,
+ " %s CUs, %s TUs\n",
+ pulongest (dwp_file->cus ? dwp_file->cus->nr_units : 0),
+ pulongest (dwp_file->tus ? dwp_file->tus->nr_units : 0));
}
- call_site
- = ((struct call_site *)
- obstack_alloc (&objfile->objfile_obstack,
- sizeof (*call_site)
- + (sizeof (*call_site->parameter) * (nparams - 1))));
- *slot = call_site;
- memset (call_site, 0, sizeof (*call_site) - sizeof (*call_site->parameter));
- call_site->pc = pc;
+ return dwp_file;
+}
- if (dwarf2_flag_true_p (die, DW_AT_call_tail_call, cu)
- || dwarf2_flag_true_p (die, DW_AT_GNU_tail_call, cu))
- {
- struct die_info *func_die;
+/* Wrapper around open_and_init_dwp_file, only open it once. */
- /* Skip also over DW_TAG_inlined_subroutine. */
- for (func_die = die->parent;
- func_die && func_die->tag != DW_TAG_subprogram
- && func_die->tag != DW_TAG_subroutine_type;
- func_die = func_die->parent);
+static struct dwp_file *
+get_dwp_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ if (! dwarf2_per_objfile->dwp_checked)
+ {
+ dwarf2_per_objfile->dwp_file
+ = open_and_init_dwp_file (dwarf2_per_objfile);
+ dwarf2_per_objfile->dwp_checked = 1;
+ }
+ return dwarf2_per_objfile->dwp_file.get ();
+}
- /* DW_AT_call_all_calls is a superset
- of DW_AT_call_all_tail_calls. */
- if (func_die
- && !dwarf2_flag_true_p (func_die, DW_AT_call_all_calls, cu)
- && !dwarf2_flag_true_p (func_die, DW_AT_GNU_all_call_sites, cu)
- && !dwarf2_flag_true_p (func_die, DW_AT_call_all_tail_calls, cu)
- && !dwarf2_flag_true_p (func_die, DW_AT_GNU_all_tail_call_sites, cu))
- {
- /* TYPE_TAIL_CALL_LIST is not interesting in functions where it is
- not complete. But keep CALL_SITE for look ups via call_site_htab,
- both the initial caller containing the real return address PC and
- the final callee containing the current PC of a chain of tail
- calls do not need to have the tail call list complete. But any
- function candidate for a virtual tail call frame searched via
- TYPE_TAIL_CALL_LIST must have the tail call list complete to be
- determined unambiguously. */
- }
- else
- {
- struct type *func_type = NULL;
+/* Subroutine of lookup_dwo_comp_unit, lookup_dwo_type_unit.
+ Look up the CU/TU with signature SIGNATURE, either in DWO file DWO_NAME
+ or in the DWP file for the objfile, referenced by THIS_UNIT.
+ If non-NULL, comp_dir is the DW_AT_comp_dir attribute.
+ IS_DEBUG_TYPES is non-zero if reading a TU, otherwise read a CU.
- if (func_die)
- func_type = get_die_type (func_die, cu);
- if (func_type != NULL)
- {
- gdb_assert (TYPE_CODE (func_type) == TYPE_CODE_FUNC);
+ This is called, for example, when wanting to read a variable with a
+ complex location. Therefore we don't want to do file i/o for every call.
+ Therefore we don't want to look for a DWO file on every call.
+ Therefore we first see if we've already seen SIGNATURE in a DWP file,
+ then we check if we've already seen DWO_NAME, and only THEN do we check
+ for a DWO file.
- /* Enlist this call site to the function. */
- call_site->tail_call_next = TYPE_TAIL_CALL_LIST (func_type);
- TYPE_TAIL_CALL_LIST (func_type) = call_site;
- }
- else
- complaint (&symfile_complaints,
- _("Cannot find function owning DW_TAG_call_site "
- "DIE 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
- }
- }
+ The result is a pointer to the dwo_unit object or NULL if we didn't find it
+ (dwo_id mismatch or couldn't find the DWO/DWP file). */
- attr = dwarf2_attr (die, DW_AT_call_target, cu);
- if (attr == NULL)
- attr = dwarf2_attr (die, DW_AT_GNU_call_site_target, cu);
- if (attr == NULL)
- attr = dwarf2_attr (die, DW_AT_call_origin, cu);
- if (attr == NULL)
- {
- /* This was a pre-DWARF-5 GNU extension alias for DW_AT_call_origin. */
- attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
- }
- SET_FIELD_DWARF_BLOCK (call_site->target, NULL);
- if (!attr || (attr_form_is_block (attr) && DW_BLOCK (attr)->size == 0))
- /* Keep NULL DWARF_BLOCK. */;
- else if (attr_form_is_block (attr))
- {
- struct dwarf2_locexpr_baton *dlbaton;
+static struct dwo_unit *
+lookup_dwo_cutu (struct dwarf2_per_cu_data *this_unit,
+ const char *dwo_name, const char *comp_dir,
+ ULONGEST signature, int is_debug_types)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = this_unit->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ const char *kind = is_debug_types ? "TU" : "CU";
+ void **dwo_file_slot;
+ struct dwo_file *dwo_file;
+ struct dwp_file *dwp_file;
- dlbaton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
- dlbaton->data = DW_BLOCK (attr)->data;
- dlbaton->size = DW_BLOCK (attr)->size;
- dlbaton->per_cu = cu->per_cu;
+ /* First see if there's a DWP file.
+ If we have a DWP file but didn't find the DWO inside it, don't
+ look for the original DWO file. It makes gdb behave differently
+ depending on whether one is debugging in the build tree. */
- SET_FIELD_DWARF_BLOCK (call_site->target, dlbaton);
- }
- else if (attr_form_is_ref (attr))
+ dwp_file = get_dwp_file (dwarf2_per_objfile);
+ if (dwp_file != NULL)
{
- struct dwarf2_cu *target_cu = cu;
- struct die_info *target_die;
-
- target_die = follow_die_ref (die, attr, &target_cu);
- gdb_assert (target_cu->objfile == objfile);
- if (die_is_declaration (target_die, target_cu))
- {
- const char *target_physname;
+ const struct dwp_hash_table *dwp_htab =
+ is_debug_types ? dwp_file->tus : dwp_file->cus;
- /* Prefer the mangled name; otherwise compute the demangled one. */
- target_physname = dw2_linkage_name (target_die, target_cu);
- if (target_physname == NULL)
- target_physname = dwarf2_physname (NULL, target_die, target_cu);
- if (target_physname == NULL)
- complaint (&symfile_complaints,
- _("DW_AT_call_target target DIE has invalid "
- "physname, for referencing DIE 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
- else
- SET_FIELD_PHYSNAME (call_site->target, target_physname);
- }
- else
+ if (dwp_htab != NULL)
{
- CORE_ADDR lowpc;
+ struct dwo_unit *dwo_cutu =
+ lookup_dwo_unit_in_dwp (dwarf2_per_objfile, dwp_file, comp_dir,
+ signature, is_debug_types);
- /* DW_AT_entry_pc should be preferred. */
- if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, NULL)
- <= PC_BOUNDS_INVALID)
- complaint (&symfile_complaints,
- _("DW_AT_call_target target DIE has invalid "
- "low pc, for referencing DIE 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
- else
+ if (dwo_cutu != NULL)
{
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
- SET_FIELD_PHYSADDR (call_site->target, lowpc);
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog,
+ "Virtual DWO %s %s found: @%s\n",
+ kind, hex_string (signature),
+ host_address_to_string (dwo_cutu));
+ }
+ return dwo_cutu;
}
}
}
else
- complaint (&symfile_complaints,
- _("DW_TAG_call_site DW_AT_call_target is neither "
- "block nor reference, for DIE 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
-
- call_site->per_cu = cu->per_cu;
-
- for (child_die = die->child;
- child_die && child_die->tag;
- child_die = sibling_die (child_die))
{
- struct call_site_parameter *parameter;
- struct attribute *loc, *origin;
+ /* No DWP file, look for the DWO file. */
- if (child_die->tag != DW_TAG_call_site_parameter
- && child_die->tag != DW_TAG_GNU_call_site_parameter)
+ dwo_file_slot = lookup_dwo_file_slot (dwarf2_per_objfile,
+ dwo_name, comp_dir);
+ if (*dwo_file_slot == NULL)
{
- /* Already printed the complaint above. */
- continue;
+ /* Read in the file and build a table of the CUs/TUs it contains. */
+ *dwo_file_slot = open_and_init_dwo_file (this_unit, dwo_name, comp_dir);
}
+ /* NOTE: This will be NULL if unable to open the file. */
+ dwo_file = (struct dwo_file *) *dwo_file_slot;
- gdb_assert (call_site->parameter_count < nparams);
- parameter = &call_site->parameter[call_site->parameter_count];
-
- /* DW_AT_location specifies the register number or DW_AT_abstract_origin
- specifies DW_TAG_formal_parameter. Value of the data assumed for the
- register is contained in DW_AT_call_value. */
-
- loc = dwarf2_attr (child_die, DW_AT_location, cu);
- origin = dwarf2_attr (child_die, DW_AT_call_parameter, cu);
- if (origin == NULL)
- {
- /* This was a pre-DWARF-5 GNU extension alias
- for DW_AT_call_parameter. */
- origin = dwarf2_attr (child_die, DW_AT_abstract_origin, cu);
- }
- if (loc == NULL && origin != NULL && attr_form_is_ref (origin))
+ if (dwo_file != NULL)
{
- parameter->kind = CALL_SITE_PARAMETER_PARAM_OFFSET;
+ struct dwo_unit *dwo_cutu = NULL;
- sect_offset sect_off
- = (sect_offset) dwarf2_get_ref_die_offset (origin);
- if (!offset_in_cu_p (&cu->header, sect_off))
+ if (is_debug_types && dwo_file->tus)
{
- /* As DW_OP_GNU_parameter_ref uses CU-relative offset this
- binding can be done only inside one CU. Such referenced DIE
- therefore cannot be even moved to DW_TAG_partial_unit. */
- complaint (&symfile_complaints,
- _("DW_AT_call_parameter offset is not in CU for "
- "DW_TAG_call_site child DIE 0x%x [in module %s]"),
- to_underlying (child_die->sect_off),
- objfile_name (objfile));
- continue;
+ struct dwo_unit find_dwo_cutu;
+
+ memset (&find_dwo_cutu, 0, sizeof (find_dwo_cutu));
+ find_dwo_cutu.signature = signature;
+ dwo_cutu
+ = (struct dwo_unit *) htab_find (dwo_file->tus, &find_dwo_cutu);
}
- parameter->u.param_cu_off
- = (cu_offset) (sect_off - cu->header.sect_off);
- }
- else if (loc == NULL || origin != NULL || !attr_form_is_block (loc))
- {
- complaint (&symfile_complaints,
- _("No DW_FORM_block* DW_AT_location for "
- "DW_TAG_call_site child DIE 0x%x [in module %s]"),
- to_underlying (child_die->sect_off), objfile_name (objfile));
- continue;
- }
- else
- {
- parameter->u.dwarf_reg = dwarf_block_to_dwarf_reg
- (DW_BLOCK (loc)->data, &DW_BLOCK (loc)->data[DW_BLOCK (loc)->size]);
- if (parameter->u.dwarf_reg != -1)
- parameter->kind = CALL_SITE_PARAMETER_DWARF_REG;
- else if (dwarf_block_to_sp_offset (gdbarch, DW_BLOCK (loc)->data,
- &DW_BLOCK (loc)->data[DW_BLOCK (loc)->size],
- ¶meter->u.fb_offset))
- parameter->kind = CALL_SITE_PARAMETER_FB_OFFSET;
- else
+ else if (!is_debug_types && dwo_file->cus)
{
- complaint (&symfile_complaints,
- _("Only single DW_OP_reg or DW_OP_fbreg is supported "
- "for DW_FORM_block* DW_AT_location is supported for "
- "DW_TAG_call_site child DIE 0x%x "
- "[in module %s]"),
- to_underlying (child_die->sect_off),
- objfile_name (objfile));
- continue;
- }
- }
-
- attr = dwarf2_attr (child_die, DW_AT_call_value, cu);
- if (attr == NULL)
- attr = dwarf2_attr (child_die, DW_AT_GNU_call_site_value, cu);
- if (!attr_form_is_block (attr))
- {
- complaint (&symfile_complaints,
- _("No DW_FORM_block* DW_AT_call_value for "
- "DW_TAG_call_site child DIE 0x%x [in module %s]"),
- to_underlying (child_die->sect_off),
- objfile_name (objfile));
- continue;
- }
- parameter->value = DW_BLOCK (attr)->data;
- parameter->value_size = DW_BLOCK (attr)->size;
+ struct dwo_unit find_dwo_cutu;
- /* Parameters are not pre-cleared by memset above. */
- parameter->data_value = NULL;
- parameter->data_value_size = 0;
- call_site->parameter_count++;
+ memset (&find_dwo_cutu, 0, sizeof (find_dwo_cutu));
+ find_dwo_cutu.signature = signature;
+ dwo_cutu = (struct dwo_unit *)htab_find (dwo_file->cus,
+ &find_dwo_cutu);
+ }
- attr = dwarf2_attr (child_die, DW_AT_call_data_value, cu);
- if (attr == NULL)
- attr = dwarf2_attr (child_die, DW_AT_GNU_call_site_data_value, cu);
- if (attr)
- {
- if (!attr_form_is_block (attr))
- complaint (&symfile_complaints,
- _("No DW_FORM_block* DW_AT_call_data_value for "
- "DW_TAG_call_site child DIE 0x%x [in module %s]"),
- to_underlying (child_die->sect_off),
- objfile_name (objfile));
- else
+ if (dwo_cutu != NULL)
{
- parameter->data_value = DW_BLOCK (attr)->data;
- parameter->data_value_size = DW_BLOCK (attr)->size;
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "DWO %s %s(%s) found: @%s\n",
+ kind, dwo_name, hex_string (signature),
+ host_address_to_string (dwo_cutu));
+ }
+ return dwo_cutu;
}
}
}
+
+ /* We didn't find it. This could mean a dwo_id mismatch, or
+ someone deleted the DWO/DWP file, or the search path isn't set up
+ correctly to find the file. */
+
+ if (dwarf_read_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog, "DWO %s %s(%s) not found\n",
+ kind, dwo_name, hex_string (signature));
+ }
+
+ /* This is a warning and not a complaint because it can be caused by
+ pilot error (e.g., user accidentally deleting the DWO). */
+ {
+ /* Print the name of the DWP file if we looked there, helps the user
+ better diagnose the problem. */
+ std::string dwp_text;
+
+ if (dwp_file != NULL)
+ dwp_text = string_printf (" [in DWP file %s]",
+ lbasename (dwp_file->name));
+
+ warning (_("Could not find DWO %s %s(%s)%s referenced by %s at offset %s"
+ " [in module %s]"),
+ kind, dwo_name, hex_string (signature),
+ dwp_text.c_str (),
+ this_unit->is_debug_types ? "TU" : "CU",
+ sect_offset_str (this_unit->sect_off), objfile_name (objfile));
+ }
+ return NULL;
}
-/* Helper function for read_variable. If DIE represents a virtual
- table, then return the type of the concrete object that is
- associated with the virtual table. Otherwise, return NULL. */
+/* Lookup the DWO CU DWO_NAME/SIGNATURE referenced from THIS_CU.
+ See lookup_dwo_cutu_unit for details. */
-static struct type *
-rust_containing_type (struct die_info *die, struct dwarf2_cu *cu)
+static struct dwo_unit *
+lookup_dwo_comp_unit (struct dwarf2_per_cu_data *this_cu,
+ const char *dwo_name, const char *comp_dir,
+ ULONGEST signature)
{
- struct attribute *attr = dwarf2_attr (die, DW_AT_type, cu);
- if (attr == NULL)
- return NULL;
-
- /* Find the type DIE. */
- struct die_info *type_die = NULL;
- struct dwarf2_cu *type_cu = cu;
+ return lookup_dwo_cutu (this_cu, dwo_name, comp_dir, signature, 0);
+}
- if (attr_form_is_ref (attr))
- type_die = follow_die_ref (die, attr, &type_cu);
- if (type_die == NULL)
- return NULL;
+/* Lookup the DWO TU DWO_NAME/SIGNATURE referenced from THIS_TU.
+ See lookup_dwo_cutu_unit for details. */
- if (dwarf2_attr (type_die, DW_AT_containing_type, type_cu) == NULL)
- return NULL;
- return die_containing_type (type_die, type_cu);
+static struct dwo_unit *
+lookup_dwo_type_unit (struct signatured_type *this_tu,
+ const char *dwo_name, const char *comp_dir)
+{
+ return lookup_dwo_cutu (&this_tu->per_cu, dwo_name, comp_dir, this_tu->signature, 1);
}
-/* Read a variable (DW_TAG_variable) DIE and create a new symbol. */
+/* Traversal function for queue_and_load_all_dwo_tus. */
-static void
-read_variable (struct die_info *die, struct dwarf2_cu *cu)
+static int
+queue_and_load_dwo_tu (void **slot, void *info)
{
- struct rust_vtable_symbol *storage = NULL;
+ struct dwo_unit *dwo_unit = (struct dwo_unit *) *slot;
+ struct dwarf2_per_cu_data *per_cu = (struct dwarf2_per_cu_data *) info;
+ ULONGEST signature = dwo_unit->signature;
+ struct signatured_type *sig_type =
+ lookup_dwo_signatured_type (per_cu->cu, signature);
- if (cu->language == language_rust)
+ if (sig_type != NULL)
{
- struct type *containing_type = rust_containing_type (die, cu);
-
- if (containing_type != NULL)
- {
- struct objfile *objfile = cu->objfile;
+ struct dwarf2_per_cu_data *sig_cu = &sig_type->per_cu;
- storage = OBSTACK_ZALLOC (&objfile->objfile_obstack,
- struct rust_vtable_symbol);
- initialize_objfile_symbol (storage);
- storage->concrete_type = containing_type;
- storage->subclass = SYMBOL_RUST_VTABLE;
- }
+ /* We pass NULL for DEPENDENT_CU because we don't yet know if there's
+ a real dependency of PER_CU on SIG_TYPE. That is detected later
+ while processing PER_CU. */
+ if (maybe_queue_comp_unit (NULL, sig_cu, per_cu->cu->language))
+ load_full_type_unit (sig_cu);
+ VEC_safe_push (dwarf2_per_cu_ptr, per_cu->imported_symtabs, sig_cu);
}
- new_symbol_full (die, NULL, cu, storage);
+ return 1;
}
-/* Call CALLBACK from DW_AT_ranges attribute value OFFSET
- reading .debug_rnglists.
- Callback's type should be:
- void (CORE_ADDR range_beginning, CORE_ADDR range_end)
- Return true if the attributes are present and valid, otherwise,
- return false. */
+/* Queue all TUs contained in the DWO of PER_CU to be read in.
+ The DWO may have the only definition of the type, though it may not be
+ referenced anywhere in PER_CU. Thus we have to load *all* its TUs.
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15021 */
-template <typename Callback>
-static bool
-dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu,
- Callback &&callback)
+static void
+queue_and_load_all_dwo_tus (struct dwarf2_per_cu_data *per_cu)
{
- struct objfile *objfile = cu->objfile;
- bfd *obfd = objfile->obfd;
- /* Base address selection entry. */
- CORE_ADDR base;
- int found_base;
- const gdb_byte *buffer;
- CORE_ADDR baseaddr;
- bool overflow = false;
+ struct dwo_unit *dwo_unit;
+ struct dwo_file *dwo_file;
- found_base = cu->base_known;
- base = cu->base_address;
+ gdb_assert (!per_cu->is_debug_types);
+ gdb_assert (get_dwp_file (per_cu->dwarf2_per_objfile) == NULL);
+ gdb_assert (per_cu->cu != NULL);
- dwarf2_read_section (objfile, &dwarf2_per_objfile->rnglists);
- if (offset >= dwarf2_per_objfile->rnglists.size)
- {
- complaint (&symfile_complaints,
- _("Offset %d out of bounds for DW_AT_ranges attribute"),
- offset);
- return false;
- }
- buffer = dwarf2_per_objfile->rnglists.buffer + offset;
+ dwo_unit = per_cu->cu->dwo_unit;
+ gdb_assert (dwo_unit != NULL);
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ dwo_file = dwo_unit->dwo_file;
+ if (dwo_file->tus != NULL)
+ htab_traverse_noresize (dwo_file->tus, queue_and_load_dwo_tu, per_cu);
+}
- while (1)
- {
- /* Initialize it due to a false compiler warning. */
- CORE_ADDR range_beginning = 0, range_end = 0;
- const gdb_byte *buf_end = (dwarf2_per_objfile->rnglists.buffer
- + dwarf2_per_objfile->rnglists.size);
- unsigned int bytes_read;
+/* Free all resources associated with DWO_FILE.
+ Close the DWO file and munmap the sections. */
- if (buffer == buf_end)
- {
- overflow = true;
- break;
- }
- const auto rlet = static_cast<enum dwarf_range_list_entry>(*buffer++);
- switch (rlet)
- {
- case DW_RLE_end_of_list:
- break;
- case DW_RLE_base_address:
- if (buffer + cu->header.addr_size > buf_end)
- {
- overflow = true;
- break;
- }
- base = read_address (obfd, buffer, cu, &bytes_read);
- found_base = 1;
- buffer += bytes_read;
- break;
- case DW_RLE_start_length:
- if (buffer + cu->header.addr_size > buf_end)
- {
- overflow = true;
- break;
- }
- range_beginning = read_address (obfd, buffer, cu, &bytes_read);
- buffer += bytes_read;
- range_end = (range_beginning
- + read_unsigned_leb128 (obfd, buffer, &bytes_read));
- buffer += bytes_read;
- if (buffer > buf_end)
- {
- overflow = true;
- break;
- }
- break;
- case DW_RLE_offset_pair:
- range_beginning = read_unsigned_leb128 (obfd, buffer, &bytes_read);
- buffer += bytes_read;
- if (buffer > buf_end)
- {
- overflow = true;
- break;
- }
- range_end = read_unsigned_leb128 (obfd, buffer, &bytes_read);
- buffer += bytes_read;
- if (buffer > buf_end)
- {
- overflow = true;
- break;
- }
- break;
- case DW_RLE_start_end:
- if (buffer + 2 * cu->header.addr_size > buf_end)
- {
- overflow = true;
- break;
- }
- range_beginning = read_address (obfd, buffer, cu, &bytes_read);
- buffer += bytes_read;
- range_end = read_address (obfd, buffer, cu, &bytes_read);
- buffer += bytes_read;
- break;
- default:
- complaint (&symfile_complaints,
- _("Invalid .debug_rnglists data (no base address)"));
- return false;
- }
- if (rlet == DW_RLE_end_of_list || overflow)
- break;
- if (rlet == DW_RLE_base_address)
- continue;
-
- if (!found_base)
- {
- /* We have no valid base address for the ranges
- data. */
- complaint (&symfile_complaints,
- _("Invalid .debug_rnglists data (no base address)"));
- return false;
- }
+static void
+free_dwo_file (struct dwo_file *dwo_file)
+{
+ /* Note: dbfd is NULL for virtual DWO files. */
+ gdb_bfd_unref (dwo_file->dbfd);
- if (range_beginning > range_end)
- {
- /* Inverted range entries are invalid. */
- complaint (&symfile_complaints,
- _("Invalid .debug_rnglists data (inverted range)"));
- return false;
- }
+ VEC_free (dwarf2_section_info_def, dwo_file->sections.types);
+}
- /* Empty range entries have no effect. */
- if (range_beginning == range_end)
- continue;
+/* Traversal function for free_dwo_files. */
- range_beginning += base;
- range_end += base;
+static int
+free_dwo_file_from_slot (void **slot, void *info)
+{
+ struct dwo_file *dwo_file = (struct dwo_file *) *slot;
- /* A not-uncommon case of bad debug info.
- Don't pollute the addrmap with bad data. */
- if (range_beginning + baseaddr == 0
- && !dwarf2_per_objfile->has_section_at_zero)
- {
- complaint (&symfile_complaints,
- _(".debug_rnglists entry has start address of zero"
- " [in module %s]"), objfile_name (objfile));
- continue;
- }
+ free_dwo_file (dwo_file);
- callback (range_beginning, range_end);
- }
+ return 1;
+}
- if (overflow)
- {
- complaint (&symfile_complaints,
- _("Offset %d is not terminated "
- "for DW_AT_ranges attribute"),
- offset);
- return false;
- }
+/* Free all resources associated with DWO_FILES. */
- return true;
+static void
+free_dwo_files (htab_t dwo_files, struct objfile *objfile)
+{
+ htab_traverse_noresize (dwo_files, free_dwo_file_from_slot, objfile);
}
+\f
+/* Read in various DIEs. */
-/* Call CALLBACK from DW_AT_ranges attribute value OFFSET reading .debug_ranges.
- Callback's type should be:
- void (CORE_ADDR range_beginning, CORE_ADDR range_end)
- Return 1 if the attributes are present and valid, otherwise, return 0. */
+/* DW_AT_abstract_origin inherits whole DIEs (not just their attributes).
+ Inherit only the children of the DW_AT_abstract_origin DIE not being
+ already referenced by DW_AT_abstract_origin from the children of the
+ current DIE. */
-template <typename Callback>
-static int
-dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu,
- Callback &&callback)
+static void
+inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- struct comp_unit_head *cu_header = &cu->header;
- bfd *obfd = objfile->obfd;
- unsigned int addr_size = cu_header->addr_size;
- CORE_ADDR mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
- /* Base address selection entry. */
- CORE_ADDR base;
- int found_base;
- unsigned int dummy;
- const gdb_byte *buffer;
- CORE_ADDR baseaddr;
+ struct die_info *child_die;
+ sect_offset *offsetp;
+ /* Parent of DIE - referenced by DW_AT_abstract_origin. */
+ struct die_info *origin_die;
+ /* Iterator of the ORIGIN_DIE children. */
+ struct die_info *origin_child_die;
+ struct attribute *attr;
+ struct dwarf2_cu *origin_cu;
+ struct pending **origin_previous_list_in_scope;
- if (cu_header->version >= 5)
- return dwarf2_rnglists_process (offset, cu, callback);
+ attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
+ if (!attr)
+ return;
- found_base = cu->base_known;
- base = cu->base_address;
+ /* Note that following die references may follow to a die in a
+ different cu. */
- dwarf2_read_section (objfile, &dwarf2_per_objfile->ranges);
- if (offset >= dwarf2_per_objfile->ranges.size)
- {
- complaint (&symfile_complaints,
- _("Offset %d out of bounds for DW_AT_ranges attribute"),
- offset);
- return 0;
- }
- buffer = dwarf2_per_objfile->ranges.buffer + offset;
+ origin_cu = cu;
+ origin_die = follow_die_ref (die, attr, &origin_cu);
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ /* We're inheriting ORIGIN's children into the scope we'd put DIE's
+ symbols in. */
+ origin_previous_list_in_scope = origin_cu->list_in_scope;
+ origin_cu->list_in_scope = cu->list_in_scope;
- while (1)
- {
- CORE_ADDR range_beginning, range_end;
+ if (die->tag != origin_die->tag
+ && !(die->tag == DW_TAG_inlined_subroutine
+ && origin_die->tag == DW_TAG_subprogram))
+ complaint (_("DIE %s and its abstract origin %s have different tags"),
+ sect_offset_str (die->sect_off),
+ sect_offset_str (origin_die->sect_off));
- range_beginning = read_address (obfd, buffer, cu, &dummy);
- buffer += addr_size;
- range_end = read_address (obfd, buffer, cu, &dummy);
- buffer += addr_size;
- offset += 2 * addr_size;
+ std::vector<sect_offset> offsets;
- /* 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;
+ for (child_die = die->child;
+ child_die && child_die->tag;
+ child_die = sibling_die (child_die))
+ {
+ struct die_info *child_origin_die;
+ struct dwarf2_cu *child_origin_cu;
- /* 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 we already
- have the base address in range_end. */
- base = range_end;
- found_base = 1;
- continue;
- }
+ /* We are trying to process concrete instance entries:
+ DW_TAG_call_site DIEs indeed have a DW_AT_abstract_origin tag, but
+ it's not relevant to our analysis here. i.e. detecting DIEs that are
+ present in the abstract instance but not referenced in the concrete
+ one. */
+ if (child_die->tag == DW_TAG_call_site
+ || child_die->tag == DW_TAG_GNU_call_site)
+ continue;
- if (!found_base)
+ /* For each CHILD_DIE, find the corresponding child of
+ ORIGIN_DIE. If there is more than one layer of
+ DW_AT_abstract_origin, follow them all; there shouldn't be,
+ but GCC versions at least through 4.4 generate this (GCC PR
+ 40573). */
+ child_origin_die = child_die;
+ child_origin_cu = cu;
+ while (1)
{
- /* We have no valid base address for the ranges
- data. */
- complaint (&symfile_complaints,
- _("Invalid .debug_ranges data (no base address)"));
- return 0;
+ attr = dwarf2_attr (child_origin_die, DW_AT_abstract_origin,
+ child_origin_cu);
+ if (attr == NULL)
+ break;
+ child_origin_die = follow_die_ref (child_origin_die, attr,
+ &child_origin_cu);
}
- if (range_beginning > range_end)
+ /* According to DWARF3 3.3.8.2 #3 new entries without their abstract
+ counterpart may exist. */
+ if (child_origin_die != child_die)
{
- /* Inverted range entries are invalid. */
- complaint (&symfile_complaints,
- _("Invalid .debug_ranges data (inverted range)"));
- return 0;
+ if (child_die->tag != child_origin_die->tag
+ && !(child_die->tag == DW_TAG_inlined_subroutine
+ && child_origin_die->tag == DW_TAG_subprogram))
+ complaint (_("Child DIE %s and its abstract origin %s have "
+ "different tags"),
+ sect_offset_str (child_die->sect_off),
+ sect_offset_str (child_origin_die->sect_off));
+ if (child_origin_die->parent != origin_die)
+ complaint (_("Child DIE %s and its abstract origin %s have "
+ "different parents"),
+ sect_offset_str (child_die->sect_off),
+ sect_offset_str (child_origin_die->sect_off));
+ else
+ offsets.push_back (child_origin_die->sect_off);
}
+ }
+ std::sort (offsets.begin (), offsets.end ());
+ sect_offset *offsets_end = offsets.data () + offsets.size ();
+ for (offsetp = offsets.data () + 1; offsetp < offsets_end; offsetp++)
+ if (offsetp[-1] == *offsetp)
+ complaint (_("Multiple children of DIE %s refer "
+ "to DIE %s as their abstract origin"),
+ sect_offset_str (die->sect_off), sect_offset_str (*offsetp));
- /* Empty range entries have no effect. */
- if (range_beginning == range_end)
- continue;
-
- range_beginning += base;
- range_end += base;
-
- /* A not-uncommon case of bad debug info.
- Don't pollute the addrmap with bad data. */
- if (range_beginning + baseaddr == 0
- && !dwarf2_per_objfile->has_section_at_zero)
+ offsetp = offsets.data ();
+ origin_child_die = origin_die->child;
+ while (origin_child_die && origin_child_die->tag)
+ {
+ /* Is ORIGIN_CHILD_DIE referenced by any of the DIE children? */
+ while (offsetp < offsets_end
+ && *offsetp < origin_child_die->sect_off)
+ offsetp++;
+ if (offsetp >= offsets_end
+ || *offsetp > origin_child_die->sect_off)
{
- complaint (&symfile_complaints,
- _(".debug_ranges entry has start address of zero"
- " [in module %s]"), objfile_name (objfile));
- continue;
+ /* Found that ORIGIN_CHILD_DIE is really not referenced.
+ Check whether we're already processing ORIGIN_CHILD_DIE.
+ This can happen with mutually referenced abstract_origins.
+ PR 16581. */
+ if (!origin_child_die->in_process)
+ process_die (origin_child_die, origin_cu);
}
-
- callback (range_beginning, range_end);
+ origin_child_die = sibling_die (origin_child_die);
}
-
- return 1;
+ origin_cu->list_in_scope = origin_previous_list_in_scope;
}
-/* Get low and high pc attributes from DW_AT_ranges attribute value OFFSET.
- Return 1 if the attributes are present and valid, otherwise, return 0.
- If RANGES_PST is not NULL we should setup `objfile->psymtabs_addrmap'. */
-
-static int
-dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
- CORE_ADDR *high_return, struct dwarf2_cu *cu,
- struct partial_symtab *ranges_pst)
+static void
+read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
struct gdbarch *gdbarch = get_objfile_arch (objfile);
- const CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
- SECT_OFF_TEXT (objfile));
- int low_set = 0;
- CORE_ADDR low = 0;
- CORE_ADDR high = 0;
- int retval;
+ struct context_stack *newobj;
+ CORE_ADDR lowpc;
+ CORE_ADDR highpc;
+ struct die_info *child_die;
+ struct attribute *attr, *call_line, *call_file;
+ const char *name;
+ CORE_ADDR baseaddr;
+ struct block *block;
+ int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
+ std::vector<struct symbol *> template_args;
+ struct template_symbol *templ_func = NULL;
- retval = dwarf2_ranges_process (offset, cu,
- [&] (CORE_ADDR range_beginning, CORE_ADDR range_end)
+ if (inlined_func)
{
- if (ranges_pst != NULL)
- {
- CORE_ADDR lowpc;
- CORE_ADDR highpc;
-
- lowpc = gdbarch_adjust_dwarf2_addr (gdbarch,
- range_beginning + baseaddr);
- highpc = gdbarch_adjust_dwarf2_addr (gdbarch,
- range_end + baseaddr);
- addrmap_set_empty (objfile->psymtabs_addrmap, lowpc, highpc - 1,
- ranges_pst);
- }
-
- /* 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 we do not have call site information, we can't show the
+ caller of this inlined function. That's too confusing, so
+ only use the scope for local variables. */
+ call_line = dwarf2_attr (die, DW_AT_call_line, cu);
+ call_file = dwarf2_attr (die, DW_AT_call_file, cu);
+ if (call_line == NULL || call_file == NULL)
{
- if (range_beginning < low)
- low = range_beginning;
- if (range_end > high)
- high = range_end;
+ read_lexical_block_scope (die, cu);
+ return;
}
- });
- if (!retval)
- return 0;
-
- 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;
-
- if (low_return)
- *low_return = low;
- if (high_return)
- *high_return = high;
- return 1;
-}
+ }
-/* Get low and high pc attributes from a die. See enum pc_bounds_kind
- definition for the return value. *LOWPC and *HIGHPC are set iff
- neither PC_BOUNDS_NOT_PRESENT nor PC_BOUNDS_INVALID are returned. */
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-static enum pc_bounds_kind
-dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
- CORE_ADDR *highpc, struct dwarf2_cu *cu,
- struct partial_symtab *pst)
-{
- struct attribute *attr;
- struct attribute *attr_high;
- CORE_ADDR low = 0;
- CORE_ADDR high = 0;
- enum pc_bounds_kind ret;
+ name = dwarf2_name (die, cu);
- attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
- if (attr_high)
+ /* Ignore functions with missing or empty names. These are actually
+ illegal according to the DWARF standard. */
+ if (name == NULL)
{
- attr = dwarf2_attr (die, DW_AT_low_pc, cu);
- if (attr)
- {
- low = attr_value_as_address (attr);
- high = attr_value_as_address (attr_high);
- if (cu->header.version >= 4 && attr_form_is_constant (attr_high))
- high += low;
- }
- else
- /* Found high w/o low attribute. */
- return PC_BOUNDS_INVALID;
+ complaint (_("missing name for subprogram DIE at %s"),
+ sect_offset_str (die->sect_off));
+ return;
+ }
- /* Found consecutive range of addresses. */
- ret = PC_BOUNDS_HIGH_LOW;
+ /* Ignore functions with missing or invalid low and high pc attributes. */
+ if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL)
+ <= PC_BOUNDS_INVALID)
+ {
+ attr = dwarf2_attr (die, DW_AT_external, cu);
+ if (!attr || !DW_UNSND (attr))
+ complaint (_("cannot get low and high bounds "
+ "for subprogram DIE at %s"),
+ sect_offset_str (die->sect_off));
+ return;
}
- else
+
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
+ highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
+
+ /* If we have any template arguments, then we must allocate a
+ different sort of symbol. */
+ for (child_die = die->child; child_die; child_die = sibling_die (child_die))
{
- attr = dwarf2_attr (die, DW_AT_ranges, cu);
- if (attr != NULL)
+ if (child_die->tag == DW_TAG_template_type_param
+ || child_die->tag == DW_TAG_template_value_param)
{
- /* DW_AT_ranges_base does not apply to DIEs from the DWO skeleton.
- We take advantage of the fact that DW_AT_ranges does not appear
- in DW_TAG_compile_unit of DWO files. */
- int need_ranges_base = die->tag != DW_TAG_compile_unit;
- unsigned int ranges_offset = (DW_UNSND (attr)
- + (need_ranges_base
- ? cu->ranges_base
- : 0));
-
- /* Value of the DW_AT_ranges attribute is the offset in the
- .debug_ranges section. */
- if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu, pst))
- return PC_BOUNDS_INVALID;
- /* Found discontinuous range of addresses. */
- ret = PC_BOUNDS_RANGES;
+ templ_func = allocate_template_symbol (objfile);
+ templ_func->subclass = SYMBOL_TEMPLATE;
+ break;
}
- else
- return PC_BOUNDS_NOT_PRESENT;
}
- /* read_partial_die has also the strict LOW < HIGH requirement. */
- if (high <= low)
- return PC_BOUNDS_INVALID;
-
- /* 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 (low == 0 && !dwarf2_per_objfile->has_section_at_zero)
- return PC_BOUNDS_INVALID;
-
- *lowpc = low;
- if (highpc)
- *highpc = high;
- return ret;
-}
-
-/* Assuming that DIE represents a subprogram DIE or a lexical block, get
- its low and high PC addresses. Do nothing if these addresses could not
- be determined. Otherwise, set LOWPC to the low address if it is smaller,
- and HIGHPC to the high address if greater than HIGHPC. */
+ newobj = push_context (0, lowpc);
+ newobj->name = new_symbol (die, read_type_die (die, cu), cu,
+ (struct symbol *) templ_func);
-static void
-dwarf2_get_subprogram_pc_bounds (struct die_info *die,
- CORE_ADDR *lowpc, CORE_ADDR *highpc,
- struct dwarf2_cu *cu)
-{
- CORE_ADDR low, high;
- struct die_info *child = die->child;
+ /* If there is a location expression for DW_AT_frame_base, record
+ it. */
+ attr = dwarf2_attr (die, DW_AT_frame_base, cu);
+ if (attr)
+ dwarf2_symbol_mark_computed (attr, newobj->name, cu, 1);
- if (dwarf2_get_pc_bounds (die, &low, &high, cu, NULL) >= PC_BOUNDS_RANGES)
+ /* If there is a location for the static link, record it. */
+ newobj->static_link = NULL;
+ attr = dwarf2_attr (die, DW_AT_static_link, cu);
+ if (attr)
{
- *lowpc = std::min (*lowpc, low);
- *highpc = std::max (*highpc, high);
+ newobj->static_link
+ = XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
+ attr_to_dynamic_prop (attr, die, cu, newobj->static_link);
}
- /* If the language does not allow nested subprograms (either inside
- subprograms or lexical blocks), we're done. */
- if (cu->language != language_ada)
- return;
+ cu->list_in_scope = &local_symbols;
- /* Check all the children of the given DIE. If it contains nested
- subprograms, then check their pc bounds. Likewise, we need to
- check lexical blocks as well, as they may also contain subprogram
- definitions. */
- while (child && child->tag)
+ if (die->child != NULL)
{
- if (child->tag == DW_TAG_subprogram
- || child->tag == DW_TAG_lexical_block)
- dwarf2_get_subprogram_pc_bounds (child, lowpc, highpc, cu);
- child = sibling_die (child);
- }
-}
+ child_die = die->child;
+ while (child_die && child_die->tag)
+ {
+ if (child_die->tag == DW_TAG_template_type_param
+ || child_die->tag == DW_TAG_template_value_param)
+ {
+ struct symbol *arg = new_symbol (child_die, NULL, cu);
-/* 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. */
+ if (arg != NULL)
+ template_args.push_back (arg);
+ }
+ else
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
+ }
+ }
-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;
+ inherit_abstract_dies (die, cu);
- if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, NULL)
- >= PC_BOUNDS_RANGES)
- {
- best_low = current_low;
- best_high = current_high;
- }
- else
+ /* If we have a DW_AT_specification, we might need to import using
+ directives from the context of the specification DIE. See the
+ comment in determine_prefix. */
+ if (cu->language == language_cplus
+ && dwarf2_attr (die, DW_AT_specification, cu))
{
- struct die_info *child = die->child;
+ struct dwarf2_cu *spec_cu = cu;
+ struct die_info *spec_die = die_specification (die, &spec_cu);
- while (child && child->tag)
+ while (spec_die)
{
- switch (child->tag) {
- case DW_TAG_subprogram:
- dwarf2_get_subprogram_pc_bounds (child, &best_low, &best_high, cu);
- break;
- case DW_TAG_namespace:
- case DW_TAG_module:
- /* 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 = std::min (best_low, current_low);
- best_high = std::max (best_high, current_high);
- }
- break;
- default:
- /* Ignore. */
- break;
- }
+ child_die = spec_die->child;
+ while (child_die && child_die->tag)
+ {
+ if (child_die->tag == DW_TAG_imported_module)
+ process_die (child_die, spec_cu);
+ child_die = sibling_die (child_die);
+ }
- child = sibling_die (child);
+ /* In some cases, GCC generates specification DIEs that
+ themselves contain DW_AT_specification attributes. */
+ spec_die = die_specification (spec_die, &spec_cu);
}
}
- *lowpc = best_low;
- *highpc = best_high;
+ newobj = pop_context ();
+ /* Make a block for the local symbols within. */
+ block = finish_block (newobj->name, &local_symbols, newobj->old_blocks,
+ newobj->static_link, lowpc, highpc);
+
+ /* For C++, set the block's scope. */
+ if ((cu->language == language_cplus
+ || cu->language == language_fortran
+ || cu->language == language_d
+ || cu->language == language_rust)
+ && cu->processing_has_namespace_info)
+ block_set_scope (block, determine_prefix (die, cu),
+ &objfile->objfile_obstack);
+
+ /* If we have address ranges, record them. */
+ dwarf2_record_block_ranges (die, block, baseaddr, cu);
+
+ gdbarch_make_symbol_special (gdbarch, newobj->name, objfile);
+
+ /* Attach template arguments to function. */
+ if (!template_args.empty ())
+ {
+ gdb_assert (templ_func != NULL);
+
+ templ_func->n_template_arguments = template_args.size ();
+ templ_func->template_arguments
+ = XOBNEWVEC (&objfile->objfile_obstack, struct symbol *,
+ templ_func->n_template_arguments);
+ memcpy (templ_func->template_arguments,
+ template_args.data (),
+ (templ_func->n_template_arguments * sizeof (struct symbol *)));
+ }
+
+ /* 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 = newobj->locals;
+ local_using_directives = newobj->local_using_directives;
+
+ /* If we've finished processing a top-level function, subsequent
+ symbols go in the file symbol list. */
+ if (outermost_context_p ())
+ cu->list_in_scope = &file_symbols;
}
-/* Record the address ranges for BLOCK, offset by BASEADDR, as given
- in DIE. */
+/* Process all the DIES contained within a lexical block scope. Start
+ a new scope, process the dies, and then close the scope. */
static void
-dwarf2_record_block_ranges (struct die_info *die, struct block *block,
- CORE_ADDR baseaddr, struct dwarf2_cu *cu)
+read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct attribute *attr;
- struct attribute *attr_high;
+ struct context_stack *newobj;
+ CORE_ADDR lowpc, highpc;
+ struct die_info *child_die;
+ CORE_ADDR baseaddr;
- attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
- if (attr_high)
- {
- attr = dwarf2_attr (die, DW_AT_low_pc, cu);
- if (attr)
- {
- CORE_ADDR low = attr_value_as_address (attr);
- CORE_ADDR high = attr_value_as_address (attr_high);
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- if (cu->header.version >= 4 && attr_form_is_constant (attr_high))
- high += low;
+ /* Ignore blocks with missing or invalid low and high pc attributes. */
+ /* ??? 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. */
+ switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL))
+ {
+ case PC_BOUNDS_NOT_PRESENT:
+ /* DW_TAG_lexical_block has no attributes, process its children as if
+ there was no wrapping by that DW_TAG_lexical_block.
+ GCC does no longer produces such DWARF since GCC r224161. */
+ for (child_die = die->child;
+ child_die != NULL && child_die->tag;
+ child_die = sibling_die (child_die))
+ process_die (child_die, cu);
+ return;
+ case PC_BOUNDS_INVALID:
+ return;
+ }
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
+ highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr);
- low = gdbarch_adjust_dwarf2_addr (gdbarch, low + baseaddr);
- high = gdbarch_adjust_dwarf2_addr (gdbarch, high + baseaddr);
- record_block_range (block, low, high - 1);
- }
+ push_context (0, lowpc);
+ if (die->child != NULL)
+ {
+ child_die = die->child;
+ while (child_die && child_die->tag)
+ {
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
+ }
}
+ inherit_abstract_dies (die, cu);
+ newobj = pop_context ();
- attr = dwarf2_attr (die, DW_AT_ranges, cu);
- if (attr)
+ if (local_symbols != NULL || local_using_directives != NULL)
{
- /* DW_AT_ranges_base does not apply to DIEs from the DWO skeleton.
- We take advantage of the fact that DW_AT_ranges does not appear
- in DW_TAG_compile_unit of DWO files. */
- int need_ranges_base = die->tag != DW_TAG_compile_unit;
+ struct block *block
+ = finish_block (0, &local_symbols, newobj->old_blocks, NULL,
+ newobj->start_addr, highpc);
- /* The value of the DW_AT_ranges attribute is the offset of the
- address range list in the .debug_ranges section. */
- unsigned long offset = (DW_UNSND (attr)
- + (need_ranges_base ? cu->ranges_base : 0));
- const gdb_byte *buffer;
-
- /* For some target architectures, but not others, the
- read_address function sign-extends the addresses it returns.
- To recognize base address selection entries, we need a
- mask. */
- unsigned int addr_size = cu->header.addr_size;
- CORE_ADDR base_select_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
-
- /* The base address, to which the next pair is relative. Note
- that this 'base' is a DWARF concept: most entries in a range
- list are relative, to reduce the number of relocs against the
- debugging information. This is separate from this function's
- 'baseaddr' argument, which GDB uses to relocate debugging
- information from a shared library based on the address at
- which the library was loaded. */
- CORE_ADDR base = cu->base_address;
- int base_known = cu->base_known;
+ /* Note that recording ranges after traversing children, as we
+ do here, means that recording a parent's ranges entails
+ walking across all its children's ranges as they appear in
+ the address map, which is quadratic behavior.
- dwarf2_ranges_process (offset, cu,
- [&] (CORE_ADDR start, CORE_ADDR end)
- {
- start += baseaddr;
- end += baseaddr;
- start = gdbarch_adjust_dwarf2_addr (gdbarch, start);
- end = gdbarch_adjust_dwarf2_addr (gdbarch, end);
- record_block_range (block, start, end - 1);
- });
+ It would be nicer to record the parent's ranges before
+ traversing its children, simply overriding whatever you find
+ there. But since we don't even decide whether to create a
+ block until after we've traversed its children, that's hard
+ to do. */
+ dwarf2_record_block_ranges (die, block, baseaddr, cu);
}
+ local_symbols = newobj->locals;
+ local_using_directives = newobj->local_using_directives;
}
-/* Check whether the producer field indicates either of GCC < 4.6, or the
- Intel C/C++ compiler, and cache the result in CU. */
+/* Read in DW_TAG_call_site and insert it to CU->call_site_htab. */
static void
-check_producer (struct dwarf2_cu *cu)
+read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu)
{
- int major, minor;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ CORE_ADDR pc, baseaddr;
+ struct attribute *attr;
+ struct call_site *call_site, call_site_local;
+ void **slot;
+ int nparams;
+ struct die_info *child_die;
- if (cu->producer == NULL)
- {
- /* For unknown compilers expect their behavior is DWARF version
- compliant.
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- GCC started to support .debug_types sections by -gdwarf-4 since
- gcc-4.5.x. As the .debug_types sections are missing DW_AT_producer
- for their space efficiency GDB cannot workaround gcc-4.5.x -gdwarf-4
- combination. gcc-4.5.x -gdwarf-4 binaries have DW_AT_accessibility
- interpreted incorrectly by GDB now - GCC PR debug/48229. */
- }
- else if (producer_is_gcc (cu->producer, &major, &minor))
+ attr = dwarf2_attr (die, DW_AT_call_return_pc, cu);
+ if (attr == NULL)
{
- cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
- cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
+ /* This was a pre-DWARF-5 GNU extension alias
+ for DW_AT_call_return_pc. */
+ attr = dwarf2_attr (die, DW_AT_low_pc, cu);
}
- else if (producer_is_icc (cu->producer, &major, &minor))
- cu->producer_is_icc_lt_14 = major < 14;
- else
+ if (!attr)
{
- /* For other non-GCC compilers, expect their behavior is DWARF version
- compliant. */
+ complaint (_("missing DW_AT_call_return_pc for DW_TAG_call_site "
+ "DIE %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
+ return;
}
+ pc = attr_value_as_address (attr) + baseaddr;
+ pc = gdbarch_adjust_dwarf2_addr (gdbarch, pc);
- cu->checked_producer = 1;
-}
+ if (cu->call_site_htab == NULL)
+ cu->call_site_htab = htab_create_alloc_ex (16, core_addr_hash, core_addr_eq,
+ NULL, &objfile->objfile_obstack,
+ hashtab_obstack_allocate, NULL);
+ call_site_local.pc = pc;
+ slot = htab_find_slot (cu->call_site_htab, &call_site_local, INSERT);
+ if (*slot != NULL)
+ {
+ complaint (_("Duplicate PC %s for DW_TAG_call_site "
+ "DIE %s [in module %s]"),
+ paddress (gdbarch, pc), sect_offset_str (die->sect_off),
+ objfile_name (objfile));
+ return;
+ }
-/* Check for GCC PR debug/45124 fix which is not present in any G++ version up
- to 4.5.any while it is present already in G++ 4.6.0 - the PR has been fixed
- during 4.6.0 experimental. */
+ /* Count parameters at the caller. */
-static int
-producer_is_gxx_lt_4_6 (struct dwarf2_cu *cu)
-{
- if (!cu->checked_producer)
- check_producer (cu);
+ nparams = 0;
+ for (child_die = die->child; child_die && child_die->tag;
+ child_die = sibling_die (child_die))
+ {
+ if (child_die->tag != DW_TAG_call_site_parameter
+ && child_die->tag != DW_TAG_GNU_call_site_parameter)
+ {
+ complaint (_("Tag %d is not DW_TAG_call_site_parameter in "
+ "DW_TAG_call_site child DIE %s [in module %s]"),
+ child_die->tag, sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
+ }
- return cu->producer_is_gxx_lt_4_6;
-}
+ nparams++;
+ }
-/* Return the default accessibility type if it is not overriden by
- DW_AT_accessibility. */
+ call_site
+ = ((struct call_site *)
+ obstack_alloc (&objfile->objfile_obstack,
+ sizeof (*call_site)
+ + (sizeof (*call_site->parameter) * (nparams - 1))));
+ *slot = call_site;
+ memset (call_site, 0, sizeof (*call_site) - sizeof (*call_site->parameter));
+ call_site->pc = pc;
-static enum dwarf_access_attribute
-dwarf2_default_access_attribute (struct die_info *die, struct dwarf2_cu *cu)
-{
- if (cu->header.version < 3 || producer_is_gxx_lt_4_6 (cu))
+ if (dwarf2_flag_true_p (die, DW_AT_call_tail_call, cu)
+ || dwarf2_flag_true_p (die, DW_AT_GNU_tail_call, cu))
{
- /* The default DWARF 2 accessibility for members is public, the default
- accessibility for inheritance is private. */
+ struct die_info *func_die;
- if (die->tag != DW_TAG_inheritance)
- return DW_ACCESS_public;
- else
- return DW_ACCESS_private;
- }
- else
- {
- /* DWARF 3+ defines the default accessibility a different way. The same
- rules apply now for DW_TAG_inheritance as for the members and it only
- depends on the container kind. */
+ /* Skip also over DW_TAG_inlined_subroutine. */
+ for (func_die = die->parent;
+ func_die && func_die->tag != DW_TAG_subprogram
+ && func_die->tag != DW_TAG_subroutine_type;
+ func_die = func_die->parent);
- if (die->parent->tag == DW_TAG_class_type)
- return DW_ACCESS_private;
+ /* DW_AT_call_all_calls is a superset
+ of DW_AT_call_all_tail_calls. */
+ if (func_die
+ && !dwarf2_flag_true_p (func_die, DW_AT_call_all_calls, cu)
+ && !dwarf2_flag_true_p (func_die, DW_AT_GNU_all_call_sites, cu)
+ && !dwarf2_flag_true_p (func_die, DW_AT_call_all_tail_calls, cu)
+ && !dwarf2_flag_true_p (func_die, DW_AT_GNU_all_tail_call_sites, cu))
+ {
+ /* TYPE_TAIL_CALL_LIST is not interesting in functions where it is
+ not complete. But keep CALL_SITE for look ups via call_site_htab,
+ both the initial caller containing the real return address PC and
+ the final callee containing the current PC of a chain of tail
+ calls do not need to have the tail call list complete. But any
+ function candidate for a virtual tail call frame searched via
+ TYPE_TAIL_CALL_LIST must have the tail call list complete to be
+ determined unambiguously. */
+ }
else
- return DW_ACCESS_public;
- }
-}
+ {
+ struct type *func_type = NULL;
-/* Look for DW_AT_data_member_location. Set *OFFSET to the byte
- offset. If the attribute was not found return 0, otherwise return
- 1. If it was found but could not properly be handled, set *OFFSET
- to 0. */
+ if (func_die)
+ func_type = get_die_type (func_die, cu);
+ if (func_type != NULL)
+ {
+ gdb_assert (TYPE_CODE (func_type) == TYPE_CODE_FUNC);
-static int
-handle_data_member_location (struct die_info *die, struct dwarf2_cu *cu,
- LONGEST *offset)
-{
- struct attribute *attr;
+ /* Enlist this call site to the function. */
+ call_site->tail_call_next = TYPE_TAIL_CALL_LIST (func_type);
+ TYPE_TAIL_CALL_LIST (func_type) = call_site;
+ }
+ else
+ complaint (_("Cannot find function owning DW_TAG_call_site "
+ "DIE %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
+ }
+ }
- attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
- if (attr != NULL)
+ attr = dwarf2_attr (die, DW_AT_call_target, cu);
+ if (attr == NULL)
+ attr = dwarf2_attr (die, DW_AT_GNU_call_site_target, cu);
+ if (attr == NULL)
+ attr = dwarf2_attr (die, DW_AT_call_origin, cu);
+ if (attr == NULL)
{
- *offset = 0;
-
- /* Note that we do not check for a section offset first here.
- This is because DW_AT_data_member_location is new in DWARF 4,
- so if we see it, we can assume that a constant form is really
- a constant and not a section offset. */
- if (attr_form_is_constant (attr))
- *offset = dwarf2_get_attr_constant_value (attr, 0);
- else if (attr_form_is_section_offset (attr))
- dwarf2_complex_location_expr_complaint ();
- else if (attr_form_is_block (attr))
- *offset = decode_locdesc (DW_BLOCK (attr), cu);
- else
- dwarf2_complex_location_expr_complaint ();
-
- return 1;
+ /* This was a pre-DWARF-5 GNU extension alias for DW_AT_call_origin. */
+ attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
}
+ SET_FIELD_DWARF_BLOCK (call_site->target, NULL);
+ if (!attr || (attr_form_is_block (attr) && DW_BLOCK (attr)->size == 0))
+ /* Keep NULL DWARF_BLOCK. */;
+ else if (attr_form_is_block (attr))
+ {
+ struct dwarf2_locexpr_baton *dlbaton;
- return 0;
-}
-
-/* Add an aggregate field to the field list. */
-
-static void
-dwarf2_add_field (struct field_info *fip, struct die_info *die,
- struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct nextfield *new_field;
- struct attribute *attr;
- struct field *fp;
- const char *fieldname = "";
-
- /* Allocate a new field list entry and link it in. */
- new_field = XNEW (struct nextfield);
- make_cleanup (xfree, new_field);
- memset (new_field, 0, sizeof (struct nextfield));
+ dlbaton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
+ dlbaton->data = DW_BLOCK (attr)->data;
+ dlbaton->size = DW_BLOCK (attr)->size;
+ dlbaton->per_cu = cu->per_cu;
- if (die->tag == DW_TAG_inheritance)
- {
- new_field->next = fip->baseclasses;
- fip->baseclasses = new_field;
+ SET_FIELD_DWARF_BLOCK (call_site->target, dlbaton);
}
- else
+ else if (attr_form_is_ref (attr))
{
- new_field->next = fip->fields;
- fip->fields = new_field;
- }
- fip->nfields++;
+ struct dwarf2_cu *target_cu = cu;
+ struct die_info *target_die;
- attr = dwarf2_attr (die, DW_AT_accessibility, cu);
- if (attr)
- new_field->accessibility = DW_UNSND (attr);
- else
- new_field->accessibility = dwarf2_default_access_attribute (die, cu);
- if (new_field->accessibility != DW_ACCESS_public)
- fip->non_public_fields = 1;
+ target_die = follow_die_ref (die, attr, &target_cu);
+ gdb_assert (target_cu->per_cu->dwarf2_per_objfile->objfile == objfile);
+ if (die_is_declaration (target_die, target_cu))
+ {
+ const char *target_physname;
- attr = dwarf2_attr (die, DW_AT_virtuality, cu);
- if (attr)
- new_field->virtuality = DW_UNSND (attr);
+ /* Prefer the mangled name; otherwise compute the demangled one. */
+ target_physname = dw2_linkage_name (target_die, target_cu);
+ if (target_physname == NULL)
+ target_physname = dwarf2_physname (NULL, target_die, target_cu);
+ if (target_physname == NULL)
+ complaint (_("DW_AT_call_target target DIE has invalid "
+ "physname, for referencing DIE %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
+ else
+ SET_FIELD_PHYSNAME (call_site->target, target_physname);
+ }
+ else
+ {
+ CORE_ADDR lowpc;
+
+ /* DW_AT_entry_pc should be preferred. */
+ if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, NULL)
+ <= PC_BOUNDS_INVALID)
+ complaint (_("DW_AT_call_target target DIE has invalid "
+ "low pc, for referencing DIE %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
+ else
+ {
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr);
+ SET_FIELD_PHYSADDR (call_site->target, lowpc);
+ }
+ }
+ }
else
- new_field->virtuality = DW_VIRTUALITY_none;
+ complaint (_("DW_TAG_call_site DW_AT_call_target is neither "
+ "block nor reference, for DIE %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
- fp = &new_field->field;
+ call_site->per_cu = cu->per_cu;
- if (die->tag == DW_TAG_member && ! die_is_declaration (die, cu))
+ for (child_die = die->child;
+ child_die && child_die->tag;
+ child_die = sibling_die (child_die))
{
- LONGEST offset;
+ struct call_site_parameter *parameter;
+ struct attribute *loc, *origin;
- /* Data member other than a C++ static data member. */
+ if (child_die->tag != DW_TAG_call_site_parameter
+ && child_die->tag != DW_TAG_GNU_call_site_parameter)
+ {
+ /* Already printed the complaint above. */
+ continue;
+ }
- /* Get type of field. */
- fp->type = die_type (die, cu);
+ gdb_assert (call_site->parameter_count < nparams);
+ parameter = &call_site->parameter[call_site->parameter_count];
- SET_FIELD_BITPOS (*fp, 0);
+ /* DW_AT_location specifies the register number or DW_AT_abstract_origin
+ specifies DW_TAG_formal_parameter. Value of the data assumed for the
+ register is contained in DW_AT_call_value. */
- /* Get bit size of field (zero if none). */
- attr = dwarf2_attr (die, DW_AT_bit_size, cu);
- if (attr)
+ loc = dwarf2_attr (child_die, DW_AT_location, cu);
+ origin = dwarf2_attr (child_die, DW_AT_call_parameter, cu);
+ if (origin == NULL)
{
- FIELD_BITSIZE (*fp) = DW_UNSND (attr);
+ /* This was a pre-DWARF-5 GNU extension alias
+ for DW_AT_call_parameter. */
+ origin = dwarf2_attr (child_die, DW_AT_abstract_origin, cu);
}
- else
+ if (loc == NULL && origin != NULL && attr_form_is_ref (origin))
{
- FIELD_BITSIZE (*fp) = 0;
- }
+ parameter->kind = CALL_SITE_PARAMETER_PARAM_OFFSET;
- /* Get bit offset of field. */
- if (handle_data_member_location (die, cu, &offset))
- SET_FIELD_BITPOS (*fp, offset * bits_per_byte);
- attr = dwarf2_attr (die, DW_AT_bit_offset, cu);
- if (attr)
- {
- if (gdbarch_bits_big_endian (gdbarch))
+ sect_offset sect_off
+ = (sect_offset) dwarf2_get_ref_die_offset (origin);
+ if (!offset_in_cu_p (&cu->header, sect_off))
{
- /* For big endian bits, the DW_AT_bit_offset gives the
- 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. */
- SET_FIELD_BITPOS (*fp, FIELD_BITPOS (*fp) + DW_UNSND (attr));
+ /* As DW_OP_GNU_parameter_ref uses CU-relative offset this
+ binding can be done only inside one CU. Such referenced DIE
+ therefore cannot be even moved to DW_TAG_partial_unit. */
+ complaint (_("DW_AT_call_parameter offset is not in CU for "
+ "DW_TAG_call_site child DIE %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
}
+ parameter->u.param_cu_off
+ = (cu_offset) (sect_off - cu->header.sect_off);
+ }
+ else if (loc == NULL || origin != NULL || !attr_form_is_block (loc))
+ {
+ complaint (_("No DW_FORM_block* DW_AT_location for "
+ "DW_TAG_call_site child DIE %s [in module %s]"),
+ sect_offset_str (child_die->sect_off), objfile_name (objfile));
+ continue;
+ }
+ else
+ {
+ parameter->u.dwarf_reg = dwarf_block_to_dwarf_reg
+ (DW_BLOCK (loc)->data, &DW_BLOCK (loc)->data[DW_BLOCK (loc)->size]);
+ if (parameter->u.dwarf_reg != -1)
+ parameter->kind = CALL_SITE_PARAMETER_DWARF_REG;
+ else if (dwarf_block_to_sp_offset (gdbarch, DW_BLOCK (loc)->data,
+ &DW_BLOCK (loc)->data[DW_BLOCK (loc)->size],
+ ¶meter->u.fb_offset))
+ parameter->kind = CALL_SITE_PARAMETER_FB_OFFSET;
else
{
- /* For little endian bits, compute the bit offset to the
- 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. */
- int anonymous_size;
- int bit_offset = DW_UNSND (attr);
-
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- 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);
- }
- SET_FIELD_BITPOS (*fp,
- (FIELD_BITPOS (*fp)
- + anonymous_size * bits_per_byte
- - bit_offset - FIELD_BITSIZE (*fp)));
+ complaint (_("Only single DW_OP_reg or DW_OP_fbreg is supported "
+ "for DW_FORM_block* DW_AT_location is supported for "
+ "DW_TAG_call_site child DIE %s "
+ "[in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
}
}
- attr = dwarf2_attr (die, DW_AT_data_bit_offset, cu);
- if (attr != NULL)
- SET_FIELD_BITPOS (*fp, (FIELD_BITPOS (*fp)
- + dwarf2_get_attr_constant_value (attr, 0)));
-
- /* Get name of field. */
- fieldname = dwarf2_name (die, cu);
- if (fieldname == NULL)
- fieldname = "";
-
- /* The name is already allocated along with this objfile, so we don't
- need to duplicate it for the type. */
- fp->name = fieldname;
- /* Change accessibility for artificial fields (e.g. virtual table
- pointer or virtual base class pointer) to private. */
- if (dwarf2_attr (die, DW_AT_artificial, cu))
+ attr = dwarf2_attr (child_die, DW_AT_call_value, cu);
+ if (attr == NULL)
+ attr = dwarf2_attr (child_die, DW_AT_GNU_call_site_value, cu);
+ if (!attr_form_is_block (attr))
{
- FIELD_ARTIFICIAL (*fp) = 1;
- new_field->accessibility = DW_ACCESS_private;
- fip->non_public_fields = 1;
+ complaint (_("No DW_FORM_block* DW_AT_call_value for "
+ "DW_TAG_call_site child DIE %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ continue;
}
- }
- else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable)
- {
- /* 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. */
-
- const char *physname;
+ parameter->value = DW_BLOCK (attr)->data;
+ parameter->value_size = DW_BLOCK (attr)->size;
- /* Get name of field. */
- fieldname = dwarf2_name (die, cu);
- if (fieldname == NULL)
- return;
+ /* Parameters are not pre-cleared by memset above. */
+ parameter->data_value = NULL;
+ parameter->data_value_size = 0;
+ call_site->parameter_count++;
- attr = dwarf2_attr (die, DW_AT_const_value, cu);
- if (attr
- /* Only create a symbol if this is an external value.
- new_symbol checks this and puts the value in the global symbol
- table, which we want. If it is not external, new_symbol
- will try to put the value in cu->list_in_scope which is wrong. */
- && dwarf2_flag_true_p (die, DW_AT_external, cu))
+ attr = dwarf2_attr (child_die, DW_AT_call_data_value, cu);
+ if (attr == NULL)
+ attr = dwarf2_attr (child_die, DW_AT_GNU_call_site_data_value, cu);
+ if (attr)
{
- /* A static const member, not much different than an enum as far as
- we're concerned, except that we can support more types. */
- new_symbol (die, NULL, cu);
+ if (!attr_form_is_block (attr))
+ complaint (_("No DW_FORM_block* DW_AT_call_data_value for "
+ "DW_TAG_call_site child DIE %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+ else
+ {
+ parameter->data_value = DW_BLOCK (attr)->data;
+ parameter->data_value_size = DW_BLOCK (attr)->size;
+ }
}
-
- /* Get physical name. */
- physname = dwarf2_physname (fieldname, die, cu);
-
- /* 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 : "");
- FIELD_TYPE (*fp) = die_type (die, cu);
- FIELD_NAME (*fp) = fieldname;
- }
- else if (die->tag == DW_TAG_inheritance)
- {
- LONGEST offset;
-
- /* C++ base class field. */
- if (handle_data_member_location (die, cu, &offset))
- SET_FIELD_BITPOS (*fp, offset * bits_per_byte);
- FIELD_BITSIZE (*fp) = 0;
- FIELD_TYPE (*fp) = die_type (die, cu);
- FIELD_NAME (*fp) = type_name_no_tag (fp->type);
- fip->nbaseclasses++;
}
}
-/* Can the type given by DIE define another type? */
+/* Helper function for read_variable. If DIE represents a virtual
+ table, then return the type of the concrete object that is
+ associated with the virtual table. Otherwise, return NULL. */
-static bool
-type_can_define_types (const struct die_info *die)
+static struct type *
+rust_containing_type (struct die_info *die, struct dwarf2_cu *cu)
{
- switch (die->tag)
- {
- case DW_TAG_typedef:
- case DW_TAG_class_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- case DW_TAG_enumeration_type:
- return true;
+ struct attribute *attr = dwarf2_attr (die, DW_AT_type, cu);
+ if (attr == NULL)
+ return NULL;
- default:
- return false;
- }
+ /* Find the type DIE. */
+ struct die_info *type_die = NULL;
+ struct dwarf2_cu *type_cu = cu;
+
+ if (attr_form_is_ref (attr))
+ type_die = follow_die_ref (die, attr, &type_cu);
+ if (type_die == NULL)
+ return NULL;
+
+ if (dwarf2_attr (type_die, DW_AT_containing_type, type_cu) == NULL)
+ return NULL;
+ return die_containing_type (type_die, type_cu);
}
-/* Add a type definition defined in the scope of the FIP's class. */
+/* Read a variable (DW_TAG_variable) DIE and create a new symbol. */
static void
-dwarf2_add_type_defn (struct field_info *fip, struct die_info *die,
- struct dwarf2_cu *cu)
+read_variable (struct die_info *die, struct dwarf2_cu *cu)
{
- struct decl_field_list *new_field;
- struct decl_field *fp;
-
- /* Allocate a new field list entry and link it in. */
- new_field = XCNEW (struct decl_field_list);
- make_cleanup (xfree, new_field);
-
- gdb_assert (type_can_define_types (die));
+ struct rust_vtable_symbol *storage = NULL;
- fp = &new_field->field;
+ if (cu->language == language_rust)
+ {
+ struct type *containing_type = rust_containing_type (die, cu);
- /* Get name of field. NULL is okay here, meaning an anonymous type. */
- fp->name = dwarf2_name (die, cu);
- fp->type = read_type_die (die, cu);
+ if (containing_type != NULL)
+ {
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
- /* Save accessibility. */
- enum dwarf_access_attribute accessibility;
- struct attribute *attr = dwarf2_attr (die, DW_AT_accessibility, cu);
- if (attr != NULL)
- accessibility = (enum dwarf_access_attribute) DW_UNSND (attr);
- else
- accessibility = dwarf2_default_access_attribute (die, cu);
- switch (accessibility)
- {
- case DW_ACCESS_public:
- /* The assumed value if neither private nor protected. */
- break;
- case DW_ACCESS_private:
- fp->is_private = 1;
- break;
- case DW_ACCESS_protected:
- fp->is_protected = 1;
- break;
- default:
- complaint (&symfile_complaints,
- _("Unhandled DW_AT_accessibility value (%x)"), accessibility);
+ storage = OBSTACK_ZALLOC (&objfile->objfile_obstack,
+ struct rust_vtable_symbol);
+ initialize_objfile_symbol (storage);
+ storage->concrete_type = containing_type;
+ storage->subclass = SYMBOL_RUST_VTABLE;
+ }
}
- if (die->tag == DW_TAG_typedef)
- {
- new_field->next = fip->typedef_field_list;
- fip->typedef_field_list = new_field;
- fip->typedef_field_list_count++;
- }
- else
- {
- new_field->next = fip->nested_types_list;
- fip->nested_types_list = new_field;
- fip->nested_types_list_count++;
- }
+ new_symbol (die, NULL, cu, storage);
}
-/* Create the vector of fields, and attach it to the type. */
+/* Call CALLBACK from DW_AT_ranges attribute value OFFSET
+ reading .debug_rnglists.
+ Callback's type should be:
+ void (CORE_ADDR range_beginning, CORE_ADDR range_end)
+ Return true if the attributes are present and valid, otherwise,
+ return false. */
-static void
-dwarf2_attach_fields_to_type (struct field_info *fip, struct type *type,
- struct dwarf2_cu *cu)
+template <typename Callback>
+static bool
+dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu,
+ Callback &&callback)
{
- int nfields = fip->nfields;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *obfd = objfile->obfd;
+ /* Base address selection entry. */
+ CORE_ADDR base;
+ int found_base;
+ const gdb_byte *buffer;
+ CORE_ADDR baseaddr;
+ bool overflow = false;
- /* 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);
+ found_base = cu->base_known;
+ base = cu->base_address;
- if (fip->non_public_fields && cu->language != language_ada)
+ dwarf2_read_section (objfile, &dwarf2_per_objfile->rnglists);
+ if (offset >= dwarf2_per_objfile->rnglists.size)
{
- 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);
+ complaint (_("Offset %d out of bounds for DW_AT_ranges attribute"),
+ offset);
+ return false;
}
+ buffer = dwarf2_per_objfile->rnglists.buffer + offset;
- /* If the type has baseclasses, allocate and clear a bit vector for
- TYPE_FIELD_VIRTUAL_BITS. */
- if (fip->nbaseclasses && cu->language != language_ada)
- {
- int num_bytes = B_BYTES (fip->nbaseclasses);
- unsigned char *pointer;
-
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- pointer = (unsigned char *) TYPE_ALLOC (type, num_bytes);
- TYPE_FIELD_VIRTUAL_BITS (type) = pointer;
- B_CLRALL (TYPE_FIELD_VIRTUAL_BITS (type), fip->nbaseclasses);
- TYPE_N_BASECLASSES (type) = fip->nbaseclasses;
- }
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- /* 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)
+ while (1)
{
- struct nextfield *fieldp;
+ /* Initialize it due to a false compiler warning. */
+ CORE_ADDR range_beginning = 0, range_end = 0;
+ const gdb_byte *buf_end = (dwarf2_per_objfile->rnglists.buffer
+ + dwarf2_per_objfile->rnglists.size);
+ unsigned int bytes_read;
- if (fip->fields)
- {
- fieldp = fip->fields;
- fip->fields = fieldp->next;
- }
- else
+ if (buffer == buf_end)
{
- fieldp = fip->baseclasses;
- fip->baseclasses = fieldp->next;
+ overflow = true;
+ break;
}
-
- TYPE_FIELD (type, nfields) = fieldp->field;
- switch (fieldp->accessibility)
+ const auto rlet = static_cast<enum dwarf_range_list_entry>(*buffer++);
+ switch (rlet)
{
- case DW_ACCESS_private:
- if (cu->language != language_ada)
- SET_TYPE_FIELD_PRIVATE (type, nfields);
+ case DW_RLE_end_of_list:
break;
-
- case DW_ACCESS_protected:
- if (cu->language != language_ada)
- SET_TYPE_FIELD_PROTECTED (type, nfields);
+ case DW_RLE_base_address:
+ if (buffer + cu->header.addr_size > buf_end)
+ {
+ overflow = true;
+ break;
+ }
+ base = read_address (obfd, buffer, cu, &bytes_read);
+ found_base = 1;
+ buffer += bytes_read;
break;
-
- case DW_ACCESS_public:
+ case DW_RLE_start_length:
+ if (buffer + cu->header.addr_size > buf_end)
+ {
+ overflow = true;
+ break;
+ }
+ range_beginning = read_address (obfd, buffer, cu, &bytes_read);
+ buffer += bytes_read;
+ range_end = (range_beginning
+ + read_unsigned_leb128 (obfd, buffer, &bytes_read));
+ buffer += bytes_read;
+ if (buffer > buf_end)
+ {
+ overflow = true;
+ break;
+ }
break;
-
- default:
- /* Unknown accessibility. Complain and treat it as public. */
- {
- complaint (&symfile_complaints, _("unsupported accessibility %d"),
- fieldp->accessibility);
- }
+ case DW_RLE_offset_pair:
+ range_beginning = read_unsigned_leb128 (obfd, buffer, &bytes_read);
+ buffer += bytes_read;
+ if (buffer > buf_end)
+ {
+ overflow = true;
+ break;
+ }
+ range_end = read_unsigned_leb128 (obfd, buffer, &bytes_read);
+ buffer += bytes_read;
+ if (buffer > buf_end)
+ {
+ overflow = true;
+ break;
+ }
break;
- }
- if (nfields < fip->nbaseclasses)
- {
- switch (fieldp->virtuality)
+ case DW_RLE_start_end:
+ if (buffer + 2 * cu->header.addr_size > buf_end)
{
- case DW_VIRTUALITY_virtual:
- case DW_VIRTUALITY_pure_virtual:
- if (cu->language == language_ada)
- error (_("unexpected virtuality in component of Ada type"));
- SET_TYPE_FIELD_VIRTUAL (type, nfields);
+ overflow = true;
break;
}
+ range_beginning = read_address (obfd, buffer, cu, &bytes_read);
+ buffer += bytes_read;
+ range_end = read_address (obfd, buffer, cu, &bytes_read);
+ buffer += bytes_read;
+ break;
+ default:
+ complaint (_("Invalid .debug_rnglists data (no base address)"));
+ return false;
}
- }
-}
+ if (rlet == DW_RLE_end_of_list || overflow)
+ break;
+ if (rlet == DW_RLE_base_address)
+ continue;
-/* Return true if this member function is a constructor, false
- otherwise. */
+ if (!found_base)
+ {
+ /* We have no valid base address for the ranges
+ data. */
+ complaint (_("Invalid .debug_rnglists data (no base address)"));
+ return false;
+ }
-static int
-dwarf2_is_constructor (struct die_info *die, struct dwarf2_cu *cu)
-{
- const char *fieldname;
- const char *type_name;
- int len;
+ if (range_beginning > range_end)
+ {
+ /* Inverted range entries are invalid. */
+ complaint (_("Invalid .debug_rnglists data (inverted range)"));
+ return false;
+ }
- if (die->parent == NULL)
- return 0;
+ /* Empty range entries have no effect. */
+ if (range_beginning == range_end)
+ continue;
- if (die->parent->tag != DW_TAG_structure_type
- && die->parent->tag != DW_TAG_union_type
- && die->parent->tag != DW_TAG_class_type)
- return 0;
+ range_beginning += base;
+ range_end += base;
- fieldname = dwarf2_name (die, cu);
- type_name = dwarf2_name (die->parent, cu);
- if (fieldname == NULL || type_name == NULL)
- return 0;
+ /* A not-uncommon case of bad debug info.
+ Don't pollute the addrmap with bad data. */
+ if (range_beginning + baseaddr == 0
+ && !dwarf2_per_objfile->has_section_at_zero)
+ {
+ complaint (_(".debug_rnglists entry has start address of zero"
+ " [in module %s]"), objfile_name (objfile));
+ continue;
+ }
- len = strlen (fieldname);
- return (strncmp (fieldname, type_name, len) == 0
- && (type_name[len] == '\0' || type_name[len] == '<'));
+ callback (range_beginning, range_end);
+ }
+
+ if (overflow)
+ {
+ complaint (_("Offset %d is not terminated "
+ "for DW_AT_ranges attribute"),
+ offset);
+ return false;
+ }
+
+ return true;
}
-/* Add a member function to the proper fieldlist. */
+/* Call CALLBACK from DW_AT_ranges attribute value OFFSET reading .debug_ranges.
+ Callback's type should be:
+ void (CORE_ADDR range_beginning, CORE_ADDR range_end)
+ Return 1 if the attributes are present and valid, otherwise, return 0. */
-static void
-dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
- struct type *type, struct dwarf2_cu *cu)
+template <typename Callback>
+static int
+dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu,
+ Callback &&callback)
{
- struct objfile *objfile = cu->objfile;
- struct attribute *attr;
- struct fnfieldlist *flp;
- int i;
- struct fn_field *fnp;
- const char *fieldname;
- struct nextfnfield *new_fnfield;
- struct type *this_type;
- enum dwarf_access_attribute accessibility;
-
- if (cu->language == language_ada)
- error (_("unexpected member function in Ada type"));
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct comp_unit_head *cu_header = &cu->header;
+ bfd *obfd = objfile->obfd;
+ unsigned int addr_size = cu_header->addr_size;
+ CORE_ADDR mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
+ /* Base address selection entry. */
+ CORE_ADDR base;
+ int found_base;
+ unsigned int dummy;
+ const gdb_byte *buffer;
+ CORE_ADDR baseaddr;
- /* Get name of member function. */
- fieldname = dwarf2_name (die, cu);
- if (fieldname == NULL)
- return;
+ if (cu_header->version >= 5)
+ return dwarf2_rnglists_process (offset, cu, callback);
- /* Look up member function name in fieldlist. */
- for (i = 0; i < fip->nfnfields; i++)
- {
- if (strcmp (fip->fnfieldlists[i].name, fieldname) == 0)
- break;
- }
+ found_base = cu->base_known;
+ base = cu->base_address;
- /* Create new list element if necessary. */
- if (i < fip->nfnfields)
- flp = &fip->fnfieldlists[i];
- else
+ dwarf2_read_section (objfile, &dwarf2_per_objfile->ranges);
+ if (offset >= dwarf2_per_objfile->ranges.size)
{
- if ((fip->nfnfields % DW_FIELD_ALLOC_CHUNK) == 0)
- {
- fip->fnfieldlists = (struct fnfieldlist *)
- xrealloc (fip->fnfieldlists,
- (fip->nfnfields + DW_FIELD_ALLOC_CHUNK)
- * sizeof (struct fnfieldlist));
- if (fip->nfnfields == 0)
- make_cleanup (free_current_contents, &fip->fnfieldlists);
- }
- flp = &fip->fnfieldlists[fip->nfnfields];
- flp->name = fieldname;
- flp->length = 0;
- flp->head = NULL;
- i = fip->nfnfields++;
+ complaint (_("Offset %d out of bounds for DW_AT_ranges attribute"),
+ offset);
+ return 0;
}
+ buffer = dwarf2_per_objfile->ranges.buffer + offset;
- /* Create a new member function field and chain it to the field list
- entry. */
- new_fnfield = XNEW (struct nextfnfield);
- make_cleanup (xfree, new_fnfield);
- 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;
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- /* Delay processing of the physname until later. */
- if (cu->language == language_cplus)
- {
- add_to_method_list (type, i, flp->length - 1, fieldname,
- die, cu);
- }
- else
+ while (1)
{
- const char *physname = dwarf2_physname (fieldname, die, cu);
- fnp->physname = physname ? physname : "";
- }
+ CORE_ADDR range_beginning, range_end;
- fnp->type = alloc_type (objfile);
- this_type = read_type_die (die, cu);
- if (this_type && TYPE_CODE (this_type) == TYPE_CODE_FUNC)
- {
- int nparams = TYPE_NFIELDS (this_type);
+ range_beginning = read_address (obfd, buffer, cu, &dummy);
+ buffer += addr_size;
+ range_end = read_address (obfd, buffer, cu, &dummy);
+ buffer += addr_size;
+ offset += 2 * addr_size;
- /* TYPE is the domain of this method, and THIS_TYPE is the type
- of the method itself (TYPE_CODE_METHOD). */
- smash_to_method_type (fnp->type, type,
- TYPE_TARGET_TYPE (this_type),
- TYPE_FIELDS (this_type),
- TYPE_NFIELDS (this_type),
- TYPE_VARARGS (this_type));
-
- /* Handle static member functions.
- 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. */
- if (nparams == 0 || TYPE_FIELD_ARTIFICIAL (this_type, 0) == 0)
- fnp->voffset = VOFFSET_STATIC;
- }
- else
- complaint (&symfile_complaints, _("member function type missing for '%s'"),
- dwarf2_full_name (fieldname, die, cu));
-
- /* Get fcontext from DW_AT_containing_type if present. */
- if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
- fnp->fcontext = die_containing_type (die, cu);
-
- /* 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. */
+ /* 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;
- /* Get accessibility. */
- attr = dwarf2_attr (die, DW_AT_accessibility, cu);
- if (attr)
- accessibility = (enum dwarf_access_attribute) DW_UNSND (attr);
- else
- accessibility = dwarf2_default_access_attribute (die, cu);
- switch (accessibility)
- {
- case DW_ACCESS_private:
- fnp->is_private = 1;
- break;
- case DW_ACCESS_protected:
- fnp->is_protected = 1;
- 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 we already
+ have the base address in range_end. */
+ base = range_end;
+ found_base = 1;
+ continue;
+ }
- /* Check for artificial methods. */
- attr = dwarf2_attr (die, DW_AT_artificial, cu);
- if (attr && DW_UNSND (attr) != 0)
- fnp->is_artificial = 1;
+ if (!found_base)
+ {
+ /* We have no valid base address for the ranges
+ data. */
+ complaint (_("Invalid .debug_ranges data (no base address)"));
+ return 0;
+ }
- fnp->is_constructor = dwarf2_is_constructor (die, cu);
+ if (range_beginning > range_end)
+ {
+ /* Inverted range entries are invalid. */
+ complaint (_("Invalid .debug_ranges data (inverted range)"));
+ return 0;
+ }
- /* Get index in virtual function table if it is a virtual member
- function. For older versions of GCC, this is an offset in the
- appropriate virtual table, as specified by DW_AT_containing_type.
- For everyone else, it is an expression to be evaluated relative
- to the object address. */
+ /* Empty range entries have no effect. */
+ if (range_beginning == range_end)
+ continue;
- attr = dwarf2_attr (die, DW_AT_vtable_elem_location, cu);
- if (attr)
- {
- if (attr_form_is_block (attr) && DW_BLOCK (attr)->size > 0)
- {
- if (DW_BLOCK (attr)->data[0] == DW_OP_constu)
- {
- /* Old-style GCC. */
- fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu) + 2;
- }
- else if (DW_BLOCK (attr)->data[0] == DW_OP_deref
- || (DW_BLOCK (attr)->size > 1
- && DW_BLOCK (attr)->data[0] == DW_OP_deref_size
- && DW_BLOCK (attr)->data[1] == cu->header.addr_size))
- {
- fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu);
- if ((fnp->voffset % cu->header.addr_size) != 0)
- dwarf2_complex_location_expr_complaint ();
- else
- fnp->voffset /= cu->header.addr_size;
- fnp->voffset += 2;
- }
- else
- dwarf2_complex_location_expr_complaint ();
+ range_beginning += base;
+ range_end += base;
- if (!fnp->fcontext)
- {
- /* If there is no `this' field and no DW_AT_containing_type,
- we cannot actually find a base class context for the
- vtable! */
- if (TYPE_NFIELDS (this_type) == 0
- || !TYPE_FIELD_ARTIFICIAL (this_type, 0))
- {
- complaint (&symfile_complaints,
- _("cannot determine context for virtual member "
- "function \"%s\" (offset %d)"),
- fieldname, to_underlying (die->sect_off));
- }
- else
- {
- fnp->fcontext
- = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (this_type, 0));
- }
- }
- }
- else if (attr_form_is_section_offset (attr))
- {
- dwarf2_complex_location_expr_complaint ();
- }
- else
- {
- dwarf2_invalid_attrib_class_complaint ("DW_AT_vtable_elem_location",
- fieldname);
- }
- }
- else
- {
- attr = dwarf2_attr (die, DW_AT_virtuality, cu);
- if (attr && DW_UNSND (attr))
+ /* A not-uncommon case of bad debug info.
+ Don't pollute the addrmap with bad data. */
+ if (range_beginning + baseaddr == 0
+ && !dwarf2_per_objfile->has_section_at_zero)
{
- /* GCC does this, as of 2008-08-25; PR debug/37237. */
- complaint (&symfile_complaints,
- _("Member function \"%s\" (offset %d) is virtual "
- "but the vtable offset is not specified"),
- fieldname, to_underlying (die->sect_off));
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- TYPE_CPLUS_DYNAMIC (type) = 1;
+ complaint (_(".debug_ranges entry has start address of zero"
+ " [in module %s]"), objfile_name (objfile));
+ continue;
}
+
+ callback (range_beginning, range_end);
}
+
+ return 1;
}
-/* Create the vector of member function fields, and attach it to the type. */
+/* Get low and high pc attributes from DW_AT_ranges attribute value OFFSET.
+ Return 1 if the attributes are present and valid, otherwise, return 0.
+ If RANGES_PST is not NULL we should setup `objfile->psymtabs_addrmap'. */
-static void
-dwarf2_attach_fn_fields_to_type (struct field_info *fip, struct type *type,
- struct dwarf2_cu *cu)
+static int
+dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
+ CORE_ADDR *high_return, struct dwarf2_cu *cu,
+ struct partial_symtab *ranges_pst)
{
- struct fnfieldlist *flp;
- int i;
-
- if (cu->language == language_ada)
- error (_("unexpected member functions in Ada type"));
-
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- TYPE_FN_FIELDLISTS (type) = (struct fn_fieldlist *)
- TYPE_ALLOC (type, sizeof (struct fn_fieldlist) * fip->nfnfields);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ const CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
+ SECT_OFF_TEXT (objfile));
+ int low_set = 0;
+ CORE_ADDR low = 0;
+ CORE_ADDR high = 0;
+ int retval;
- for (i = 0, flp = fip->fnfieldlists; i < fip->nfnfields; i++, flp++)
+ retval = dwarf2_ranges_process (offset, cu,
+ [&] (CORE_ADDR range_beginning, CORE_ADDR range_end)
{
- 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)
- fn_flp->fn_fields[k] = nfp->fnfield;
- }
+ if (ranges_pst != NULL)
+ {
+ CORE_ADDR lowpc;
+ CORE_ADDR highpc;
- TYPE_NFN_FIELDS (type) = fip->nfnfields;
-}
+ lowpc = gdbarch_adjust_dwarf2_addr (gdbarch,
+ range_beginning + baseaddr);
+ highpc = gdbarch_adjust_dwarf2_addr (gdbarch,
+ range_end + baseaddr);
+ addrmap_set_empty (objfile->psymtabs_addrmap, lowpc, highpc - 1,
+ ranges_pst);
+ }
-/* Returns non-zero if NAME is the name of a vtable member in CU's
- language, zero otherwise. */
-static int
-is_vtable_name (const char *name, struct dwarf2_cu *cu)
-{
- static const char vptr[] = "_vptr";
+ /* 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 (!retval)
+ return 0;
- /* Look for the C++ form of the vtable. */
- if (startswith (name, vptr) && is_cplus_marker (name[sizeof (vptr) - 1]))
- return 1;
+ 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;
- return 0;
+ if (low_return)
+ *low_return = low;
+ if (high_return)
+ *high_return = high;
+ return 1;
}
-/* GCC outputs unnamed structures that are really pointers to member
- functions, with the ABI-specified layout. If TYPE describes
- such a structure, smash it into a member function type.
-
- GCC shouldn't do this; it should just output pointer to member DIEs.
- This is GCC PR debug/28767. */
+/* Get low and high pc attributes from a die. See enum pc_bounds_kind
+ definition for the return value. *LOWPC and *HIGHPC are set iff
+ neither PC_BOUNDS_NOT_PRESENT nor PC_BOUNDS_INVALID are returned. */
-static void
-quirk_gcc_member_function_pointer (struct type *type, struct objfile *objfile)
+static enum pc_bounds_kind
+dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
+ CORE_ADDR *highpc, struct dwarf2_cu *cu,
+ struct partial_symtab *pst)
{
- struct type *pfn_type, *self_type, *new_type;
-
- /* Check for a structure with no name and two children. */
- if (TYPE_CODE (type) != TYPE_CODE_STRUCT || TYPE_NFIELDS (type) != 2)
- return;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct attribute *attr;
+ struct attribute *attr_high;
+ CORE_ADDR low = 0;
+ CORE_ADDR high = 0;
+ enum pc_bounds_kind ret;
- /* Check for __pfn and __delta members. */
- if (TYPE_FIELD_NAME (type, 0) == NULL
- || strcmp (TYPE_FIELD_NAME (type, 0), "__pfn") != 0
- || TYPE_FIELD_NAME (type, 1) == NULL
- || strcmp (TYPE_FIELD_NAME (type, 1), "__delta") != 0)
- return;
+ attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
+ if (attr_high)
+ {
+ attr = dwarf2_attr (die, DW_AT_low_pc, cu);
+ if (attr)
+ {
+ low = attr_value_as_address (attr);
+ high = attr_value_as_address (attr_high);
+ if (cu->header.version >= 4 && attr_form_is_constant (attr_high))
+ high += low;
+ }
+ else
+ /* Found high w/o low attribute. */
+ return PC_BOUNDS_INVALID;
- /* Find the type of the method. */
- pfn_type = TYPE_FIELD_TYPE (type, 0);
- if (pfn_type == NULL
- || TYPE_CODE (pfn_type) != TYPE_CODE_PTR
- || TYPE_CODE (TYPE_TARGET_TYPE (pfn_type)) != TYPE_CODE_FUNC)
- return;
+ /* Found consecutive range of addresses. */
+ ret = PC_BOUNDS_HIGH_LOW;
+ }
+ else
+ {
+ attr = dwarf2_attr (die, DW_AT_ranges, cu);
+ if (attr != NULL)
+ {
+ /* DW_AT_ranges_base does not apply to DIEs from the DWO skeleton.
+ We take advantage of the fact that DW_AT_ranges does not appear
+ in DW_TAG_compile_unit of DWO files. */
+ int need_ranges_base = die->tag != DW_TAG_compile_unit;
+ unsigned int ranges_offset = (DW_UNSND (attr)
+ + (need_ranges_base
+ ? cu->ranges_base
+ : 0));
- /* Look for the "this" argument. */
- pfn_type = TYPE_TARGET_TYPE (pfn_type);
- if (TYPE_NFIELDS (pfn_type) == 0
- /* || TYPE_FIELD_TYPE (pfn_type, 0) == NULL */
- || TYPE_CODE (TYPE_FIELD_TYPE (pfn_type, 0)) != TYPE_CODE_PTR)
- return;
+ /* Value of the DW_AT_ranges attribute is the offset in the
+ .debug_ranges section. */
+ if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu, pst))
+ return PC_BOUNDS_INVALID;
+ /* Found discontinuous range of addresses. */
+ ret = PC_BOUNDS_RANGES;
+ }
+ else
+ return PC_BOUNDS_NOT_PRESENT;
+ }
- self_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (pfn_type, 0));
- new_type = alloc_type (objfile);
- smash_to_method_type (new_type, self_type, TYPE_TARGET_TYPE (pfn_type),
- TYPE_FIELDS (pfn_type), TYPE_NFIELDS (pfn_type),
- TYPE_VARARGS (pfn_type));
- smash_to_methodptr_type (type, new_type);
-}
+ /* partial_die_info::read has also the strict LOW < HIGH requirement. */
+ if (high <= low)
+ return PC_BOUNDS_INVALID;
+ /* 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 (low == 0 && !dwarf2_per_objfile->has_section_at_zero)
+ return PC_BOUNDS_INVALID;
-/* Called when we find the DIE that starts a structure or union scope
- (definition) to create a type for the structure or union. Fill in
- the type's name and general properties; the members will not be
- processed until process_structure_scope. A symbol table entry for
- the type will also not be done until process_structure_scope (assuming
- the type has a name).
+ *lowpc = low;
+ if (highpc)
+ *highpc = high;
+ return ret;
+}
- NOTE: we need to call these functions regardless of whether or not the
- DIE has a DW_AT_name attribute, since it might be an anonymous
- structure or union. This gets the type entered into our set of
- user defined types. */
+/* Assuming that DIE represents a subprogram DIE or a lexical block, get
+ its low and high PC addresses. Do nothing if these addresses could not
+ be determined. Otherwise, set LOWPC to the low address if it is smaller,
+ and HIGHPC to the high address if greater than HIGHPC. */
-static struct type *
-read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+dwarf2_get_subprogram_pc_bounds (struct die_info *die,
+ CORE_ADDR *lowpc, CORE_ADDR *highpc,
+ struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- struct type *type;
- struct attribute *attr;
- const char *name;
+ CORE_ADDR low, high;
+ struct die_info *child = die->child;
- /* If the definition of this type lives in .debug_types, read that type.
- Don't follow DW_AT_specification though, that will take us back up
- the chain and we want to go down. */
- attr = dwarf2_attr_no_follow (die, DW_AT_signature);
- if (attr)
+ if (dwarf2_get_pc_bounds (die, &low, &high, cu, NULL) >= PC_BOUNDS_RANGES)
{
- type = get_DW_AT_signature_type (die, attr, cu);
-
- /* The type's CU may not be the same as CU.
- Ensure TYPE is recorded with CU in die_type_hash. */
- return set_die_type (die, type, cu);
+ *lowpc = std::min (*lowpc, low);
+ *highpc = std::max (*highpc, high);
}
- type = alloc_type (objfile);
- INIT_CPLUS_SPECIFIC (type);
+ /* If the language does not allow nested subprograms (either inside
+ subprograms or lexical blocks), we're done. */
+ if (cu->language != language_ada)
+ return;
- name = dwarf2_name (die, cu);
- if (name != NULL)
+ /* Check all the children of the given DIE. If it contains nested
+ subprograms, then check their pc bounds. Likewise, we need to
+ check lexical blocks as well, as they may also contain subprogram
+ definitions. */
+ while (child && child->tag)
{
- if (cu->language == language_cplus
- || cu->language == language_d
- || cu->language == language_rust)
- {
- const char *full_name = dwarf2_full_name (name, die, cu);
+ if (child->tag == DW_TAG_subprogram
+ || child->tag == DW_TAG_lexical_block)
+ dwarf2_get_subprogram_pc_bounds (child, lowpc, highpc, cu);
+ child = sibling_die (child);
+ }
+}
- /* dwarf2_full_name might have already finished building the DIE's
- type. If so, there is no need to continue. */
- if (get_die_type (die, cu) != NULL)
- return get_die_type (die, cu);
+/* 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. */
- TYPE_TAG_NAME (type) = full_name;
- if (die->tag == DW_TAG_structure_type
- || die->tag == DW_TAG_class_type)
- TYPE_NAME (type) = TYPE_TAG_NAME (type);
- }
- else
- {
- /* 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;
- if (die->tag == DW_TAG_class_type)
- TYPE_NAME (type) = TYPE_TAG_NAME (type);
- }
- }
+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 (die->tag == DW_TAG_structure_type)
- {
- TYPE_CODE (type) = TYPE_CODE_STRUCT;
- }
- else if (die->tag == DW_TAG_union_type)
+ if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, NULL)
+ >= PC_BOUNDS_RANGES)
{
- TYPE_CODE (type) = TYPE_CODE_UNION;
+ best_low = current_low;
+ best_high = current_high;
}
else
{
- TYPE_CODE (type) = TYPE_CODE_STRUCT;
- }
-
- if (cu->language == language_cplus && die->tag == DW_TAG_class_type)
- TYPE_DECLARED_CLASS (type) = 1;
+ struct die_info *child = die->child;
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- {
- if (attr_form_is_constant (attr))
- TYPE_LENGTH (type) = DW_UNSND (attr);
- else
+ while (child && child->tag)
{
- /* For the moment, dynamic type sizes are not supported
- by GDB's struct type. The actual size is determined
- on-demand when resolving the type of a given object,
- so set the type's length to zero for now. Otherwise,
- we record an expression as the length, and that expression
- could lead to a very large value, which could eventually
- lead to us trying to allocate that much memory when creating
- a value of that type. */
- TYPE_LENGTH (type) = 0;
- }
- }
- else
- {
- TYPE_LENGTH (type) = 0;
- }
+ switch (child->tag) {
+ case DW_TAG_subprogram:
+ dwarf2_get_subprogram_pc_bounds (child, &best_low, &best_high, cu);
+ break;
+ case DW_TAG_namespace:
+ case DW_TAG_module:
+ /* 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 (producer_is_icc_lt_14 (cu) && (TYPE_LENGTH (type) == 0))
- {
- /* ICC<14 does not output the required DW_AT_declaration on
- incomplete types, but gives them a size of zero. */
- TYPE_STUB (type) = 1;
+ if (current_low != ((CORE_ADDR) -1))
+ {
+ best_low = std::min (best_low, current_low);
+ best_high = std::max (best_high, current_high);
+ }
+ break;
+ default:
+ /* Ignore. */
+ break;
+ }
+
+ child = sibling_die (child);
+ }
}
- else
- TYPE_STUB_SUPPORTED (type) = 1;
- if (die_is_declaration (die, cu))
- TYPE_STUB (type) = 1;
- else if (attr == NULL && die->child == NULL
- && producer_is_realview (cu->producer))
- /* RealView does not output the required DW_AT_declaration
- on incomplete types. */
- TYPE_STUB (type) = 1;
+ *lowpc = best_low;
+ *highpc = best_high;
+}
- /* 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. */
- set_die_type (die, type, cu);
-
- /* set_die_type should be already done. */
- set_descriptive_type (type, die, cu);
-
- return type;
-}
-
-/* Finish creating a structure or union type, including filling in
- its members and creating a symbol for it. */
+/* Record the address ranges for BLOCK, offset by BASEADDR, as given
+ in DIE. */
static void
-process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
+dwarf2_record_block_ranges (struct die_info *die, struct block *block,
+ CORE_ADDR baseaddr, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- struct die_info *child_die;
- struct type *type;
-
- type = get_die_type (die, cu);
- if (type == NULL)
- type = read_structure_type (die, cu);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct attribute *attr;
+ struct attribute *attr_high;
- if (die->child != NULL && ! die_is_declaration (die, cu))
+ attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
+ if (attr_high)
{
- struct field_info fi;
- std::vector<struct symbol *> template_args;
- struct cleanup *back_to = make_cleanup (null_cleanup, 0);
-
- memset (&fi, 0, sizeof (struct field_info));
+ attr = dwarf2_attr (die, DW_AT_low_pc, cu);
+ if (attr)
+ {
+ CORE_ADDR low = attr_value_as_address (attr);
+ CORE_ADDR high = attr_value_as_address (attr_high);
- child_die = die->child;
+ if (cu->header.version >= 4 && attr_form_is_constant (attr_high))
+ high += low;
- while (child_die && child_die->tag)
- {
- if (child_die->tag == DW_TAG_member
- || child_die->tag == DW_TAG_variable)
- {
- /* 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. */
- dwarf2_add_field (&fi, child_die, cu);
- }
- else if (child_die->tag == DW_TAG_subprogram)
- {
- /* Rust doesn't have member functions in the C++ sense.
- However, it does emit ordinary functions as children
- of a struct DIE. */
- if (cu->language == language_rust)
- read_func_scope (child_die, cu);
- else
- {
- /* C++ member function. */
- dwarf2_add_member_fn (&fi, child_die, type, cu);
- }
- }
- else if (child_die->tag == DW_TAG_inheritance)
- {
- /* C++ base class field. */
- dwarf2_add_field (&fi, child_die, cu);
- }
- else if (type_can_define_types (child_die))
- dwarf2_add_type_defn (&fi, child_die, cu);
- else if (child_die->tag == DW_TAG_template_type_param
- || child_die->tag == DW_TAG_template_value_param)
- {
- struct symbol *arg = new_symbol (child_die, NULL, cu);
+ low = gdbarch_adjust_dwarf2_addr (gdbarch, low + baseaddr);
+ high = gdbarch_adjust_dwarf2_addr (gdbarch, high + baseaddr);
+ record_block_range (block, low, high - 1);
+ }
+ }
- if (arg != NULL)
- template_args.push_back (arg);
- }
+ attr = dwarf2_attr (die, DW_AT_ranges, cu);
+ if (attr)
+ {
+ /* DW_AT_ranges_base does not apply to DIEs from the DWO skeleton.
+ We take advantage of the fact that DW_AT_ranges does not appear
+ in DW_TAG_compile_unit of DWO files. */
+ int need_ranges_base = die->tag != DW_TAG_compile_unit;
- child_die = sibling_die (child_die);
- }
+ /* The value of the DW_AT_ranges attribute is the offset of the
+ address range list in the .debug_ranges section. */
+ unsigned long offset = (DW_UNSND (attr)
+ + (need_ranges_base ? cu->ranges_base : 0));
- /* Attach template arguments to type. */
- if (!template_args.empty ())
+ dwarf2_ranges_process (offset, cu,
+ [&] (CORE_ADDR start, CORE_ADDR end)
{
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- TYPE_N_TEMPLATE_ARGUMENTS (type) = template_args.size ();
- TYPE_TEMPLATE_ARGUMENTS (type)
- = XOBNEWVEC (&objfile->objfile_obstack,
- struct symbol *,
- TYPE_N_TEMPLATE_ARGUMENTS (type));
- memcpy (TYPE_TEMPLATE_ARGUMENTS (type),
- template_args.data (),
- (TYPE_N_TEMPLATE_ARGUMENTS (type)
- * sizeof (struct symbol *)));
- }
+ start += baseaddr;
+ end += baseaddr;
+ start = gdbarch_adjust_dwarf2_addr (gdbarch, start);
+ end = gdbarch_adjust_dwarf2_addr (gdbarch, end);
+ record_block_range (block, start, end - 1);
+ });
+ }
+}
- /* Attach fields and member functions to the type. */
- if (fi.nfields)
- dwarf2_attach_fields_to_type (&fi, type, cu);
- if (fi.nfnfields)
- {
- dwarf2_attach_fn_fields_to_type (&fi, type, cu);
+/* Check whether the producer field indicates either of GCC < 4.6, or the
+ Intel C/C++ compiler, and cache the result in CU. */
- /* Get the type which refers to the base class (possibly this
- class itself) which contains the vtable pointer for the current
- class from the DW_AT_containing_type attribute. This use of
- DW_AT_containing_type is a GNU extension. */
+static void
+check_producer (struct dwarf2_cu *cu)
+{
+ int major, minor;
- if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
- {
- struct type *t = die_containing_type (die, cu);
+ if (cu->producer == NULL)
+ {
+ /* For unknown compilers expect their behavior is DWARF version
+ compliant.
- set_type_vptr_basetype (type, t);
- if (type == t)
- {
- int i;
+ GCC started to support .debug_types sections by -gdwarf-4 since
+ gcc-4.5.x. As the .debug_types sections are missing DW_AT_producer
+ for their space efficiency GDB cannot workaround gcc-4.5.x -gdwarf-4
+ combination. gcc-4.5.x -gdwarf-4 binaries have DW_AT_accessibility
+ interpreted incorrectly by GDB now - GCC PR debug/48229. */
+ }
+ else if (producer_is_gcc (cu->producer, &major, &minor))
+ {
+ cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
+ cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
+ }
+ else if (producer_is_icc (cu->producer, &major, &minor))
+ cu->producer_is_icc_lt_14 = major < 14;
+ else
+ {
+ /* For other non-GCC compilers, expect their behavior is DWARF version
+ compliant. */
+ }
- /* Our own class provides vtbl ptr. */
- for (i = TYPE_NFIELDS (t) - 1;
- i >= TYPE_N_BASECLASSES (t);
- --i)
- {
- const char *fieldname = TYPE_FIELD_NAME (t, i);
+ cu->checked_producer = 1;
+}
- if (is_vtable_name (fieldname, cu))
- {
- set_type_vptr_fieldno (type, i);
- break;
- }
- }
+/* Check for GCC PR debug/45124 fix which is not present in any G++ version up
+ to 4.5.any while it is present already in G++ 4.6.0 - the PR has been fixed
+ during 4.6.0 experimental. */
- /* Complain if virtual function table field not found. */
- if (i < TYPE_N_BASECLASSES (t))
- complaint (&symfile_complaints,
- _("virtual function table pointer "
- "not found when defining class '%s'"),
- TYPE_TAG_NAME (type) ? TYPE_TAG_NAME (type) :
- "");
- }
- else
- {
- set_type_vptr_fieldno (type, TYPE_VPTR_FIELDNO (t));
- }
- }
- else if (cu->producer
- && startswith (cu->producer, "IBM(R) XL C/C++ Advanced Edition"))
- {
- /* The IBM XLC compiler does not provide direct indication
- of the containing type, but the vtable pointer is
- always named __vfp. */
+static int
+producer_is_gxx_lt_4_6 (struct dwarf2_cu *cu)
+{
+ if (!cu->checked_producer)
+ check_producer (cu);
- int i;
+ return cu->producer_is_gxx_lt_4_6;
+}
- for (i = TYPE_NFIELDS (type) - 1;
- i >= TYPE_N_BASECLASSES (type);
- --i)
- {
- if (strcmp (TYPE_FIELD_NAME (type, i), "__vfp") == 0)
- {
- set_type_vptr_fieldno (type, i);
- set_type_vptr_basetype (type, type);
- break;
- }
- }
- }
- }
+/* Return the default accessibility type if it is not overriden by
+ DW_AT_accessibility. */
- /* Copy fi.typedef_field_list linked list elements content into the
- allocated array TYPE_TYPEDEF_FIELD_ARRAY (type). */
- if (fi.typedef_field_list)
- {
- int i = fi.typedef_field_list_count;
+static enum dwarf_access_attribute
+dwarf2_default_access_attribute (struct die_info *die, struct dwarf2_cu *cu)
+{
+ if (cu->header.version < 3 || producer_is_gxx_lt_4_6 (cu))
+ {
+ /* The default DWARF 2 accessibility for members is public, the default
+ accessibility for inheritance is private. */
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- TYPE_TYPEDEF_FIELD_ARRAY (type)
- = ((struct decl_field *)
- TYPE_ALLOC (type, sizeof (TYPE_TYPEDEF_FIELD (type, 0)) * i));
- TYPE_TYPEDEF_FIELD_COUNT (type) = i;
+ if (die->tag != DW_TAG_inheritance)
+ return DW_ACCESS_public;
+ else
+ return DW_ACCESS_private;
+ }
+ else
+ {
+ /* DWARF 3+ defines the default accessibility a different way. The same
+ rules apply now for DW_TAG_inheritance as for the members and it only
+ depends on the container kind. */
- /* Reverse the list order to keep the debug info elements order. */
- while (--i >= 0)
- {
- struct decl_field *dest, *src;
+ if (die->parent->tag == DW_TAG_class_type)
+ return DW_ACCESS_private;
+ else
+ return DW_ACCESS_public;
+ }
+}
- dest = &TYPE_TYPEDEF_FIELD (type, i);
- src = &fi.typedef_field_list->field;
- fi.typedef_field_list = fi.typedef_field_list->next;
- *dest = *src;
- }
- }
+/* Look for DW_AT_data_member_location. Set *OFFSET to the byte
+ offset. If the attribute was not found return 0, otherwise return
+ 1. If it was found but could not properly be handled, set *OFFSET
+ to 0. */
- /* Copy fi.nested_types_list linked list elements content into the
- allocated array TYPE_NESTED_TYPES_ARRAY (type). */
- if (fi.nested_types_list != NULL && cu->language != language_ada)
- {
- int i = fi.nested_types_list_count;
+static int
+handle_data_member_location (struct die_info *die, struct dwarf2_cu *cu,
+ LONGEST *offset)
+{
+ struct attribute *attr;
- ALLOCATE_CPLUS_STRUCT_TYPE (type);
- TYPE_NESTED_TYPES_ARRAY (type)
- = ((struct decl_field *)
- TYPE_ALLOC (type, sizeof (struct decl_field) * i));
- TYPE_NESTED_TYPES_COUNT (type) = i;
+ attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
+ if (attr != NULL)
+ {
+ *offset = 0;
- /* Reverse the list order to keep the debug info elements order. */
- while (--i >= 0)
- {
- struct decl_field *dest, *src;
+ /* Note that we do not check for a section offset first here.
+ This is because DW_AT_data_member_location is new in DWARF 4,
+ so if we see it, we can assume that a constant form is really
+ a constant and not a section offset. */
+ if (attr_form_is_constant (attr))
+ *offset = dwarf2_get_attr_constant_value (attr, 0);
+ else if (attr_form_is_section_offset (attr))
+ dwarf2_complex_location_expr_complaint ();
+ else if (attr_form_is_block (attr))
+ *offset = decode_locdesc (DW_BLOCK (attr), cu);
+ else
+ dwarf2_complex_location_expr_complaint ();
- dest = &TYPE_NESTED_TYPES_FIELD (type, i);
- src = &fi.nested_types_list->field;
- fi.nested_types_list = fi.nested_types_list->next;
- *dest = *src;
- }
- }
-
- do_cleanups (back_to);
+ return 1;
}
- quirk_gcc_member_function_pointer (type, objfile);
+ return 0;
+}
- /* 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. */
+/* Add an aggregate field to the field list. */
- child_die = die->child;
+static void
+dwarf2_add_field (struct field_info *fip, struct die_info *die,
+ struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct nextfield *new_field;
+ struct attribute *attr;
+ struct field *fp;
+ const char *fieldname = "";
- while (child_die != NULL && child_die->tag)
+ if (die->tag == DW_TAG_inheritance)
{
- if (child_die->tag == DW_TAG_member
- || child_die->tag == DW_TAG_variable
- || child_die->tag == DW_TAG_inheritance
- || child_die->tag == DW_TAG_template_value_param
- || child_die->tag == DW_TAG_template_type_param)
- {
- /* Do nothing. */
- }
- else
- process_die (child_die, cu);
-
- child_die = sibling_die (child_die);
+ fip->baseclasses.emplace_back ();
+ new_field = &fip->baseclasses.back ();
+ }
+ else
+ {
+ fip->fields.emplace_back ();
+ new_field = &fip->fields.back ();
}
- /* Do not consider external references. According to the DWARF standard,
- these DIEs are identified by the fact that they have no byte_size
- attribute, and a declaration attribute. */
- if (dwarf2_attr (die, DW_AT_byte_size, cu) != NULL
- || !die_is_declaration (die, cu))
- new_symbol (die, type, cu);
-}
+ fip->nfields++;
-/* Assuming DIE is an enumeration type, and TYPE is its associated type,
- update TYPE using some information only available in DIE's children. */
+ attr = dwarf2_attr (die, DW_AT_accessibility, cu);
+ if (attr)
+ new_field->accessibility = DW_UNSND (attr);
+ else
+ new_field->accessibility = dwarf2_default_access_attribute (die, cu);
+ if (new_field->accessibility != DW_ACCESS_public)
+ fip->non_public_fields = 1;
-static void
-update_enumeration_type_from_children (struct die_info *die,
- struct type *type,
- struct dwarf2_cu *cu)
-{
- struct die_info *child_die;
- int unsigned_enum = 1;
- int flag_enum = 1;
- ULONGEST mask = 0;
+ attr = dwarf2_attr (die, DW_AT_virtuality, cu);
+ if (attr)
+ new_field->virtuality = DW_UNSND (attr);
+ else
+ new_field->virtuality = DW_VIRTUALITY_none;
- auto_obstack obstack;
+ fp = &new_field->field;
- for (child_die = die->child;
- child_die != NULL && child_die->tag;
- child_die = sibling_die (child_die))
+ if (die->tag == DW_TAG_member && ! die_is_declaration (die, cu))
{
- struct attribute *attr;
- LONGEST value;
- const gdb_byte *bytes;
- struct dwarf2_locexpr_baton *baton;
- const char *name;
+ LONGEST offset;
- if (child_die->tag != DW_TAG_enumerator)
- continue;
+ /* Data member other than a C++ static data member. */
- attr = dwarf2_attr (child_die, DW_AT_const_value, cu);
- if (attr == NULL)
- continue;
+ /* Get type of field. */
+ fp->type = die_type (die, cu);
- name = dwarf2_name (child_die, cu);
- if (name == NULL)
- name = "<anonymous enumerator>";
+ SET_FIELD_BITPOS (*fp, 0);
- dwarf2_const_value_attr (attr, type, name, &obstack, cu,
- &value, &bytes, &baton);
- if (value < 0)
+ /* Get bit size of field (zero if none). */
+ attr = dwarf2_attr (die, DW_AT_bit_size, cu);
+ if (attr)
{
- unsigned_enum = 0;
- flag_enum = 0;
+ FIELD_BITSIZE (*fp) = DW_UNSND (attr);
}
- else if ((mask & value) != 0)
- flag_enum = 0;
else
- mask |= value;
+ {
+ FIELD_BITSIZE (*fp) = 0;
+ }
- /* If we already know that the enum type is neither unsigned, nor
- a flag type, no need to look at the rest of the enumerates. */
- if (!unsigned_enum && !flag_enum)
- break;
- }
+ /* Get bit offset of field. */
+ if (handle_data_member_location (die, cu, &offset))
+ SET_FIELD_BITPOS (*fp, offset * bits_per_byte);
+ attr = dwarf2_attr (die, DW_AT_bit_offset, cu);
+ if (attr)
+ {
+ if (gdbarch_bits_big_endian (gdbarch))
+ {
+ /* For big endian bits, the DW_AT_bit_offset gives the
+ 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. */
+ SET_FIELD_BITPOS (*fp, FIELD_BITPOS (*fp) + DW_UNSND (attr));
+ }
+ else
+ {
+ /* For little endian bits, compute the bit offset to the
+ 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. */
+ int anonymous_size;
+ int bit_offset = DW_UNSND (attr);
- if (unsigned_enum)
- TYPE_UNSIGNED (type) = 1;
- if (flag_enum)
- TYPE_FLAG_ENUM (type) = 1;
-}
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ 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);
+ }
+ SET_FIELD_BITPOS (*fp,
+ (FIELD_BITPOS (*fp)
+ + anonymous_size * bits_per_byte
+ - bit_offset - FIELD_BITSIZE (*fp)));
+ }
+ }
+ attr = dwarf2_attr (die, DW_AT_data_bit_offset, cu);
+ if (attr != NULL)
+ SET_FIELD_BITPOS (*fp, (FIELD_BITPOS (*fp)
+ + dwarf2_get_attr_constant_value (attr, 0)));
-/* Given a DW_AT_enumeration_type die, set its type. We do not
- complete the type's fields yet, or create any symbols. */
+ /* Get name of field. */
+ fieldname = dwarf2_name (die, cu);
+ if (fieldname == NULL)
+ fieldname = "";
-static struct type *
-read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct type *type;
- struct attribute *attr;
- const char *name;
+ /* The name is already allocated along with this objfile, so we don't
+ need to duplicate it for the type. */
+ fp->name = fieldname;
- /* If the definition of this type lives in .debug_types, read that type.
- Don't follow DW_AT_specification though, that will take us back up
- the chain and we want to go down. */
- attr = dwarf2_attr_no_follow (die, DW_AT_signature);
- if (attr)
+ /* Change accessibility for artificial fields (e.g. virtual table
+ pointer or virtual base class pointer) to private. */
+ if (dwarf2_attr (die, DW_AT_artificial, cu))
+ {
+ FIELD_ARTIFICIAL (*fp) = 1;
+ new_field->accessibility = DW_ACCESS_private;
+ fip->non_public_fields = 1;
+ }
+ }
+ else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable)
{
- type = get_DW_AT_signature_type (die, attr, cu);
+ /* C++ static member. */
- /* The type's CU may not be the same as CU.
- Ensure TYPE is recorded with CU in die_type_hash. */
- return set_die_type (die, type, cu);
- }
+ /* 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. */
- type = alloc_type (objfile);
+ const char *physname;
- TYPE_CODE (type) = TYPE_CODE_ENUM;
- name = dwarf2_full_name (NULL, die, cu);
- if (name != NULL)
- TYPE_TAG_NAME (type) = name;
+ /* Get name of field. */
+ fieldname = dwarf2_name (die, cu);
+ if (fieldname == NULL)
+ return;
- attr = dwarf2_attr (die, DW_AT_type, cu);
- if (attr != NULL)
- {
- struct type *underlying_type = die_type (die, cu);
+ attr = dwarf2_attr (die, DW_AT_const_value, cu);
+ if (attr
+ /* Only create a symbol if this is an external value.
+ new_symbol checks this and puts the value in the global symbol
+ table, which we want. If it is not external, new_symbol
+ will try to put the value in cu->list_in_scope which is wrong. */
+ && dwarf2_flag_true_p (die, DW_AT_external, cu))
+ {
+ /* A static const member, not much different than an enum as far as
+ we're concerned, except that we can support more types. */
+ new_symbol (die, NULL, cu);
+ }
- TYPE_TARGET_TYPE (type) = underlying_type;
- }
+ /* Get physical name. */
+ physname = dwarf2_physname (fieldname, die, cu);
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- {
- TYPE_LENGTH (type) = DW_UNSND (attr);
+ /* 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 : "");
+ FIELD_TYPE (*fp) = die_type (die, cu);
+ FIELD_NAME (*fp) = fieldname;
}
- else
+ else if (die->tag == DW_TAG_inheritance)
{
- TYPE_LENGTH (type) = 0;
- }
+ LONGEST offset;
- /* The enumeration DIE can be incomplete. In Ada, any type can be
- declared as private in the package spec, and then defined only
- inside the package body. Such types are known as Taft Amendment
- Types. When another package uses such a type, an incomplete DIE
- may be generated by the compiler. */
- if (die_is_declaration (die, cu))
- TYPE_STUB (type) = 1;
-
- /* Finish the creation of this type by using the enum's children.
- We must call this even when the underlying type has been provided
- so that we can determine if we're looking at a "flag" enum. */
- update_enumeration_type_from_children (die, type, cu);
-
- /* If this type has an underlying type that is not a stub, then we
- may use its attributes. We always use the "unsigned" attribute
- in this situation, because ordinarily we guess whether the type
- is unsigned -- but the guess can be wrong and the underlying type
- can tell us the reality. However, we defer to a local size
- attribute if one exists, because this lets the compiler override
- the underlying type if needed. */
- if (TYPE_TARGET_TYPE (type) != NULL && !TYPE_STUB (TYPE_TARGET_TYPE (type)))
- {
- TYPE_UNSIGNED (type) = TYPE_UNSIGNED (TYPE_TARGET_TYPE (type));
- if (TYPE_LENGTH (type) == 0)
- TYPE_LENGTH (type) = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ /* C++ base class field. */
+ if (handle_data_member_location (die, cu, &offset))
+ SET_FIELD_BITPOS (*fp, offset * bits_per_byte);
+ FIELD_BITSIZE (*fp) = 0;
+ FIELD_TYPE (*fp) = die_type (die, cu);
+ FIELD_NAME (*fp) = TYPE_NAME (fp->type);
}
+ else if (die->tag == DW_TAG_variant_part)
+ {
+ /* process_structure_scope will treat this DIE as a union. */
+ process_structure_scope (die, cu);
- TYPE_DECLARED_CLASS (type) = dwarf2_flag_true_p (die, DW_AT_enum_class, cu);
-
- return set_die_type (die, type, cu);
+ /* The variant part is relative to the start of the enclosing
+ structure. */
+ SET_FIELD_BITPOS (*fp, 0);
+ fp->type = get_die_type (die, cu);
+ fp->artificial = 1;
+ fp->name = "<<variant>>";
+ }
+ else
+ gdb_assert_not_reached ("missing case in dwarf2_add_field");
}
-/* 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. */
+/* Can the type given by DIE define another type? */
-static void
-process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+static bool
+type_can_define_types (const struct die_info *die)
{
- struct type *this_type;
-
- this_type = get_die_type (die, cu);
- if (this_type == NULL)
- this_type = read_enumeration_type (die, cu);
-
- if (die->child != NULL)
+ switch (die->tag)
{
- struct die_info *child_die;
- struct symbol *sym;
- struct field *fields = NULL;
- int num_fields = 0;
- const char *name;
-
- child_die = die->child;
- while (child_die && child_die->tag)
- {
- if (child_die->tag != DW_TAG_enumerator)
- {
- process_die (child_die, cu);
- }
- else
- {
- name = dwarf2_name (child_die, cu);
- if (name)
- {
- sym = new_symbol (child_die, this_type, cu);
+ case DW_TAG_typedef:
+ case DW_TAG_class_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ case DW_TAG_enumeration_type:
+ return true;
- if ((num_fields % DW_FIELD_ALLOC_CHUNK) == 0)
- {
- fields = (struct field *)
- xrealloc (fields,
- (num_fields + DW_FIELD_ALLOC_CHUNK)
- * sizeof (struct field));
- }
+ default:
+ return false;
+ }
+}
- FIELD_NAME (fields[num_fields]) = SYMBOL_LINKAGE_NAME (sym);
- FIELD_TYPE (fields[num_fields]) = NULL;
- SET_FIELD_ENUMVAL (fields[num_fields], SYMBOL_VALUE (sym));
- FIELD_BITSIZE (fields[num_fields]) = 0;
+/* Add a type definition defined in the scope of the FIP's class. */
- num_fields++;
- }
- }
+static void
+dwarf2_add_type_defn (struct field_info *fip, struct die_info *die,
+ struct dwarf2_cu *cu)
+{
+ struct decl_field fp;
+ memset (&fp, 0, sizeof (fp));
- child_die = sibling_die (child_die);
- }
+ gdb_assert (type_can_define_types (die));
- if (num_fields)
- {
- TYPE_NFIELDS (this_type) = num_fields;
- TYPE_FIELDS (this_type) = (struct field *)
- TYPE_ALLOC (this_type, sizeof (struct field) * num_fields);
- memcpy (TYPE_FIELDS (this_type), fields,
- sizeof (struct field) * num_fields);
- xfree (fields);
- }
- }
+ /* Get name of field. NULL is okay here, meaning an anonymous type. */
+ fp.name = dwarf2_name (die, cu);
+ fp.type = read_type_die (die, cu);
- /* If we are reading an enum from a .debug_types unit, and the enum
- is a declaration, and the enum is not the signatured type in the
- unit, then we do not want to add a symbol for it. Adding a
- symbol would in some cases obscure the true definition of the
- enum, giving users an incomplete type when the definition is
- actually available. Note that we do not want to do this for all
- enums which are just declarations, because C++0x allows forward
- enum declarations. */
- if (cu->per_cu->is_debug_types
- && die_is_declaration (die, cu))
+ /* Save accessibility. */
+ enum dwarf_access_attribute accessibility;
+ struct attribute *attr = dwarf2_attr (die, DW_AT_accessibility, cu);
+ if (attr != NULL)
+ accessibility = (enum dwarf_access_attribute) DW_UNSND (attr);
+ else
+ accessibility = dwarf2_default_access_attribute (die, cu);
+ switch (accessibility)
{
- struct signatured_type *sig_type;
-
- sig_type = (struct signatured_type *) cu->per_cu;
- gdb_assert (to_underlying (sig_type->type_offset_in_section) != 0);
- if (sig_type->type_offset_in_section != die->sect_off)
- return;
+ case DW_ACCESS_public:
+ /* The assumed value if neither private nor protected. */
+ break;
+ case DW_ACCESS_private:
+ fp.is_private = 1;
+ break;
+ case DW_ACCESS_protected:
+ fp.is_protected = 1;
+ break;
+ default:
+ complaint (_("Unhandled DW_AT_accessibility value (%x)"), accessibility);
}
- new_symbol (die, this_type, cu);
+ if (die->tag == DW_TAG_typedef)
+ fip->typedef_field_list.push_back (fp);
+ else
+ fip->nested_types_list.push_back (fp);
}
-/* 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. */
+/* Create the vector of fields, and attach it to the type. */
-static struct type *
-read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+dwarf2_attach_fields_to_type (struct field_info *fip, struct type *type,
+ struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- struct die_info *child_die;
- struct type *type;
- struct type *element_type, *range_type, *index_type;
- struct attribute *attr;
- const char *name;
- unsigned int bit_stride = 0;
+ int nfields = fip->nfields;
- element_type = die_type (die, cu);
+ /* 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_ZALLOC (type, sizeof (struct field) * nfields);
- /* The die_type call above may have already set the type for this DIE. */
- type = get_die_type (die, cu);
- if (type)
- return type;
+ if (fip->non_public_fields && cu->language != language_ada)
+ {
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
- attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
- if (attr != NULL)
- bit_stride = DW_UNSND (attr) * 8;
+ TYPE_FIELD_PRIVATE_BITS (type) =
+ (B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
+ B_CLRALL (TYPE_FIELD_PRIVATE_BITS (type), nfields);
- attr = dwarf2_attr (die, DW_AT_bit_stride, cu);
- if (attr != NULL)
- bit_stride = DW_UNSND (attr);
+ TYPE_FIELD_PROTECTED_BITS (type) =
+ (B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
+ B_CLRALL (TYPE_FIELD_PROTECTED_BITS (type), nfields);
- /* Irix 6.2 native cc creates array types without children for
- arrays with unspecified length. */
- if (die->child == NULL)
+ 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->baseclasses.empty () && cu->language != language_ada)
{
- index_type = objfile_type (objfile)->builtin_int;
- range_type = create_static_range_type (NULL, index_type, 0, -1);
- type = create_array_type_with_stride (NULL, element_type, range_type,
- bit_stride);
- return set_die_type (die, type, cu);
+ int num_bytes = B_BYTES (fip->baseclasses.size ());
+ unsigned char *pointer;
+
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ pointer = (unsigned char *) TYPE_ALLOC (type, num_bytes);
+ TYPE_FIELD_VIRTUAL_BITS (type) = pointer;
+ B_CLRALL (TYPE_FIELD_VIRTUAL_BITS (type), fip->baseclasses.size ());
+ TYPE_N_BASECLASSES (type) = fip->baseclasses.size ();
}
- std::vector<struct type *> range_types;
- child_die = die->child;
- while (child_die && child_die->tag)
+ if (TYPE_FLAG_DISCRIMINATED_UNION (type))
{
- if (child_die->tag == DW_TAG_subrange_type)
+ struct discriminant_info *di = alloc_discriminant_info (type, -1, -1);
+
+ for (int index = 0; index < nfields; ++index)
{
- struct type *child_type = read_type_die (child_die, cu);
+ struct nextfield &field = fip->fields[index];
- if (child_type != NULL)
- {
- /* The range type was succesfully read. Save it for the
- array type creation. */
- range_types.push_back (child_type);
- }
+ if (field.variant.is_discriminant)
+ di->discriminant_index = index;
+ else if (field.variant.default_branch)
+ di->default_index = index;
+ else
+ di->discriminants[index] = field.variant.discriminant_value;
}
- 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;
-
- if (read_array_order (die, cu) == DW_ORD_col_major)
+ /* Copy the saved-up fields into the field vector. */
+ for (int i = 0; i < nfields; ++i)
{
- int i = 0;
+ struct nextfield &field
+ = ((i < fip->baseclasses.size ()) ? fip->baseclasses[i]
+ : fip->fields[i - fip->baseclasses.size ()]);
- while (i < range_types.size ())
- type = create_array_type_with_stride (NULL, type, range_types[i++],
- bit_stride);
- }
- else
- {
- size_t ndim = range_types.size ();
- while (ndim-- > 0)
- type = create_array_type_with_stride (NULL, type, range_types[ndim],
- bit_stride);
- }
+ TYPE_FIELD (type, i) = field.field;
+ switch (field.accessibility)
+ {
+ case DW_ACCESS_private:
+ if (cu->language != language_ada)
+ SET_TYPE_FIELD_PRIVATE (type, i);
+ break;
- /* 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. */
- attr = dwarf2_attr (die, DW_AT_GNU_vector, cu);
- if (attr)
- make_vector_type (type);
+ case DW_ACCESS_protected:
+ if (cu->language != language_ada)
+ SET_TYPE_FIELD_PROTECTED (type, i);
+ break;
- /* The DIE may have DW_AT_byte_size set. For example an OpenCL
- implementation may choose to implement triple vectors using this
- attribute. */
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- {
- if (DW_UNSND (attr) >= TYPE_LENGTH (type))
- TYPE_LENGTH (type) = DW_UNSND (attr);
- else
- complaint (&symfile_complaints,
- _("DW_AT_byte_size for array type smaller "
- "than the total size of elements"));
- }
-
- name = dwarf2_name (die, cu);
- if (name)
- TYPE_NAME (type) = name;
-
- /* Install the type in the die. */
- set_die_type (die, type, cu);
-
- /* set_die_type should be already done. */
- set_descriptive_type (type, die, cu);
+ case DW_ACCESS_public:
+ break;
- return type;
+ default:
+ /* Unknown accessibility. Complain and treat it as public. */
+ {
+ complaint (_("unsupported accessibility %d"),
+ field.accessibility);
+ }
+ break;
+ }
+ if (i < fip->baseclasses.size ())
+ {
+ switch (field.virtuality)
+ {
+ case DW_VIRTUALITY_virtual:
+ case DW_VIRTUALITY_pure_virtual:
+ if (cu->language == language_ada)
+ error (_("unexpected virtuality in component of Ada type"));
+ SET_TYPE_FIELD_VIRTUAL (type, i);
+ break;
+ }
+ }
+ }
}
-static enum dwarf_array_dim_ordering
-read_array_order (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *attr;
-
- attr = dwarf2_attr (die, DW_AT_ordering, cu);
+/* Return true if this member function is a constructor, false
+ otherwise. */
- if (attr)
- return (enum dwarf_array_dim_ordering) DW_SND (attr);
+static int
+dwarf2_is_constructor (struct die_info *die, struct dwarf2_cu *cu)
+{
+ const char *fieldname;
+ const char *type_name;
+ int len;
- /* GNU F77 is a special case, as at 08/2004 array type info is the
- opposite order to the dwarf2 specification, but data is still
- laid out as per normal fortran.
+ if (die->parent == NULL)
+ return 0;
- FIXME: dsl/2004-8-20: If G77 is ever fixed, this will also need
- version checking. */
+ if (die->parent->tag != DW_TAG_structure_type
+ && die->parent->tag != DW_TAG_union_type
+ && die->parent->tag != DW_TAG_class_type)
+ return 0;
- if (cu->language == language_fortran
- && cu->producer && strstr (cu->producer, "GNU F77"))
- {
- return DW_ORD_row_major;
- }
+ fieldname = dwarf2_name (die, cu);
+ type_name = dwarf2_name (die->parent, cu);
+ if (fieldname == NULL || type_name == NULL)
+ return 0;
- switch (cu->language_defn->la_array_ordering)
- {
- case array_column_major:
- return DW_ORD_col_major;
- case array_row_major:
- default:
- return DW_ORD_row_major;
- };
+ len = strlen (fieldname);
+ return (strncmp (fieldname, type_name, len) == 0
+ && (type_name[len] == '\0' || type_name[len] == '<'));
}
-/* Extract all information from a DW_TAG_set_type DIE and put it in
- the DIE's type field. */
+/* Add a member function to the proper fieldlist. */
-static struct type *
-read_set_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+ struct type *type, struct dwarf2_cu *cu)
{
- struct type *domain_type, *set_type;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
struct attribute *attr;
+ int i;
+ struct fnfieldlist *flp = nullptr;
+ struct fn_field *fnp;
+ const char *fieldname;
+ struct type *this_type;
+ enum dwarf_access_attribute accessibility;
- domain_type = die_type (die, cu);
-
- /* The die_type call above may have already set the type for this DIE. */
- set_type = get_die_type (die, cu);
- if (set_type)
- return set_type;
-
- set_type = create_set_type (NULL, domain_type);
+ if (cu->language == language_ada)
+ error (_("unexpected member function in Ada type"));
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- TYPE_LENGTH (set_type) = DW_UNSND (attr);
+ /* Get name of member function. */
+ fieldname = dwarf2_name (die, cu);
+ if (fieldname == NULL)
+ return;
- return set_die_type (die, set_type, cu);
-}
+ /* Look up member function name in fieldlist. */
+ for (i = 0; i < fip->fnfieldlists.size (); i++)
+ {
+ if (strcmp (fip->fnfieldlists[i].name, fieldname) == 0)
+ {
+ flp = &fip->fnfieldlists[i];
+ break;
+ }
+ }
-/* A helper for read_common_block that creates a locexpr baton.
- SYM is the symbol which we are marking as computed.
- COMMON_DIE is the DIE for the common block.
- COMMON_LOC is the location expression attribute for the common
- block itself.
- MEMBER_LOC is the location expression attribute for the particular
- member of the common block that we are processing.
- CU is the CU from which the above come. */
+ /* Create a new fnfieldlist if necessary. */
+ if (flp == nullptr)
+ {
+ fip->fnfieldlists.emplace_back ();
+ flp = &fip->fnfieldlists.back ();
+ flp->name = fieldname;
+ i = fip->fnfieldlists.size () - 1;
+ }
-static void
-mark_common_block_symbol_computed (struct symbol *sym,
- struct die_info *common_die,
- struct attribute *common_loc,
- struct attribute *member_loc,
- struct dwarf2_cu *cu)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_locexpr_baton *baton;
- gdb_byte *ptr;
- unsigned int cu_off;
- enum bfd_endian byte_order = gdbarch_byte_order (get_objfile_arch (objfile));
- LONGEST offset = 0;
+ /* Create a new member function field and add it to the vector of
+ fnfieldlists. */
+ flp->fnfields.emplace_back ();
+ fnp = &flp->fnfields.back ();
- gdb_assert (common_loc && member_loc);
- gdb_assert (attr_form_is_block (common_loc));
- gdb_assert (attr_form_is_block (member_loc)
- || attr_form_is_constant (member_loc));
+ /* Delay processing of the physname until later. */
+ if (cu->language == language_cplus)
+ add_to_method_list (type, i, flp->fnfields.size () - 1, fieldname,
+ die, cu);
+ else
+ {
+ const char *physname = dwarf2_physname (fieldname, die, cu);
+ fnp->physname = physname ? physname : "";
+ }
- baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
- baton->per_cu = cu->per_cu;
- gdb_assert (baton->per_cu);
+ fnp->type = alloc_type (objfile);
+ this_type = read_type_die (die, cu);
+ if (this_type && TYPE_CODE (this_type) == TYPE_CODE_FUNC)
+ {
+ int nparams = TYPE_NFIELDS (this_type);
- baton->size = 5 /* DW_OP_call4 */ + 1 /* DW_OP_plus */;
+ /* TYPE is the domain of this method, and THIS_TYPE is the type
+ of the method itself (TYPE_CODE_METHOD). */
+ smash_to_method_type (fnp->type, type,
+ TYPE_TARGET_TYPE (this_type),
+ TYPE_FIELDS (this_type),
+ TYPE_NFIELDS (this_type),
+ TYPE_VARARGS (this_type));
- if (attr_form_is_constant (member_loc))
- {
- offset = dwarf2_get_attr_constant_value (member_loc, 0);
- baton->size += 1 /* DW_OP_addr */ + cu->header.addr_size;
+ /* Handle static member functions.
+ 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. */
+ if (nparams == 0 || TYPE_FIELD_ARTIFICIAL (this_type, 0) == 0)
+ fnp->voffset = VOFFSET_STATIC;
}
else
- baton->size += DW_BLOCK (member_loc)->size;
+ complaint (_("member function type missing for '%s'"),
+ dwarf2_full_name (fieldname, die, cu));
- ptr = (gdb_byte *) obstack_alloc (&objfile->objfile_obstack, baton->size);
- baton->data = ptr;
+ /* Get fcontext from DW_AT_containing_type if present. */
+ if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
+ fnp->fcontext = die_containing_type (die, cu);
- *ptr++ = DW_OP_call4;
- cu_off = common_die->sect_off - cu->per_cu->sect_off;
- store_unsigned_integer (ptr, 4, byte_order, cu_off);
- ptr += 4;
+ /* 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. */
- if (attr_form_is_constant (member_loc))
- {
- *ptr++ = DW_OP_addr;
- store_unsigned_integer (ptr, cu->header.addr_size, byte_order, offset);
- ptr += cu->header.addr_size;
- }
+ /* Get accessibility. */
+ attr = dwarf2_attr (die, DW_AT_accessibility, cu);
+ if (attr)
+ accessibility = (enum dwarf_access_attribute) DW_UNSND (attr);
else
+ accessibility = dwarf2_default_access_attribute (die, cu);
+ switch (accessibility)
{
- /* We have to copy the data here, because DW_OP_call4 will only
- use a DW_AT_location attribute. */
- memcpy (ptr, DW_BLOCK (member_loc)->data, DW_BLOCK (member_loc)->size);
- ptr += DW_BLOCK (member_loc)->size;
+ case DW_ACCESS_private:
+ fnp->is_private = 1;
+ break;
+ case DW_ACCESS_protected:
+ fnp->is_protected = 1;
+ break;
}
- *ptr++ = DW_OP_plus;
- gdb_assert (ptr - baton->data == baton->size);
-
- SYMBOL_LOCATION_BATON (sym) = baton;
- SYMBOL_ACLASS_INDEX (sym) = dwarf2_locexpr_index;
-}
+ /* Check for artificial methods. */
+ attr = dwarf2_attr (die, DW_AT_artificial, cu);
+ if (attr && DW_UNSND (attr) != 0)
+ fnp->is_artificial = 1;
-/* Create appropriate locally-scoped variables for all the
- DW_TAG_common_block entries. Also create a struct common_block
- listing all such variables for `info common'. COMMON_BLOCK_DOMAIN
- is used to sepate the common blocks name namespace from regular
- variable names. */
+ fnp->is_constructor = dwarf2_is_constructor (die, cu);
-static void
-read_common_block (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *attr;
+ /* Get index in virtual function table if it is a virtual member
+ function. For older versions of GCC, this is an offset in the
+ appropriate virtual table, as specified by DW_AT_containing_type.
+ For everyone else, it is an expression to be evaluated relative
+ to the object address. */
- attr = dwarf2_attr (die, DW_AT_location, cu);
+ attr = dwarf2_attr (die, DW_AT_vtable_elem_location, cu);
if (attr)
{
- /* Support the .debug_loc offsets. */
- if (attr_form_is_block (attr))
+ if (attr_form_is_block (attr) && DW_BLOCK (attr)->size > 0)
{
- /* Ok. */
- }
- else if (attr_form_is_section_offset (attr))
+ if (DW_BLOCK (attr)->data[0] == DW_OP_constu)
+ {
+ /* Old-style GCC. */
+ fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu) + 2;
+ }
+ else if (DW_BLOCK (attr)->data[0] == DW_OP_deref
+ || (DW_BLOCK (attr)->size > 1
+ && DW_BLOCK (attr)->data[0] == DW_OP_deref_size
+ && DW_BLOCK (attr)->data[1] == cu->header.addr_size))
+ {
+ fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu);
+ if ((fnp->voffset % cu->header.addr_size) != 0)
+ dwarf2_complex_location_expr_complaint ();
+ else
+ fnp->voffset /= cu->header.addr_size;
+ fnp->voffset += 2;
+ }
+ else
+ dwarf2_complex_location_expr_complaint ();
+
+ if (!fnp->fcontext)
+ {
+ /* If there is no `this' field and no DW_AT_containing_type,
+ we cannot actually find a base class context for the
+ vtable! */
+ if (TYPE_NFIELDS (this_type) == 0
+ || !TYPE_FIELD_ARTIFICIAL (this_type, 0))
+ {
+ complaint (_("cannot determine context for virtual member "
+ "function \"%s\" (offset %s)"),
+ fieldname, sect_offset_str (die->sect_off));
+ }
+ else
+ {
+ fnp->fcontext
+ = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (this_type, 0));
+ }
+ }
+ }
+ else if (attr_form_is_section_offset (attr))
{
dwarf2_complex_location_expr_complaint ();
- attr = NULL;
}
else
{
- dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
- "common block member");
- attr = NULL;
+ dwarf2_invalid_attrib_class_complaint ("DW_AT_vtable_elem_location",
+ fieldname);
}
}
-
- if (die->child != NULL)
+ else
{
- struct objfile *objfile = cu->objfile;
- struct die_info *child_die;
- size_t n_entries = 0, size;
- struct common_block *common_block;
- struct symbol *sym;
-
- for (child_die = die->child;
- child_die && child_die->tag;
- child_die = sibling_die (child_die))
- ++n_entries;
-
- size = (sizeof (struct common_block)
- + (n_entries - 1) * sizeof (struct symbol *));
- common_block
- = (struct common_block *) obstack_alloc (&objfile->objfile_obstack,
- size);
- memset (common_block->contents, 0, n_entries * sizeof (struct symbol *));
- common_block->n_entries = 0;
-
- for (child_die = die->child;
- child_die && child_die->tag;
- child_die = sibling_die (child_die))
+ attr = dwarf2_attr (die, DW_AT_virtuality, cu);
+ if (attr && DW_UNSND (attr))
{
- /* Create the symbol in the DW_TAG_common_block block in the current
- symbol scope. */
- sym = new_symbol (child_die, NULL, cu);
- if (sym != NULL)
- {
- struct attribute *member_loc;
-
- common_block->contents[common_block->n_entries++] = sym;
-
- member_loc = dwarf2_attr (child_die, DW_AT_data_member_location,
- cu);
- if (member_loc)
- {
- /* GDB has handled this for a long time, but it is
- not specified by DWARF. It seems to have been
- emitted by gfortran at least as recently as:
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23057. */
- complaint (&symfile_complaints,
- _("Variable in common block has "
- "DW_AT_data_member_location "
- "- DIE at 0x%x [in module %s]"),
- to_underlying (child_die->sect_off),
- objfile_name (cu->objfile));
-
- if (attr_form_is_section_offset (member_loc))
- dwarf2_complex_location_expr_complaint ();
- else if (attr_form_is_constant (member_loc)
- || attr_form_is_block (member_loc))
- {
- if (attr)
- mark_common_block_symbol_computed (sym, die, attr,
- member_loc, cu);
- }
- else
- dwarf2_complex_location_expr_complaint ();
- }
- }
+ /* GCC does this, as of 2008-08-25; PR debug/37237. */
+ complaint (_("Member function \"%s\" (offset %s) is virtual "
+ "but the vtable offset is not specified"),
+ fieldname, sect_offset_str (die->sect_off));
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ TYPE_CPLUS_DYNAMIC (type) = 1;
}
-
- sym = new_symbol (die, objfile_type (objfile)->builtin_void, cu);
- SYMBOL_VALUE_COMMON_BLOCK (sym) = common_block;
}
}
-/* Create a type for a C++ namespace. */
+/* Create the vector of member function fields, and attach it to the type. */
-static struct type *
-read_namespace_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+dwarf2_attach_fn_fields_to_type (struct field_info *fip, struct type *type,
+ struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- const char *previous_prefix, *name;
- int is_anonymous;
- struct type *type;
+ if (cu->language == language_ada)
+ error (_("unexpected member functions in Ada type"));
- /* For extensions, reuse the type of the original namespace. */
- if (dwarf2_attr (die, DW_AT_extension, cu) != NULL)
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ TYPE_FN_FIELDLISTS (type) = (struct fn_fieldlist *)
+ TYPE_ALLOC (type,
+ sizeof (struct fn_fieldlist) * fip->fnfieldlists.size ());
+
+ for (int i = 0; i < fip->fnfieldlists.size (); i++)
{
- struct die_info *ext_die;
- struct dwarf2_cu *ext_cu = cu;
+ struct fnfieldlist &nf = fip->fnfieldlists[i];
+ struct fn_fieldlist *fn_flp = &TYPE_FN_FIELDLIST (type, i);
- ext_die = dwarf2_extension (die, &ext_cu);
- type = read_type_die (ext_die, ext_cu);
+ TYPE_FN_FIELDLIST_NAME (type, i) = nf.name;
+ TYPE_FN_FIELDLIST_LENGTH (type, i) = nf.fnfields.size ();
+ fn_flp->fn_fields = (struct fn_field *)
+ TYPE_ALLOC (type, sizeof (struct fn_field) * nf.fnfields.size ());
- /* EXT_CU may not be the same as CU.
- Ensure TYPE is recorded with CU in die_type_hash. */
- return set_die_type (die, type, cu);
+ for (int k = 0; k < nf.fnfields.size (); ++k)
+ fn_flp->fn_fields[k] = nf.fnfields[k];
}
- name = namespace_name (die, &is_anonymous, cu);
-
- /* Now build the name of the current namespace. */
+ TYPE_NFN_FIELDS (type) = fip->fnfieldlists.size ();
+}
- previous_prefix = determine_prefix (die, cu);
- if (previous_prefix[0] != '\0')
- name = typename_concat (&objfile->objfile_obstack,
- previous_prefix, name, 0, cu);
+/* Returns non-zero if NAME is the name of a vtable member in CU's
+ language, zero otherwise. */
+static int
+is_vtable_name (const char *name, struct dwarf2_cu *cu)
+{
+ static const char vptr[] = "_vptr";
- /* Create the type. */
- type = init_type (objfile, TYPE_CODE_NAMESPACE, 0, name);
- TYPE_TAG_NAME (type) = TYPE_NAME (type);
+ /* Look for the C++ form of the vtable. */
+ if (startswith (name, vptr) && is_cplus_marker (name[sizeof (vptr) - 1]))
+ return 1;
- return set_die_type (die, type, cu);
+ return 0;
}
-/* Read a namespace scope. */
+/* GCC outputs unnamed structures that are really pointers to member
+ functions, with the ABI-specified layout. If TYPE describes
+ such a structure, smash it into a member function type.
+
+ GCC shouldn't do this; it should just output pointer to member DIEs.
+ This is GCC PR debug/28767. */
static void
-read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+quirk_gcc_member_function_pointer (struct type *type, struct objfile *objfile)
{
- struct objfile *objfile = cu->objfile;
- int is_anonymous;
+ struct type *pfn_type, *self_type, *new_type;
- /* 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. */
+ /* Check for a structure with no name and two children. */
+ if (TYPE_CODE (type) != TYPE_CODE_STRUCT || TYPE_NFIELDS (type) != 2)
+ return;
- if (dwarf2_attr (die, DW_AT_extension, cu) == NULL)
- {
- struct type *type;
+ /* Check for __pfn and __delta members. */
+ if (TYPE_FIELD_NAME (type, 0) == NULL
+ || strcmp (TYPE_FIELD_NAME (type, 0), "__pfn") != 0
+ || TYPE_FIELD_NAME (type, 1) == NULL
+ || strcmp (TYPE_FIELD_NAME (type, 1), "__delta") != 0)
+ return;
- type = read_type_die (die, cu);
- new_symbol (die, type, cu);
+ /* Find the type of the method. */
+ pfn_type = TYPE_FIELD_TYPE (type, 0);
+ if (pfn_type == NULL
+ || TYPE_CODE (pfn_type) != TYPE_CODE_PTR
+ || TYPE_CODE (TYPE_TARGET_TYPE (pfn_type)) != TYPE_CODE_FUNC)
+ return;
- namespace_name (die, &is_anonymous, cu);
- if (is_anonymous)
- {
- const char *previous_prefix = determine_prefix (die, cu);
+ /* Look for the "this" argument. */
+ pfn_type = TYPE_TARGET_TYPE (pfn_type);
+ if (TYPE_NFIELDS (pfn_type) == 0
+ /* || TYPE_FIELD_TYPE (pfn_type, 0) == NULL */
+ || TYPE_CODE (TYPE_FIELD_TYPE (pfn_type, 0)) != TYPE_CODE_PTR)
+ return;
- std::vector<const char *> excludes;
- add_using_directive (using_directives (cu->language),
- previous_prefix, TYPE_NAME (type), NULL,
- NULL, excludes, 0, &objfile->objfile_obstack);
- }
- }
+ self_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (pfn_type, 0));
+ new_type = alloc_type (objfile);
+ smash_to_method_type (new_type, self_type, TYPE_TARGET_TYPE (pfn_type),
+ TYPE_FIELDS (pfn_type), TYPE_NFIELDS (pfn_type),
+ TYPE_VARARGS (pfn_type));
+ smash_to_methodptr_type (type, new_type);
+}
- if (die->child != NULL)
+/* If the DIE has a DW_AT_alignment attribute, return its value, doing
+ appropriate error checking and issuing complaints if there is a
+ problem. */
+
+static ULONGEST
+get_alignment (struct dwarf2_cu *cu, struct die_info *die)
+{
+ struct attribute *attr = dwarf2_attr (die, DW_AT_alignment, cu);
+
+ if (attr == nullptr)
+ return 0;
+
+ if (!attr_form_is_constant (attr))
{
- struct die_info *child_die = die->child;
+ complaint (_("DW_AT_alignment must have constant form"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ return 0;
+ }
- while (child_die && child_die->tag)
+ ULONGEST align;
+ if (attr->form == DW_FORM_sdata)
+ {
+ LONGEST val = DW_SND (attr);
+ if (val < 0)
{
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
+ complaint (_("DW_AT_alignment value must not be negative"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ return 0;
}
+ align = val;
}
-}
-
-/* Read a Fortran module as type. This DIE can be only a declaration used for
- imported module. Still we need that type as local Fortran "use ... only"
- declaration imports depend on the created type in determine_prefix. */
-
-static struct type *
-read_module_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- const char *module_name;
- struct type *type;
-
- module_name = dwarf2_name (die, cu);
- if (!module_name)
- complaint (&symfile_complaints,
- _("DW_TAG_module has no name, offset 0x%x"),
- to_underlying (die->sect_off));
- type = init_type (objfile, TYPE_CODE_MODULE, 0, module_name);
+ else
+ align = DW_UNSND (attr);
- /* determine_prefix uses TYPE_TAG_NAME. */
- TYPE_TAG_NAME (type) = TYPE_NAME (type);
+ if (align == 0)
+ {
+ complaint (_("DW_AT_alignment value must not be zero"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ return 0;
+ }
+ if ((align & (align - 1)) != 0)
+ {
+ complaint (_("DW_AT_alignment value must be a power of 2"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ return 0;
+ }
- return set_die_type (die, type, cu);
+ return align;
}
-/* Read a Fortran module. */
+/* If the DIE has a DW_AT_alignment attribute, use its value to set
+ the alignment for TYPE. */
static void
-read_module (struct die_info *die, struct dwarf2_cu *cu)
+maybe_set_alignment (struct dwarf2_cu *cu, struct die_info *die,
+ struct type *type)
{
- struct die_info *child_die = die->child;
- struct type *type;
+ if (!set_type_align (type, get_alignment (cu, die)))
+ complaint (_("DW_AT_alignment value too large"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+}
- type = read_type_die (die, cu);
- new_symbol (die, type, cu);
-
- while (child_die && child_die->tag)
- {
- process_die (child_die, cu);
- child_die = sibling_die (child_die);
- }
-}
+/* Called when we find the DIE that starts a structure or union scope
+ (definition) to create a type for the structure or union. Fill in
+ the type's name and general properties; the members will not be
+ processed until process_structure_scope. A symbol table entry for
+ the type will also not be done until process_structure_scope (assuming
+ the type has a name).
-/* Return the name of the namespace represented by DIE. Set
- *IS_ANONYMOUS to tell whether or not the namespace is an anonymous
- namespace. */
+ NOTE: we need to call these functions regardless of whether or not the
+ DIE has a DW_AT_name attribute, since it might be an anonymous
+ structure or union. This gets the type entered into our set of
+ user defined types. */
-static const char *
-namespace_name (struct die_info *die, int *is_anonymous, struct dwarf2_cu *cu)
+static struct type *
+read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
{
- struct die_info *current_die;
- const char *name = NULL;
-
- /* Loop through the extensions until we find a name. */
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct type *type;
+ struct attribute *attr;
+ const char *name;
- for (current_die = die;
- current_die != NULL;
- current_die = dwarf2_extension (die, &cu))
+ /* If the definition of this type lives in .debug_types, read that type.
+ Don't follow DW_AT_specification though, that will take us back up
+ the chain and we want to go down. */
+ attr = dwarf2_attr_no_follow (die, DW_AT_signature);
+ if (attr)
{
- /* We don't use dwarf2_name here so that we can detect the absence
- of a name -> anonymous namespace. */
- name = dwarf2_string_attr (die, DW_AT_name, cu);
+ type = get_DW_AT_signature_type (die, attr, cu);
- if (name != NULL)
- break;
+ /* The type's CU may not be the same as CU.
+ Ensure TYPE is recorded with CU in die_type_hash. */
+ return set_die_type (die, type, cu);
}
- /* Is it an anonymous namespace? */
+ type = alloc_type (objfile);
+ INIT_CPLUS_SPECIFIC (type);
- *is_anonymous = (name == NULL);
- if (*is_anonymous)
- name = CP_ANONYMOUS_NAMESPACE_STR;
+ name = dwarf2_name (die, cu);
+ if (name != NULL)
+ {
+ if (cu->language == language_cplus
+ || cu->language == language_d
+ || cu->language == language_rust)
+ {
+ const char *full_name = dwarf2_full_name (name, die, cu);
- return name;
-}
+ /* dwarf2_full_name might have already finished building the DIE's
+ type. If so, there is no need to continue. */
+ if (get_die_type (die, cu) != NULL)
+ return get_die_type (die, cu);
-/* Extract all information from a DW_TAG_pointer_type DIE and add to
- the user defined type vector. */
+ TYPE_NAME (type) = full_name;
+ }
+ else
+ {
+ /* The name is already allocated along with this objfile, so
+ we don't need to duplicate it for the type. */
+ TYPE_NAME (type) = name;
+ }
+ }
-static struct type *
-read_tag_pointer_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct gdbarch *gdbarch = get_objfile_arch (cu->objfile);
- struct comp_unit_head *cu_header = &cu->header;
- struct type *type;
- struct attribute *attr_byte_size;
- struct attribute *attr_address_class;
- int byte_size, addr_class;
- struct type *target_type;
+ 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 if (die->tag == DW_TAG_variant_part)
+ {
+ TYPE_CODE (type) = TYPE_CODE_UNION;
+ TYPE_FLAG_DISCRIMINATED_UNION (type) = 1;
+ }
+ else
+ {
+ TYPE_CODE (type) = TYPE_CODE_STRUCT;
+ }
- target_type = die_type (die, cu);
+ if (cu->language == language_cplus && die->tag == DW_TAG_class_type)
+ TYPE_DECLARED_CLASS (type) = 1;
- /* The die_type call above may have already set the type for this DIE. */
- type = get_die_type (die, cu);
- if (type)
- return type;
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
+ {
+ if (attr_form_is_constant (attr))
+ TYPE_LENGTH (type) = DW_UNSND (attr);
+ else
+ {
+ /* For the moment, dynamic type sizes are not supported
+ by GDB's struct type. The actual size is determined
+ on-demand when resolving the type of a given object,
+ so set the type's length to zero for now. Otherwise,
+ we record an expression as the length, and that expression
+ could lead to a very large value, which could eventually
+ lead to us trying to allocate that much memory when creating
+ a value of that type. */
+ TYPE_LENGTH (type) = 0;
+ }
+ }
+ else
+ {
+ TYPE_LENGTH (type) = 0;
+ }
- type = lookup_pointer_type (target_type);
+ maybe_set_alignment (cu, die, type);
- attr_byte_size = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr_byte_size)
- byte_size = DW_UNSND (attr_byte_size);
+ if (producer_is_icc_lt_14 (cu) && (TYPE_LENGTH (type) == 0))
+ {
+ /* ICC<14 does not output the required DW_AT_declaration on
+ incomplete types, but gives them a size of zero. */
+ TYPE_STUB (type) = 1;
+ }
else
- byte_size = cu_header->addr_size;
+ TYPE_STUB_SUPPORTED (type) = 1;
- attr_address_class = dwarf2_attr (die, DW_AT_address_class, cu);
- if (attr_address_class)
- addr_class = DW_UNSND (attr_address_class);
- else
- addr_class = DW_ADDR_none;
+ if (die_is_declaration (die, cu))
+ TYPE_STUB (type) = 1;
+ else if (attr == NULL && die->child == NULL
+ && producer_is_realview (cu->producer))
+ /* RealView does not output the required DW_AT_declaration
+ on incomplete types. */
+ TYPE_STUB (type) = 1;
+
+ /* 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. */
+ set_die_type (die, type, cu);
- /* 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)
+ /* set_die_type should be already done. */
+ set_descriptive_type (type, die, cu);
+
+ return type;
+}
+
+/* A helper for process_structure_scope that handles a single member
+ DIE. */
+
+static void
+handle_struct_member_die (struct die_info *child_die, struct type *type,
+ struct field_info *fi,
+ std::vector<struct symbol *> *template_args,
+ struct dwarf2_cu *cu)
+{
+ if (child_die->tag == DW_TAG_member
+ || child_die->tag == DW_TAG_variable
+ || child_die->tag == DW_TAG_variant_part)
{
- if (gdbarch_address_class_type_flags_p (gdbarch))
+ /* 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. */
+ dwarf2_add_field (fi, child_die, cu);
+ }
+ else if (child_die->tag == DW_TAG_subprogram)
+ {
+ /* Rust doesn't have member functions in the C++ sense.
+ However, it does emit ordinary functions as children
+ of a struct DIE. */
+ if (cu->language == language_rust)
+ read_func_scope (child_die, cu);
+ else
{
- int type_flags;
-
- type_flags = gdbarch_address_class_type_flags
- (gdbarch, byte_size, addr_class);
- gdb_assert ((type_flags & ~TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL)
- == 0);
- type = make_type_with_address_space (type, type_flags);
+ /* C++ member function. */
+ dwarf2_add_member_fn (fi, child_die, type, cu);
}
- else if (TYPE_LENGTH (type) != byte_size)
+ }
+ else if (child_die->tag == DW_TAG_inheritance)
+ {
+ /* C++ base class field. */
+ dwarf2_add_field (fi, child_die, cu);
+ }
+ else if (type_can_define_types (child_die))
+ dwarf2_add_type_defn (fi, child_die, cu);
+ else if (child_die->tag == DW_TAG_template_type_param
+ || child_die->tag == DW_TAG_template_value_param)
+ {
+ struct symbol *arg = new_symbol (child_die, NULL, cu);
+
+ if (arg != NULL)
+ template_args->push_back (arg);
+ }
+ else if (child_die->tag == DW_TAG_variant)
+ {
+ /* In a variant we want to get the discriminant and also add a
+ field for our sole member child. */
+ struct attribute *discr = dwarf2_attr (child_die, DW_AT_discr_value, cu);
+
+ for (struct die_info *variant_child = child_die->child;
+ variant_child != NULL;
+ variant_child = sibling_die (variant_child))
{
- complaint (&symfile_complaints,
- _("invalid pointer size %d"), byte_size);
+ if (variant_child->tag == DW_TAG_member)
+ {
+ handle_struct_member_die (variant_child, type, fi,
+ template_args, cu);
+ /* Only handle the one. */
+ break;
+ }
}
+
+ /* We don't handle this but we might as well report it if we see
+ it. */
+ if (dwarf2_attr (child_die, DW_AT_discr_list, cu) != nullptr)
+ complaint (_("DW_AT_discr_list is not supported yet"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+
+ /* The first field was just added, so we can stash the
+ discriminant there. */
+ gdb_assert (!fi->fields.empty ());
+ if (discr == NULL)
+ fi->fields.back ().variant.default_branch = true;
else
- {
- /* Should we also complain about unhandled address classes? */
- }
+ fi->fields.back ().variant.discriminant_value = DW_UNSND (discr);
}
-
- TYPE_LENGTH (type) = byte_size;
- return set_die_type (die, type, cu);
}
-/* Extract all information from a DW_TAG_ptr_to_member_type DIE and add to
- the user defined type vector. */
+/* Finish creating a structure or union type, including filling in
+ its members and creating a symbol for it. */
-static struct type *
-read_tag_ptr_to_member_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct die_info *child_die;
struct type *type;
- struct type *to_type;
- struct type *domain;
- to_type = die_type (die, cu);
- domain = die_containing_type (die, cu);
-
- /* The calls above may have already set the type for this DIE. */
type = get_die_type (die, cu);
- if (type)
- return type;
+ if (type == NULL)
+ type = read_structure_type (die, cu);
- if (TYPE_CODE (check_typedef (to_type)) == TYPE_CODE_METHOD)
- type = lookup_methodptr_type (to_type);
- else if (TYPE_CODE (check_typedef (to_type)) == TYPE_CODE_FUNC)
+ /* When reading a DW_TAG_variant_part, we need to notice when we
+ read the discriminant member, so we can record it later in the
+ discriminant_info. */
+ bool is_variant_part = TYPE_FLAG_DISCRIMINATED_UNION (type);
+ sect_offset discr_offset;
+
+ if (is_variant_part)
{
- struct type *new_type = alloc_type (cu->objfile);
+ struct attribute *discr = dwarf2_attr (die, DW_AT_discr, cu);
+ if (discr == NULL)
+ {
+ /* Maybe it's a univariant form, an extension we support.
+ In this case arrange not to check the offset. */
+ is_variant_part = false;
+ }
+ else if (attr_form_is_ref (discr))
+ {
+ struct dwarf2_cu *target_cu = cu;
+ struct die_info *target_die = follow_die_ref (die, discr, &target_cu);
- smash_to_method_type (new_type, domain, TYPE_TARGET_TYPE (to_type),
- TYPE_FIELDS (to_type), TYPE_NFIELDS (to_type),
- TYPE_VARARGS (to_type));
- type = lookup_methodptr_type (new_type);
+ discr_offset = target_die->sect_off;
+ }
+ else
+ {
+ complaint (_("DW_AT_discr does not have DIE reference form"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ is_variant_part = false;
+ }
}
- else
- type = lookup_memberptr_type (to_type, domain);
- return set_die_type (die, type, cu);
-}
+ if (die->child != NULL && ! die_is_declaration (die, cu))
+ {
+ struct field_info fi;
+ std::vector<struct symbol *> template_args;
-/* Extract all information from a DW_TAG_{rvalue_,}reference_type DIE and add to
- the user defined type vector. */
+ child_die = die->child;
-static struct type *
-read_tag_reference_type (struct die_info *die, struct dwarf2_cu *cu,
- enum type_code refcode)
-{
- struct comp_unit_head *cu_header = &cu->header;
- struct type *type, *target_type;
- struct attribute *attr;
+ while (child_die && child_die->tag)
+ {
+ handle_struct_member_die (child_die, type, &fi, &template_args, cu);
- gdb_assert (refcode == TYPE_CODE_REF || refcode == TYPE_CODE_RVALUE_REF);
+ if (is_variant_part && discr_offset == child_die->sect_off)
+ fi.fields.back ().variant.is_discriminant = true;
- target_type = die_type (die, cu);
-
- /* The die_type call above may have already set the type for this DIE. */
- type = get_die_type (die, cu);
- if (type)
- return type;
+ child_die = sibling_die (child_die);
+ }
- type = lookup_reference_type (target_type, refcode);
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- {
- TYPE_LENGTH (type) = DW_UNSND (attr);
- }
- else
- {
- TYPE_LENGTH (type) = cu_header->addr_size;
- }
- return set_die_type (die, type, cu);
-}
+ /* Attach template arguments to type. */
+ if (!template_args.empty ())
+ {
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ TYPE_N_TEMPLATE_ARGUMENTS (type) = template_args.size ();
+ TYPE_TEMPLATE_ARGUMENTS (type)
+ = XOBNEWVEC (&objfile->objfile_obstack,
+ struct symbol *,
+ TYPE_N_TEMPLATE_ARGUMENTS (type));
+ memcpy (TYPE_TEMPLATE_ARGUMENTS (type),
+ template_args.data (),
+ (TYPE_N_TEMPLATE_ARGUMENTS (type)
+ * sizeof (struct symbol *)));
+ }
-/* Add the given cv-qualifiers to the element type of the array. GCC
- outputs DWARF type qualifiers that apply to an array, not the
- element type. But GDB relies on the array element type to carry
- the cv-qualifiers. This mimics section 6.7.3 of the C99
- specification. */
+ /* Attach fields and member functions to the type. */
+ if (fi.nfields)
+ dwarf2_attach_fields_to_type (&fi, type, cu);
+ if (!fi.fnfieldlists.empty ())
+ {
+ dwarf2_attach_fn_fields_to_type (&fi, type, cu);
-static struct type *
-add_array_cv_type (struct die_info *die, struct dwarf2_cu *cu,
- struct type *base_type, int cnst, int voltl)
-{
- struct type *el_type, *inner_array;
+ /* Get the type which refers to the base class (possibly this
+ class itself) which contains the vtable pointer for the current
+ class from the DW_AT_containing_type attribute. This use of
+ DW_AT_containing_type is a GNU extension. */
- base_type = copy_type (base_type);
- inner_array = base_type;
+ if (dwarf2_attr (die, DW_AT_containing_type, cu) != NULL)
+ {
+ struct type *t = die_containing_type (die, cu);
- while (TYPE_CODE (TYPE_TARGET_TYPE (inner_array)) == TYPE_CODE_ARRAY)
- {
- TYPE_TARGET_TYPE (inner_array) =
- copy_type (TYPE_TARGET_TYPE (inner_array));
- inner_array = TYPE_TARGET_TYPE (inner_array);
- }
+ set_type_vptr_basetype (type, t);
+ if (type == t)
+ {
+ int i;
- el_type = TYPE_TARGET_TYPE (inner_array);
- cnst |= TYPE_CONST (el_type);
- voltl |= TYPE_VOLATILE (el_type);
- TYPE_TARGET_TYPE (inner_array) = make_cv_type (cnst, voltl, el_type, NULL);
+ /* Our own class provides vtbl ptr. */
+ for (i = TYPE_NFIELDS (t) - 1;
+ i >= TYPE_N_BASECLASSES (t);
+ --i)
+ {
+ const char *fieldname = TYPE_FIELD_NAME (t, i);
- return set_die_type (die, base_type, cu);
-}
+ if (is_vtable_name (fieldname, cu))
+ {
+ set_type_vptr_fieldno (type, i);
+ break;
+ }
+ }
-static struct type *
-read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct type *base_type, *cv_type;
+ /* Complain if virtual function table field not found. */
+ if (i < TYPE_N_BASECLASSES (t))
+ complaint (_("virtual function table pointer "
+ "not found when defining class '%s'"),
+ TYPE_NAME (type) ? TYPE_NAME (type) : "");
+ }
+ else
+ {
+ set_type_vptr_fieldno (type, TYPE_VPTR_FIELDNO (t));
+ }
+ }
+ else if (cu->producer
+ && startswith (cu->producer, "IBM(R) XL C/C++ Advanced Edition"))
+ {
+ /* The IBM XLC compiler does not provide direct indication
+ of the containing type, but the vtable pointer is
+ always named __vfp. */
- base_type = die_type (die, cu);
+ int i;
- /* The die_type call above may have already set the type for this DIE. */
- cv_type = get_die_type (die, cu);
- if (cv_type)
- return cv_type;
+ for (i = TYPE_NFIELDS (type) - 1;
+ i >= TYPE_N_BASECLASSES (type);
+ --i)
+ {
+ if (strcmp (TYPE_FIELD_NAME (type, i), "__vfp") == 0)
+ {
+ set_type_vptr_fieldno (type, i);
+ set_type_vptr_basetype (type, type);
+ break;
+ }
+ }
+ }
+ }
- /* In case the const qualifier is applied to an array type, the element type
- is so qualified, not the array type (section 6.7.3 of C99). */
- if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
- return add_array_cv_type (die, cu, base_type, 1, 0);
+ /* Copy fi.typedef_field_list linked list elements content into the
+ allocated array TYPE_TYPEDEF_FIELD_ARRAY (type). */
+ if (!fi.typedef_field_list.empty ())
+ {
+ int count = fi.typedef_field_list.size ();
- cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
- return set_die_type (die, cv_type, cu);
-}
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ TYPE_TYPEDEF_FIELD_ARRAY (type)
+ = ((struct decl_field *)
+ TYPE_ALLOC (type,
+ sizeof (TYPE_TYPEDEF_FIELD (type, 0)) * count));
+ TYPE_TYPEDEF_FIELD_COUNT (type) = count;
-static struct type *
-read_tag_volatile_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct type *base_type, *cv_type;
+ for (int i = 0; i < fi.typedef_field_list.size (); ++i)
+ TYPE_TYPEDEF_FIELD (type, i) = fi.typedef_field_list[i];
+ }
- base_type = die_type (die, cu);
+ /* Copy fi.nested_types_list linked list elements content into the
+ allocated array TYPE_NESTED_TYPES_ARRAY (type). */
+ if (!fi.nested_types_list.empty () && cu->language != language_ada)
+ {
+ int count = fi.nested_types_list.size ();
- /* The die_type call above may have already set the type for this DIE. */
- cv_type = get_die_type (die, cu);
- if (cv_type)
- return cv_type;
+ ALLOCATE_CPLUS_STRUCT_TYPE (type);
+ TYPE_NESTED_TYPES_ARRAY (type)
+ = ((struct decl_field *)
+ TYPE_ALLOC (type, sizeof (struct decl_field) * count));
+ TYPE_NESTED_TYPES_COUNT (type) = count;
- /* In case the volatile qualifier is applied to an array type, the
- element type is so qualified, not the array type (section 6.7.3
- of C99). */
- if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
- return add_array_cv_type (die, cu, base_type, 0, 1);
+ for (int i = 0; i < fi.nested_types_list.size (); ++i)
+ TYPE_NESTED_TYPES_FIELD (type, i) = fi.nested_types_list[i];
+ }
+ }
- cv_type = make_cv_type (TYPE_CONST (base_type), 1, base_type, 0);
- return set_die_type (die, cv_type, cu);
-}
+ quirk_gcc_member_function_pointer (type, objfile);
+ if (cu->language == language_rust && die->tag == DW_TAG_union_type)
+ cu->rust_unions.push_back (type);
-/* Handle DW_TAG_restrict_type. */
+ /* 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. */
-static struct type *
-read_tag_restrict_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct type *base_type, *cv_type;
+ child_die = die->child;
- base_type = die_type (die, cu);
+ 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
+ || child_die->tag == DW_TAG_template_value_param
+ || child_die->tag == DW_TAG_template_type_param)
+ {
+ /* Do nothing. */
+ }
+ else
+ process_die (child_die, cu);
- /* The die_type call above may have already set the type for this DIE. */
- cv_type = get_die_type (die, cu);
- if (cv_type)
- return cv_type;
+ child_die = sibling_die (child_die);
+ }
- cv_type = make_restrict_type (base_type);
- return set_die_type (die, cv_type, cu);
+ /* Do not consider external references. According to the DWARF standard,
+ these DIEs are identified by the fact that they have no byte_size
+ attribute, and a declaration attribute. */
+ if (dwarf2_attr (die, DW_AT_byte_size, cu) != NULL
+ || !die_is_declaration (die, cu))
+ new_symbol (die, type, cu);
}
-/* Handle DW_TAG_atomic_type. */
+/* Assuming DIE is an enumeration type, and TYPE is its associated type,
+ update TYPE using some information only available in DIE's children. */
-static struct type *
-read_tag_atomic_type (struct die_info *die, struct dwarf2_cu *cu)
+static void
+update_enumeration_type_from_children (struct die_info *die,
+ struct type *type,
+ struct dwarf2_cu *cu)
{
- struct type *base_type, *cv_type;
+ struct die_info *child_die;
+ int unsigned_enum = 1;
+ int flag_enum = 1;
+ ULONGEST mask = 0;
- base_type = die_type (die, cu);
+ auto_obstack obstack;
- /* The die_type call above may have already set the type for this DIE. */
- cv_type = get_die_type (die, cu);
- if (cv_type)
- return cv_type;
+ for (child_die = die->child;
+ child_die != NULL && child_die->tag;
+ child_die = sibling_die (child_die))
+ {
+ struct attribute *attr;
+ LONGEST value;
+ const gdb_byte *bytes;
+ struct dwarf2_locexpr_baton *baton;
+ const char *name;
- cv_type = make_atomic_type (base_type);
- return set_die_type (die, cv_type, cu);
-}
+ if (child_die->tag != DW_TAG_enumerator)
+ continue;
-/* 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. */
+ attr = dwarf2_attr (child_die, DW_AT_const_value, cu);
+ if (attr == NULL)
+ continue;
-static struct type *
-read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct type *type, *range_type, *index_type, *char_type;
- struct attribute *attr;
- unsigned int length;
+ name = dwarf2_name (child_die, cu);
+ if (name == NULL)
+ name = "<anonymous enumerator>";
- attr = dwarf2_attr (die, DW_AT_string_length, cu);
- if (attr)
- {
- length = DW_UNSND (attr);
- }
- else
- {
- /* Check for the DW_AT_byte_size attribute. */
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
- {
- length = DW_UNSND (attr);
- }
+ dwarf2_const_value_attr (attr, type, name, &obstack, cu,
+ &value, &bytes, &baton);
+ if (value < 0)
+ {
+ unsigned_enum = 0;
+ flag_enum = 0;
+ }
+ else if ((mask & value) != 0)
+ flag_enum = 0;
else
- {
- length = 1;
- }
- }
+ mask |= value;
- index_type = objfile_type (objfile)->builtin_int;
- range_type = create_static_range_type (NULL, index_type, 1, length);
- char_type = language_string_char_type (cu->language_defn, gdbarch);
- type = create_string_type (NULL, char_type, range_type);
+ /* If we already know that the enum type is neither unsigned, nor
+ a flag type, no need to look at the rest of the enumerates. */
+ if (!unsigned_enum && !flag_enum)
+ break;
+ }
- return set_die_type (die, type, cu);
+ if (unsigned_enum)
+ TYPE_UNSIGNED (type) = 1;
+ if (flag_enum)
+ TYPE_FLAG_ENUM (type) = 1;
}
-/* Assuming that DIE corresponds to a function, returns nonzero
- if the function is prototyped. */
+/* Given a DW_AT_enumeration_type die, set its type. We do not
+ complete the type's fields yet, or create any symbols. */
-static int
-prototyped_function_p (struct die_info *die, struct dwarf2_cu *cu)
+static struct type *
+read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct type *type;
struct attribute *attr;
+ const char *name;
- attr = dwarf2_attr (die, DW_AT_prototyped, cu);
- if (attr && (DW_UNSND (attr) != 0))
- return 1;
+ /* If the definition of this type lives in .debug_types, read that type.
+ Don't follow DW_AT_specification though, that will take us back up
+ the chain and we want to go down. */
+ attr = dwarf2_attr_no_follow (die, DW_AT_signature);
+ if (attr)
+ {
+ type = get_DW_AT_signature_type (die, attr, cu);
- /* The DWARF standard implies that the DW_AT_prototyped attribute
- is only meaninful for C, but the concept also extends to other
- languages that allow unprototyped functions (Eg: Objective C).
- For all other languages, assume that functions are always
- prototyped. */
- if (cu->language != language_c
- && cu->language != language_objc
- && cu->language != language_opencl)
- return 1;
+ /* The type's CU may not be the same as CU.
+ Ensure TYPE is recorded with CU in die_type_hash. */
+ return set_die_type (die, type, cu);
+ }
- /* RealView does not emit DW_AT_prototyped. We can not distinguish
- prototyped and unprototyped functions; default to prototyped,
- since that is more common in modern code (and RealView warns
- about unprototyped functions). */
- if (producer_is_realview (cu->producer))
- return 1;
+ type = alloc_type (objfile);
- return 0;
-}
+ TYPE_CODE (type) = TYPE_CODE_ENUM;
+ name = dwarf2_full_name (NULL, die, cu);
+ if (name != NULL)
+ TYPE_NAME (type) = name;
-/* Handle DIES due to C code like:
+ attr = dwarf2_attr (die, DW_AT_type, cu);
+ if (attr != NULL)
+ {
+ struct type *underlying_type = die_type (die, cu);
- struct foo
- {
- int (*funcp)(int a, long l);
- int b;
- };
+ TYPE_TARGET_TYPE (type) = underlying_type;
+ }
- ('funcp' generates a DW_TAG_subroutine_type DIE). */
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
+ {
+ TYPE_LENGTH (type) = DW_UNSND (attr);
+ }
+ else
+ {
+ TYPE_LENGTH (type) = 0;
+ }
-static struct type *
-read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct type *type; /* Type that this function returns. */
- struct type *ftype; /* Function that returns above type. */
- struct attribute *attr;
+ maybe_set_alignment (cu, die, type);
- type = die_type (die, cu);
+ /* The enumeration DIE can be incomplete. In Ada, any type can be
+ declared as private in the package spec, and then defined only
+ inside the package body. Such types are known as Taft Amendment
+ Types. When another package uses such a type, an incomplete DIE
+ may be generated by the compiler. */
+ if (die_is_declaration (die, cu))
+ TYPE_STUB (type) = 1;
- /* The die_type call above may have already set the type for this DIE. */
- ftype = get_die_type (die, cu);
- if (ftype)
- return ftype;
+ /* Finish the creation of this type by using the enum's children.
+ We must call this even when the underlying type has been provided
+ so that we can determine if we're looking at a "flag" enum. */
+ update_enumeration_type_from_children (die, type, cu);
- ftype = lookup_function_type (type);
+ /* If this type has an underlying type that is not a stub, then we
+ may use its attributes. We always use the "unsigned" attribute
+ in this situation, because ordinarily we guess whether the type
+ is unsigned -- but the guess can be wrong and the underlying type
+ can tell us the reality. However, we defer to a local size
+ attribute if one exists, because this lets the compiler override
+ the underlying type if needed. */
+ if (TYPE_TARGET_TYPE (type) != NULL && !TYPE_STUB (TYPE_TARGET_TYPE (type)))
+ {
+ TYPE_UNSIGNED (type) = TYPE_UNSIGNED (TYPE_TARGET_TYPE (type));
+ if (TYPE_LENGTH (type) == 0)
+ TYPE_LENGTH (type) = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ if (TYPE_RAW_ALIGN (type) == 0
+ && TYPE_RAW_ALIGN (TYPE_TARGET_TYPE (type)) != 0)
+ set_type_align (type, TYPE_RAW_ALIGN (TYPE_TARGET_TYPE (type)));
+ }
- if (prototyped_function_p (die, cu))
- TYPE_PROTOTYPED (ftype) = 1;
+ TYPE_DECLARED_CLASS (type) = dwarf2_flag_true_p (die, DW_AT_enum_class, cu);
- /* Store the calling convention in the type if it's available in
- the subroutine die. Otherwise set the calling convention to
- the default value DW_CC_normal. */
- attr = dwarf2_attr (die, DW_AT_calling_convention, cu);
- if (attr)
- TYPE_CALLING_CONVENTION (ftype) = DW_UNSND (attr);
- else if (cu->producer && strstr (cu->producer, "IBM XL C for OpenCL"))
- TYPE_CALLING_CONVENTION (ftype) = DW_CC_GDB_IBM_OpenCL;
- else
- TYPE_CALLING_CONVENTION (ftype) = DW_CC_normal;
+ return set_die_type (die, type, cu);
+}
- /* Record whether the function returns normally to its caller or not
- if the DWARF producer set that information. */
- attr = dwarf2_attr (die, DW_AT_noreturn, cu);
- if (attr && (DW_UNSND (attr) != 0))
- TYPE_NO_RETURN (ftype) = 1;
+/* 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.
- /* We need to add the subroutine type to the die immediately so
- we don't infinitely recurse when dealing with parameters
- declared as the same subroutine type. */
- set_die_type (die, ftype, cu);
+ NOTE: We reverse the order of the element list. */
+
+static void
+process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *this_type;
+
+ this_type = get_die_type (die, cu);
+ if (this_type == NULL)
+ this_type = read_enumeration_type (die, cu);
if (die->child != NULL)
{
- struct type *void_type = objfile_type (objfile)->builtin_void;
struct die_info *child_die;
- int nparams, iparams;
-
- /* Count the number of parameters.
- FIXME: GDB currently ignores vararg functions, but knows about
- vararg member functions. */
- nparams = 0;
- child_die = die->child;
- 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_VARARGS (ftype) = 1;
- child_die = sibling_die (child_die);
- }
-
- /* Allocate storage for parameters and fill them in. */
- TYPE_NFIELDS (ftype) = nparams;
- TYPE_FIELDS (ftype) = (struct field *)
- TYPE_ZALLOC (ftype, nparams * sizeof (struct field));
-
- /* TYPE_FIELD_TYPE must never be NULL. Pre-fill the array to ensure it
- even if we error out during the parameters reading below. */
- for (iparams = 0; iparams < nparams; iparams++)
- TYPE_FIELD_TYPE (ftype, iparams) = void_type;
+ struct symbol *sym;
+ struct field *fields = NULL;
+ int num_fields = 0;
+ const char *name;
- iparams = 0;
child_die = die->child;
while (child_die && child_die->tag)
{
- if (child_die->tag == DW_TAG_formal_parameter)
+ if (child_die->tag != DW_TAG_enumerator)
{
- struct type *arg_type;
-
- /* DWARF version 2 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 pass this information to
- dwarf2_add_member_fn via TYPE_FIELD_ARTIFICIAL.
-
- DWARF version 3 added DW_AT_object_pointer, which GCC
- 4.5 does not yet generate. */
- attr = dwarf2_attr (child_die, DW_AT_artificial, cu);
- if (attr)
- TYPE_FIELD_ARTIFICIAL (ftype, iparams) = DW_UNSND (attr);
- else
- TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
- arg_type = die_type (child_die, cu);
-
- /* RealView does not mark THIS as const, which the testsuite
- expects. GCC marks THIS as const in method definitions,
- but not in the class specifications (GCC PR 43053). */
- if (cu->language == language_cplus && !TYPE_CONST (arg_type)
- && TYPE_FIELD_ARTIFICIAL (ftype, iparams))
+ process_die (child_die, cu);
+ }
+ else
+ {
+ name = dwarf2_name (child_die, cu);
+ if (name)
{
- int is_this = 0;
- struct dwarf2_cu *arg_cu = cu;
- const char *name = dwarf2_name (child_die, cu);
+ sym = new_symbol (child_die, this_type, cu);
- attr = dwarf2_attr (die, DW_AT_object_pointer, cu);
- if (attr)
+ if ((num_fields % DW_FIELD_ALLOC_CHUNK) == 0)
{
- /* If the compiler emits this, use it. */
- if (follow_die_ref (die, attr, &arg_cu) == child_die)
- is_this = 1;
+ fields = (struct field *)
+ xrealloc (fields,
+ (num_fields + DW_FIELD_ALLOC_CHUNK)
+ * sizeof (struct field));
}
- else if (name && strcmp (name, "this") == 0)
- /* Function definitions will have the argument names. */
- is_this = 1;
- else if (name == NULL && iparams == 0)
- /* Declarations may not have the names, so like
- elsewhere in GDB, assume an artificial first
- argument is "this". */
- is_this = 1;
- if (is_this)
- arg_type = make_cv_type (1, TYPE_VOLATILE (arg_type),
- arg_type, 0);
- }
+ FIELD_NAME (fields[num_fields]) = SYMBOL_LINKAGE_NAME (sym);
+ FIELD_TYPE (fields[num_fields]) = NULL;
+ SET_FIELD_ENUMVAL (fields[num_fields], SYMBOL_VALUE (sym));
+ FIELD_BITSIZE (fields[num_fields]) = 0;
- TYPE_FIELD_TYPE (ftype, iparams) = arg_type;
- iparams++;
+ num_fields++;
+ }
}
+
child_die = sibling_die (child_die);
}
- }
-
- return ftype;
-}
-
-static struct type *
-read_typedef (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- const char *name = NULL;
- struct type *this_type, *target_type;
- name = dwarf2_full_name (NULL, die, cu);
- this_type = init_type (objfile, TYPE_CODE_TYPEDEF, 0, name);
- TYPE_TARGET_STUB (this_type) = 1;
- set_die_type (die, this_type, cu);
- target_type = die_type (die, cu);
- if (target_type != this_type)
- TYPE_TARGET_TYPE (this_type) = target_type;
- else
- {
- /* Self-referential typedefs are, it seems, not allowed by the DWARF
- spec and cause infinite loops in GDB. */
- complaint (&symfile_complaints,
- _("Self-referential DW_TAG_typedef "
- "- DIE at 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (objfile));
- TYPE_TARGET_TYPE (this_type) = NULL;
+ if (num_fields)
+ {
+ TYPE_NFIELDS (this_type) = num_fields;
+ TYPE_FIELDS (this_type) = (struct field *)
+ TYPE_ALLOC (this_type, sizeof (struct field) * num_fields);
+ memcpy (TYPE_FIELDS (this_type), fields,
+ sizeof (struct field) * num_fields);
+ xfree (fields);
+ }
}
- return this_type;
-}
-
-/* Allocate a floating-point type of size BITS and name NAME. Pass NAME_HINT
- (which may be different from NAME) to the architecture back-end to allow
- it to guess the correct format if necessary. */
-static struct type *
-dwarf2_init_float_type (struct objfile *objfile, int bits, const char *name,
- const char *name_hint)
-{
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- const struct floatformat **format;
- struct type *type;
+ /* If we are reading an enum from a .debug_types unit, and the enum
+ is a declaration, and the enum is not the signatured type in the
+ unit, then we do not want to add a symbol for it. Adding a
+ symbol would in some cases obscure the true definition of the
+ enum, giving users an incomplete type when the definition is
+ actually available. Note that we do not want to do this for all
+ enums which are just declarations, because C++0x allows forward
+ enum declarations. */
+ if (cu->per_cu->is_debug_types
+ && die_is_declaration (die, cu))
+ {
+ struct signatured_type *sig_type;
- format = gdbarch_floatformat_for_type (gdbarch, name_hint, bits);
- if (format)
- type = init_float_type (objfile, bits, name, format);
- else
- type = init_type (objfile, TYPE_CODE_ERROR, bits, name);
+ sig_type = (struct signatured_type *) cu->per_cu;
+ gdb_assert (to_underlying (sig_type->type_offset_in_section) != 0);
+ if (sig_type->type_offset_in_section != die->sect_off)
+ return;
+ }
- return type;
+ new_symbol (die, this_type, cu);
}
-/* Find a representation of a given base type and install
- it in the TYPE field of the die. */
+/* 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 struct type *
-read_base_type (struct die_info *die, struct dwarf2_cu *cu)
+read_array_type (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct die_info *child_die;
struct type *type;
+ struct type *element_type, *range_type, *index_type;
struct attribute *attr;
- int encoding = 0, bits = 0;
const char *name;
+ struct dynamic_prop *byte_stride_prop = NULL;
+ unsigned int bit_stride = 0;
- attr = dwarf2_attr (die, DW_AT_encoding, cu);
- if (attr)
- {
- encoding = DW_UNSND (attr);
- }
- attr = dwarf2_attr (die, DW_AT_byte_size, cu);
- if (attr)
+ element_type = die_type (die, cu);
+
+ /* The die_type call above may have already set the type for this DIE. */
+ type = get_die_type (die, cu);
+ if (type)
+ return type;
+
+ attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
+ if (attr != NULL)
{
- bits = DW_UNSND (attr) * TARGET_CHAR_BIT;
+ int stride_ok;
+
+ byte_stride_prop
+ = (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));
+ stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop);
+ if (!stride_ok)
+ {
+ complaint (_("unable to read array DW_AT_byte_stride "
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ /* Ignore this attribute. We will likely not be able to print
+ arrays of this type correctly, but there is little we can do
+ to help if we cannot read the attribute's value. */
+ byte_stride_prop = NULL;
+ }
}
- name = dwarf2_name (die, cu);
- if (!name)
+
+ attr = dwarf2_attr (die, DW_AT_bit_stride, cu);
+ if (attr != NULL)
+ bit_stride = DW_UNSND (attr);
+
+ /* Irix 6.2 native cc creates array types without children for
+ arrays with unspecified length. */
+ if (die->child == NULL)
{
- complaint (&symfile_complaints,
- _("DW_AT_name missing from DW_TAG_base_type"));
+ index_type = objfile_type (objfile)->builtin_int;
+ range_type = create_static_range_type (NULL, index_type, 0, -1);
+ type = create_array_type_with_stride (NULL, element_type, range_type,
+ byte_stride_prop, bit_stride);
+ return set_die_type (die, type, cu);
}
- switch (encoding)
+ std::vector<struct type *> range_types;
+ child_die = die->child;
+ while (child_die && child_die->tag)
{
- case DW_ATE_address:
- /* Turn DW_ATE_address into a void * pointer. */
- type = init_type (objfile, TYPE_CODE_VOID, TARGET_CHAR_BIT, NULL);
- type = init_pointer_type (objfile, bits, name, type);
- break;
- case DW_ATE_boolean:
- type = init_boolean_type (objfile, bits, 1, name);
- break;
- case DW_ATE_complex_float:
- type = dwarf2_init_float_type (objfile, bits / 2, NULL, name);
- type = init_complex_type (objfile, name, type);
- break;
- case DW_ATE_decimal_float:
- type = init_decfloat_type (objfile, bits, name);
- break;
- case DW_ATE_float:
- type = dwarf2_init_float_type (objfile, bits, name, name);
- break;
- case DW_ATE_signed:
- type = init_integer_type (objfile, bits, 0, name);
- break;
- case DW_ATE_unsigned:
- if (cu->language == language_fortran
- && name
- && startswith (name, "character("))
- type = init_character_type (objfile, bits, 1, name);
- else
- type = init_integer_type (objfile, bits, 1, name);
- break;
- case DW_ATE_signed_char:
- if (cu->language == language_ada || cu->language == language_m2
- || cu->language == language_pascal
- || cu->language == language_fortran)
- type = init_character_type (objfile, bits, 0, name);
- else
- type = init_integer_type (objfile, bits, 0, name);
- break;
- case DW_ATE_unsigned_char:
- if (cu->language == language_ada || cu->language == language_m2
- || cu->language == language_pascal
- || cu->language == language_fortran
- || cu->language == language_rust)
- type = init_character_type (objfile, bits, 1, name);
- else
- type = init_integer_type (objfile, bits, 1, name);
- break;
- case DW_ATE_UTF:
+ if (child_die->tag == DW_TAG_subrange_type)
{
- gdbarch *arch = get_objfile_arch (objfile);
+ struct type *child_type = read_type_die (child_die, cu);
- if (bits == 16)
- type = builtin_type (arch)->builtin_char16;
- else if (bits == 32)
- type = builtin_type (arch)->builtin_char32;
- else
- {
- complaint (&symfile_complaints,
- _("unsupported DW_ATE_UTF bit size: '%d'"),
- bits);
- type = init_integer_type (objfile, bits, 1, name);
- }
- return set_die_type (die, type, cu);
+ if (child_type != NULL)
+ {
+ /* The range type was succesfully read. Save it for the
+ array type creation. */
+ range_types.push_back (child_type);
+ }
}
- break;
-
- default:
- complaint (&symfile_complaints, _("unsupported DW_AT_encoding: '%s'"),
- dwarf_type_encoding_name (encoding));
- type = init_type (objfile, TYPE_CODE_ERROR, bits, name);
- break;
+ child_die = sibling_die (child_die);
}
- if (name && strcmp (name, "char") == 0)
- TYPE_NOSIGN (type) = 1;
-
- return set_die_type (die, type, cu);
-}
-
-/* Parse dwarf attribute if it's a block, reference or constant and put the
- resulting value of the attribute into struct bound_prop.
- Returns 1 if ATTR could be resolved into PROP, 0 otherwise. */
-
-static int
-attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
- struct dwarf2_cu *cu, struct dynamic_prop *prop)
-{
- struct dwarf2_property_baton *baton;
- struct obstack *obstack = &cu->objfile->objfile_obstack;
+ /* Dwarf2 dimensions are output from left to right, create the
+ necessary array types in backwards order. */
- if (attr == NULL || prop == NULL)
- return 0;
+ type = element_type;
- if (attr_form_is_block (attr))
+ if (read_array_order (die, cu) == DW_ORD_col_major)
{
- baton = XOBNEW (obstack, struct dwarf2_property_baton);
- baton->referenced_type = NULL;
- baton->locexpr.per_cu = cu->per_cu;
- baton->locexpr.size = DW_BLOCK (attr)->size;
- baton->locexpr.data = DW_BLOCK (attr)->data;
- prop->data.baton = baton;
- prop->kind = PROP_LOCEXPR;
- gdb_assert (prop->data.baton != NULL);
+ int i = 0;
+
+ while (i < range_types.size ())
+ type = create_array_type_with_stride (NULL, type, range_types[i++],
+ byte_stride_prop, bit_stride);
}
- else if (attr_form_is_ref (attr))
+ else
{
- struct dwarf2_cu *target_cu = cu;
- struct die_info *target_die;
- struct attribute *target_attr;
+ size_t ndim = range_types.size ();
+ while (ndim-- > 0)
+ type = create_array_type_with_stride (NULL, type, range_types[ndim],
+ byte_stride_prop, bit_stride);
+ }
- target_die = follow_die_ref (die, attr, &target_cu);
- target_attr = dwarf2_attr (target_die, DW_AT_location, target_cu);
- if (target_attr == NULL)
- target_attr = dwarf2_attr (target_die, DW_AT_data_member_location,
- target_cu);
- if (target_attr == NULL)
- return 0;
-
- switch (target_attr->name)
- {
- case DW_AT_location:
- if (attr_form_is_section_offset (target_attr))
- {
- baton = XOBNEW (obstack, struct dwarf2_property_baton);
- baton->referenced_type = die_type (target_die, target_cu);
- fill_in_loclist_baton (cu, &baton->loclist, target_attr);
- prop->data.baton = baton;
- prop->kind = PROP_LOCLIST;
- gdb_assert (prop->data.baton != NULL);
- }
- else if (attr_form_is_block (target_attr))
- {
- baton = XOBNEW (obstack, struct dwarf2_property_baton);
- baton->referenced_type = die_type (target_die, target_cu);
- baton->locexpr.per_cu = cu->per_cu;
- baton->locexpr.size = DW_BLOCK (target_attr)->size;
- baton->locexpr.data = DW_BLOCK (target_attr)->data;
- prop->data.baton = baton;
- prop->kind = PROP_LOCEXPR;
- gdb_assert (prop->data.baton != NULL);
- }
- else
- {
- dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
- "dynamic property");
- return 0;
- }
- break;
- case DW_AT_data_member_location:
- {
- LONGEST offset;
-
- if (!handle_data_member_location (target_die, target_cu,
- &offset))
- return 0;
+ /* 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. */
+ attr = dwarf2_attr (die, DW_AT_GNU_vector, cu);
+ if (attr)
+ make_vector_type (type);
- baton = XOBNEW (obstack, struct dwarf2_property_baton);
- baton->referenced_type = read_type_die (target_die->parent,
- target_cu);
- baton->offset_info.offset = offset;
- baton->offset_info.type = die_type (target_die, target_cu);
- prop->data.baton = baton;
- prop->kind = PROP_ADDR_OFFSET;
- break;
- }
- }
- }
- else if (attr_form_is_constant (attr))
- {
- prop->data.const_val = dwarf2_get_attr_constant_value (attr, 0);
- prop->kind = PROP_CONST;
- }
- else
+ /* The DIE may have DW_AT_byte_size set. For example an OpenCL
+ implementation may choose to implement triple vectors using this
+ attribute. */
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
{
- dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form),
- dwarf2_name (die, cu));
- return 0;
+ if (DW_UNSND (attr) >= TYPE_LENGTH (type))
+ TYPE_LENGTH (type) = DW_UNSND (attr);
+ else
+ complaint (_("DW_AT_byte_size for array type smaller "
+ "than the total size of elements"));
}
- return 1;
-}
+ name = dwarf2_name (die, cu);
+ if (name)
+ TYPE_NAME (type) = name;
-/* Read the given DW_AT_subrange DIE. */
+ maybe_set_alignment (cu, die, type);
-static struct type *
-read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct type *base_type, *orig_base_type;
- struct type *range_type;
- struct attribute *attr;
- struct dynamic_prop low, high;
- int low_default_is_valid;
- int high_bound_is_count = 0;
- const char *name;
- LONGEST negative_mask;
+ /* Install the type in the die. */
+ set_die_type (die, type, cu);
- orig_base_type = die_type (die, cu);
- /* If ORIG_BASE_TYPE is a typedef, it will not be TYPE_UNSIGNED,
- whereas the real type might be. So, we use ORIG_BASE_TYPE when
- creating the range type, but we use the result of check_typedef
- when examining properties of the type. */
- base_type = check_typedef (orig_base_type);
+ /* set_die_type should be already done. */
+ set_descriptive_type (type, die, cu);
- /* The die_type call above may have already set the type for this DIE. */
- range_type = get_die_type (die, cu);
- if (range_type)
- return range_type;
+ return type;
+}
- low.kind = PROP_CONST;
- high.kind = PROP_CONST;
- high.data.const_val = 0;
+static enum dwarf_array_dim_ordering
+read_array_order (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct attribute *attr;
- /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
- omitting DW_AT_lower_bound. */
- switch (cu->language)
- {
- case language_c:
- case language_cplus:
- low.data.const_val = 0;
- low_default_is_valid = 1;
- break;
- case language_fortran:
- low.data.const_val = 1;
- low_default_is_valid = 1;
- break;
- case language_d:
- case language_objc:
- case language_rust:
- low.data.const_val = 0;
- low_default_is_valid = (cu->header.version >= 4);
- break;
- case language_ada:
- case language_m2:
- case language_pascal:
- low.data.const_val = 1;
- low_default_is_valid = (cu->header.version >= 4);
- break;
- default:
- low.data.const_val = 0;
- low_default_is_valid = 0;
- break;
- }
+ attr = dwarf2_attr (die, DW_AT_ordering, cu);
- attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
if (attr)
- attr_to_dynamic_prop (attr, die, cu, &low);
- else if (!low_default_is_valid)
- complaint (&symfile_complaints, _("Missing DW_AT_lower_bound "
- "- DIE at 0x%x [in module %s]"),
- to_underlying (die->sect_off), objfile_name (cu->objfile));
+ return (enum dwarf_array_dim_ordering) DW_SND (attr);
- attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
- if (!attr_to_dynamic_prop (attr, die, cu, &high))
+ /* GNU F77 is a special case, as at 08/2004 array type info is the
+ opposite order to the dwarf2 specification, but data is still
+ laid out as per normal fortran.
+
+ FIXME: dsl/2004-8-20: If G77 is ever fixed, this will also need
+ version checking. */
+
+ if (cu->language == language_fortran
+ && cu->producer && strstr (cu->producer, "GNU F77"))
{
- attr = dwarf2_attr (die, DW_AT_count, cu);
- if (attr_to_dynamic_prop (attr, die, cu, &high))
- {
- /* If bounds are constant do the final calculation here. */
- if (low.kind == PROP_CONST && high.kind == PROP_CONST)
- high.data.const_val = low.data.const_val + high.data.const_val - 1;
- else
- high_bound_is_count = 1;
- }
+ return DW_ORD_row_major;
}
- /* Dwarf-2 specifications explicitly allows to create subrange types
- without specifying a base type.
- In that case, the base type must be set to the type of
- the lower bound, upper bound or count, in that order, if any of these
- three attributes references an object that has a type.
- If no base type is found, the Dwarf-2 specifications say that
- a signed integer type of size equal to the size of an address should
- be used.
- For the following C code: `extern char gdb_int [];'
- GCC produces an empty range DIE.
- FIXME: muller/2010-05-28: Possible references to object for low bound,
- high bound or count are not yet handled by this code. */
- if (TYPE_CODE (base_type) == TYPE_CODE_VOID)
+ switch (cu->language_defn->la_array_ordering)
{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- int addr_size = gdbarch_addr_bit (gdbarch) /8;
- struct type *int_type = objfile_type (objfile)->builtin_int;
+ case array_column_major:
+ return DW_ORD_col_major;
+ case array_row_major:
+ default:
+ return DW_ORD_row_major;
+ };
+}
- /* Test "int", "long int", and "long long int" objfile types,
- and select the first one having a size above or equal to the
- architecture address size. */
- if (int_type && TYPE_LENGTH (int_type) >= addr_size)
- base_type = int_type;
- else
- {
- int_type = objfile_type (objfile)->builtin_long;
- if (int_type && TYPE_LENGTH (int_type) >= addr_size)
- base_type = int_type;
- else
- {
- int_type = objfile_type (objfile)->builtin_long_long;
- if (int_type && TYPE_LENGTH (int_type) >= addr_size)
- base_type = int_type;
- }
- }
- }
+/* Extract all information from a DW_TAG_set_type DIE and put it in
+ the DIE's type field. */
- /* Normally, the DWARF producers are expected to use a signed
- constant form (Eg. DW_FORM_sdata) to express negative bounds.
- But this is unfortunately not always the case, as witnessed
- with GCC, for instance, where the ambiguous DW_FORM_dataN form
- is used instead. To work around that ambiguity, we treat
- the bounds as signed, and thus sign-extend their values, when
- the base type is signed. */
- negative_mask =
- -((LONGEST) 1 << (TYPE_LENGTH (base_type) * TARGET_CHAR_BIT - 1));
- if (low.kind == PROP_CONST
- && !TYPE_UNSIGNED (base_type) && (low.data.const_val & negative_mask))
- low.data.const_val |= negative_mask;
- if (high.kind == PROP_CONST
- && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
- high.data.const_val |= negative_mask;
+static struct type *
+read_set_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *domain_type, *set_type;
+ struct attribute *attr;
- range_type = create_range_type (NULL, orig_base_type, &low, &high);
+ domain_type = die_type (die, cu);
- if (high_bound_is_count)
- TYPE_RANGE_DATA (range_type)->flag_upper_bound_is_count = 1;
+ /* The die_type call above may have already set the type for this DIE. */
+ set_type = get_die_type (die, cu);
+ if (set_type)
+ return set_type;
- /* Ada expects an empty array on no boundary attributes. */
- if (attr == NULL && cu->language != language_ada)
- TYPE_HIGH_BOUND_KIND (range_type) = PROP_UNDEFINED;
-
- name = dwarf2_name (die, cu);
- if (name)
- TYPE_NAME (range_type) = name;
+ set_type = create_set_type (NULL, domain_type);
attr = dwarf2_attr (die, DW_AT_byte_size, cu);
if (attr)
- TYPE_LENGTH (range_type) = DW_UNSND (attr);
-
- set_die_type (die, range_type, cu);
+ TYPE_LENGTH (set_type) = DW_UNSND (attr);
- /* set_die_type should be already done. */
- set_descriptive_type (range_type, die, cu);
+ maybe_set_alignment (cu, die, set_type);
- return range_type;
+ return set_die_type (die, set_type, cu);
}
-static struct type *
-read_unspecified_type (struct die_info *die, struct dwarf2_cu *cu)
+/* A helper for read_common_block that creates a locexpr baton.
+ SYM is the symbol which we are marking as computed.
+ COMMON_DIE is the DIE for the common block.
+ COMMON_LOC is the location expression attribute for the common
+ block itself.
+ MEMBER_LOC is the location expression attribute for the particular
+ member of the common block that we are processing.
+ CU is the CU from which the above come. */
+
+static void
+mark_common_block_symbol_computed (struct symbol *sym,
+ struct die_info *common_die,
+ struct attribute *common_loc,
+ struct attribute *member_loc,
+ struct dwarf2_cu *cu)
{
- struct type *type;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_locexpr_baton *baton;
+ gdb_byte *ptr;
+ unsigned int cu_off;
+ enum bfd_endian byte_order = gdbarch_byte_order (get_objfile_arch (objfile));
+ LONGEST offset = 0;
- /* For now, we only support the C meaning of an unspecified type: void. */
+ gdb_assert (common_loc && member_loc);
+ gdb_assert (attr_form_is_block (common_loc));
+ gdb_assert (attr_form_is_block (member_loc)
+ || attr_form_is_constant (member_loc));
- type = init_type (cu->objfile, TYPE_CODE_VOID, 0, NULL);
- TYPE_NAME (type) = dwarf2_name (die, cu);
+ baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
+ baton->per_cu = cu->per_cu;
+ gdb_assert (baton->per_cu);
- return set_die_type (die, type, cu);
-}
+ baton->size = 5 /* DW_OP_call4 */ + 1 /* DW_OP_plus */;
-/* 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. */
+ if (attr_form_is_constant (member_loc))
+ {
+ offset = dwarf2_get_attr_constant_value (member_loc, 0);
+ baton->size += 1 /* DW_OP_addr */ + cu->header.addr_size;
+ }
+ else
+ baton->size += DW_BLOCK (member_loc)->size;
-static struct die_info *
-read_die_and_children (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- const gdb_byte **new_info_ptr,
- struct die_info *parent)
-{
- struct die_info *die;
- const gdb_byte *cur_ptr;
- int has_children;
+ ptr = (gdb_byte *) obstack_alloc (&objfile->objfile_obstack, baton->size);
+ baton->data = ptr;
- cur_ptr = read_full_die_1 (reader, &die, info_ptr, &has_children, 0);
- if (die == NULL)
+ *ptr++ = DW_OP_call4;
+ cu_off = common_die->sect_off - cu->per_cu->sect_off;
+ store_unsigned_integer (ptr, 4, byte_order, cu_off);
+ ptr += 4;
+
+ if (attr_form_is_constant (member_loc))
{
- *new_info_ptr = cur_ptr;
- return NULL;
+ *ptr++ = DW_OP_addr;
+ store_unsigned_integer (ptr, cu->header.addr_size, byte_order, offset);
+ ptr += cu->header.addr_size;
}
- store_in_ref_table (die, reader->cu);
-
- if (has_children)
- die->child = read_die_and_siblings_1 (reader, cur_ptr, new_info_ptr, die);
else
{
- die->child = NULL;
- *new_info_ptr = cur_ptr;
+ /* We have to copy the data here, because DW_OP_call4 will only
+ use a DW_AT_location attribute. */
+ memcpy (ptr, DW_BLOCK (member_loc)->data, DW_BLOCK (member_loc)->size);
+ ptr += DW_BLOCK (member_loc)->size;
}
- die->sibling = NULL;
- die->parent = parent;
- return die;
+ *ptr++ = DW_OP_plus;
+ gdb_assert (ptr - baton->data == baton->size);
+
+ SYMBOL_LOCATION_BATON (sym) = baton;
+ SYMBOL_ACLASS_INDEX (sym) = dwarf2_locexpr_index;
}
-/* 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. */
+/* Create appropriate locally-scoped variables for all the
+ DW_TAG_common_block entries. Also create a struct common_block
+ listing all such variables for `info common'. COMMON_BLOCK_DOMAIN
+ is used to sepate the common blocks name namespace from regular
+ variable names. */
-static struct die_info *
-read_die_and_siblings_1 (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- const gdb_byte **new_info_ptr,
- struct die_info *parent)
+static void
+read_common_block (struct die_info *die, struct dwarf2_cu *cu)
{
- struct die_info *first_die, *last_sibling;
- const gdb_byte *cur_ptr;
+ struct attribute *attr;
- cur_ptr = info_ptr;
- first_die = last_sibling = NULL;
+ attr = dwarf2_attr (die, DW_AT_location, cu);
+ if (attr)
+ {
+ /* Support the .debug_loc offsets. */
+ if (attr_form_is_block (attr))
+ {
+ /* Ok. */
+ }
+ else if (attr_form_is_section_offset (attr))
+ {
+ dwarf2_complex_location_expr_complaint ();
+ attr = NULL;
+ }
+ else
+ {
+ dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
+ "common block member");
+ attr = NULL;
+ }
+ }
- while (1)
+ if (die->child != NULL)
{
- struct die_info *die
- = read_die_and_children (reader, cur_ptr, &cur_ptr, parent);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct die_info *child_die;
+ size_t n_entries = 0, size;
+ struct common_block *common_block;
+ struct symbol *sym;
- if (die == NULL)
+ for (child_die = die->child;
+ child_die && child_die->tag;
+ child_die = sibling_die (child_die))
+ ++n_entries;
+
+ size = (sizeof (struct common_block)
+ + (n_entries - 1) * sizeof (struct symbol *));
+ common_block
+ = (struct common_block *) obstack_alloc (&objfile->objfile_obstack,
+ size);
+ memset (common_block->contents, 0, n_entries * sizeof (struct symbol *));
+ common_block->n_entries = 0;
+
+ for (child_die = die->child;
+ child_die && child_die->tag;
+ child_die = sibling_die (child_die))
{
- *new_info_ptr = cur_ptr;
- return first_die;
- }
+ /* Create the symbol in the DW_TAG_common_block block in the current
+ symbol scope. */
+ sym = new_symbol (child_die, NULL, cu);
+ if (sym != NULL)
+ {
+ struct attribute *member_loc;
- if (!first_die)
- first_die = die;
- else
- last_sibling->sibling = die;
+ common_block->contents[common_block->n_entries++] = sym;
- last_sibling = die;
+ member_loc = dwarf2_attr (child_die, DW_AT_data_member_location,
+ cu);
+ if (member_loc)
+ {
+ /* GDB has handled this for a long time, but it is
+ not specified by DWARF. It seems to have been
+ emitted by gfortran at least as recently as:
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23057. */
+ complaint (_("Variable in common block has "
+ "DW_AT_data_member_location "
+ "- DIE at %s [in module %s]"),
+ sect_offset_str (child_die->sect_off),
+ objfile_name (objfile));
+
+ if (attr_form_is_section_offset (member_loc))
+ dwarf2_complex_location_expr_complaint ();
+ else if (attr_form_is_constant (member_loc)
+ || attr_form_is_block (member_loc))
+ {
+ if (attr)
+ mark_common_block_symbol_computed (sym, die, attr,
+ member_loc, cu);
+ }
+ else
+ dwarf2_complex_location_expr_complaint ();
+ }
+ }
+ }
+
+ sym = new_symbol (die, objfile_type (objfile)->builtin_void, cu);
+ SYMBOL_VALUE_COMMON_BLOCK (sym) = common_block;
}
}
-/* 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.
- This the main entry point for reading a DIE and all its children. */
+/* Create a type for a C++ namespace. */
-static struct die_info *
-read_die_and_siblings (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- const gdb_byte **new_info_ptr,
- struct die_info *parent)
+static struct type *
+read_namespace_type (struct die_info *die, struct dwarf2_cu *cu)
{
- struct die_info *die = read_die_and_siblings_1 (reader, info_ptr,
- new_info_ptr, parent);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const char *previous_prefix, *name;
+ int is_anonymous;
+ struct type *type;
- if (dwarf_die_debug)
+ /* For extensions, reuse the type of the original namespace. */
+ if (dwarf2_attr (die, DW_AT_extension, cu) != NULL)
{
- fprintf_unfiltered (gdb_stdlog,
- "Read die from %s@0x%x of %s:\n",
- get_section_name (reader->die_section),
- (unsigned) (info_ptr - reader->die_section->buffer),
- bfd_get_filename (reader->abfd));
- dump_die (die, dwarf_die_debug);
+ struct die_info *ext_die;
+ struct dwarf2_cu *ext_cu = cu;
+
+ ext_die = dwarf2_extension (die, &ext_cu);
+ type = read_type_die (ext_die, ext_cu);
+
+ /* EXT_CU may not be the same as CU.
+ Ensure TYPE is recorded with CU in die_type_hash. */
+ return set_die_type (die, type, cu);
}
- return die;
-}
+ name = namespace_name (die, &is_anonymous, cu);
-/* Read a die and all its attributes, leave space for NUM_EXTRA_ATTRS
- attributes.
- The caller is responsible for filling in the extra attributes
- and updating (*DIEP)->num_attrs.
- 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. */
+ /* Now build the name of the current namespace. */
-static const gdb_byte *
-read_full_die_1 (const struct die_reader_specs *reader,
- struct die_info **diep, const gdb_byte *info_ptr,
- int *has_children, int num_extra_attrs)
-{
- unsigned int abbrev_number, bytes_read, i;
- struct abbrev_info *abbrev;
- struct die_info *die;
- struct dwarf2_cu *cu = reader->cu;
- bfd *abfd = reader->abfd;
-
- sect_offset sect_off = (sect_offset) (info_ptr - reader->buffer);
- abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
- info_ptr += bytes_read;
- if (!abbrev_number)
- {
- *diep = NULL;
- *has_children = 0;
- return info_ptr;
- }
-
- abbrev = abbrev_table_lookup_abbrev (cu->abbrev_table, abbrev_number);
- if (!abbrev)
- error (_("Dwarf Error: could not find abbrev number %d [in module %s]"),
- abbrev_number,
- bfd_get_filename (abfd));
-
- die = dwarf_alloc_die (cu, abbrev->num_attrs + num_extra_attrs);
- die->sect_off = sect_off;
- die->tag = abbrev->tag;
- die->abbrev = abbrev_number;
-
- /* Make the result usable.
- The caller needs to update num_attrs after adding the extra
- attributes. */
- die->num_attrs = abbrev->num_attrs;
+ previous_prefix = determine_prefix (die, cu);
+ if (previous_prefix[0] != '\0')
+ name = typename_concat (&objfile->objfile_obstack,
+ previous_prefix, name, 0, cu);
- for (i = 0; i < abbrev->num_attrs; ++i)
- info_ptr = read_attribute (reader, &die->attrs[i], &abbrev->attrs[i],
- info_ptr);
+ /* Create the type. */
+ type = init_type (objfile, TYPE_CODE_NAMESPACE, 0, name);
- *diep = die;
- *has_children = abbrev->has_children;
- return info_ptr;
+ return set_die_type (die, type, cu);
}
-/* Read a die and all its attributes.
- 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. */
+/* Read a namespace scope. */
-static const gdb_byte *
-read_full_die (const struct die_reader_specs *reader,
- struct die_info **diep, const gdb_byte *info_ptr,
- int *has_children)
+static void
+read_namespace (struct die_info *die, struct dwarf2_cu *cu)
{
- const gdb_byte *result;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ int is_anonymous;
- result = read_full_die_1 (reader, diep, info_ptr, has_children, 0);
+ /* 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. */
- if (dwarf_die_debug)
+ if (dwarf2_attr (die, DW_AT_extension, cu) == NULL)
{
- fprintf_unfiltered (gdb_stdlog,
- "Read die from %s@0x%x of %s:\n",
- get_section_name (reader->die_section),
- (unsigned) (info_ptr - reader->die_section->buffer),
- bfd_get_filename (reader->abfd));
- dump_die (*diep, dwarf_die_debug);
- }
-
- return result;
-}
-\f
-/* Abbreviation tables.
+ struct type *type;
- 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
- in a hash table. */
+ type = read_type_die (die, cu);
+ new_symbol (die, type, cu);
-/* Allocate space for a struct abbrev_info object in ABBREV_TABLE. */
+ namespace_name (die, &is_anonymous, cu);
+ if (is_anonymous)
+ {
+ const char *previous_prefix = determine_prefix (die, cu);
-static struct abbrev_info *
-abbrev_table_alloc_abbrev (struct abbrev_table *abbrev_table)
-{
- struct abbrev_info *abbrev;
+ std::vector<const char *> excludes;
+ add_using_directive (using_directives (cu->language),
+ previous_prefix, TYPE_NAME (type), NULL,
+ NULL, excludes, 0, &objfile->objfile_obstack);
+ }
+ }
- abbrev = XOBNEW (&abbrev_table->abbrev_obstack, struct abbrev_info);
- memset (abbrev, 0, sizeof (struct abbrev_info));
+ if (die->child != NULL)
+ {
+ struct die_info *child_die = die->child;
- return abbrev;
+ while (child_die && child_die->tag)
+ {
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
+ }
+ }
}
-/* Add an abbreviation to the table. */
+/* Read a Fortran module as type. This DIE can be only a declaration used for
+ imported module. Still we need that type as local Fortran "use ... only"
+ declaration imports depend on the created type in determine_prefix. */
-static void
-abbrev_table_add_abbrev (struct abbrev_table *abbrev_table,
- unsigned int abbrev_number,
- struct abbrev_info *abbrev)
+static struct type *
+read_module_type (struct die_info *die, struct dwarf2_cu *cu)
{
- unsigned int hash_number;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const char *module_name;
+ struct type *type;
- hash_number = abbrev_number % ABBREV_HASH_SIZE;
- abbrev->next = abbrev_table->abbrevs[hash_number];
- abbrev_table->abbrevs[hash_number] = abbrev;
+ module_name = dwarf2_name (die, cu);
+ if (!module_name)
+ complaint (_("DW_TAG_module has no name, offset %s"),
+ sect_offset_str (die->sect_off));
+ type = init_type (objfile, TYPE_CODE_MODULE, 0, module_name);
+
+ return set_die_type (die, type, cu);
}
-/* Look up an abbrev in the table.
- Returns NULL if the abbrev is not found. */
+/* Read a Fortran module. */
-static struct abbrev_info *
-abbrev_table_lookup_abbrev (const struct abbrev_table *abbrev_table,
- unsigned int abbrev_number)
+static void
+read_module (struct die_info *die, struct dwarf2_cu *cu)
{
- unsigned int hash_number;
- struct abbrev_info *abbrev;
+ struct die_info *child_die = die->child;
+ struct type *type;
- hash_number = abbrev_number % ABBREV_HASH_SIZE;
- abbrev = abbrev_table->abbrevs[hash_number];
+ type = read_type_die (die, cu);
+ new_symbol (die, type, cu);
- while (abbrev)
+ while (child_die && child_die->tag)
{
- if (abbrev->number == abbrev_number)
- return abbrev;
- abbrev = abbrev->next;
+ process_die (child_die, cu);
+ child_die = sibling_die (child_die);
}
- return NULL;
}
-/* Read in an abbrev table. */
+/* Return the name of the namespace represented by DIE. Set
+ *IS_ANONYMOUS to tell whether or not the namespace is an anonymous
+ namespace. */
-static struct abbrev_table *
-abbrev_table_read_table (struct dwarf2_section_info *section,
- sect_offset sect_off)
+static const char *
+namespace_name (struct die_info *die, int *is_anonymous, struct dwarf2_cu *cu)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- bfd *abfd = get_section_bfd_owner (section);
- struct abbrev_table *abbrev_table;
- const gdb_byte *abbrev_ptr;
- struct abbrev_info *cur_abbrev;
- unsigned int abbrev_number, bytes_read, abbrev_name;
- unsigned int abbrev_form;
- struct attr_abbrev *cur_attrs;
- unsigned int allocated_attrs;
+ struct die_info *current_die;
+ const char *name = NULL;
- abbrev_table = XNEW (struct abbrev_table);
- abbrev_table->sect_off = sect_off;
- obstack_init (&abbrev_table->abbrev_obstack);
- abbrev_table->abbrevs =
- XOBNEWVEC (&abbrev_table->abbrev_obstack, struct abbrev_info *,
- ABBREV_HASH_SIZE);
- memset (abbrev_table->abbrevs, 0,
- ABBREV_HASH_SIZE * sizeof (struct abbrev_info *));
+ /* Loop through the extensions until we find a name. */
- dwarf2_read_section (objfile, section);
- abbrev_ptr = section->buffer + to_underlying (sect_off);
- abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
- abbrev_ptr += bytes_read;
+ for (current_die = die;
+ current_die != NULL;
+ current_die = dwarf2_extension (die, &cu))
+ {
+ /* We don't use dwarf2_name here so that we can detect the absence
+ of a name -> anonymous namespace. */
+ name = dwarf2_string_attr (die, DW_AT_name, cu);
- allocated_attrs = ATTR_ALLOC_CHUNK;
- cur_attrs = XNEWVEC (struct attr_abbrev, allocated_attrs);
+ if (name != NULL)
+ break;
+ }
- /* Loop until we reach an abbrev number of 0. */
- while (abbrev_number)
- {
- cur_abbrev = abbrev_table_alloc_abbrev (abbrev_table);
+ /* Is it an anonymous namespace? */
- /* read in abbrev header */
- cur_abbrev->number = abbrev_number;
- cur_abbrev->tag
- = (enum dwarf_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;
+ *is_anonymous = (name == NULL);
+ if (*is_anonymous)
+ name = CP_ANONYMOUS_NAMESPACE_STR;
- /* now read in declarations */
- for (;;)
- {
- LONGEST implicit_const;
+ return name;
+}
- 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;
- if (abbrev_form == DW_FORM_implicit_const)
- {
- implicit_const = read_signed_leb128 (abfd, abbrev_ptr,
- &bytes_read);
- abbrev_ptr += bytes_read;
- }
- else
- {
- /* Initialize it due to a false compiler warning. */
- implicit_const = -1;
- }
+/* Extract all information from a DW_TAG_pointer_type DIE and add to
+ the user defined type vector. */
- if (abbrev_name == 0)
- break;
+static struct type *
+read_tag_pointer_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct gdbarch *gdbarch
+ = get_objfile_arch (cu->per_cu->dwarf2_per_objfile->objfile);
+ struct comp_unit_head *cu_header = &cu->header;
+ struct type *type;
+ struct attribute *attr_byte_size;
+ struct attribute *attr_address_class;
+ int byte_size, addr_class;
+ struct type *target_type;
- if (cur_abbrev->num_attrs == allocated_attrs)
- {
- allocated_attrs += ATTR_ALLOC_CHUNK;
- cur_attrs
- = XRESIZEVEC (struct attr_abbrev, cur_attrs, allocated_attrs);
- }
+ target_type = die_type (die, cu);
- cur_attrs[cur_abbrev->num_attrs].name
- = (enum dwarf_attribute) abbrev_name;
- cur_attrs[cur_abbrev->num_attrs].form
- = (enum dwarf_form) abbrev_form;
- cur_attrs[cur_abbrev->num_attrs].implicit_const = implicit_const;
- ++cur_abbrev->num_attrs;
- }
+ /* The die_type call above may have already set the type for this DIE. */
+ type = get_die_type (die, cu);
+ if (type)
+ return type;
- cur_abbrev->attrs =
- XOBNEWVEC (&abbrev_table->abbrev_obstack, struct attr_abbrev,
- cur_abbrev->num_attrs);
- memcpy (cur_abbrev->attrs, cur_attrs,
- cur_abbrev->num_attrs * sizeof (struct attr_abbrev));
+ type = lookup_pointer_type (target_type);
- abbrev_table_add_abbrev (abbrev_table, abbrev_number, cur_abbrev);
+ attr_byte_size = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr_byte_size)
+ byte_size = DW_UNSND (attr_byte_size);
+ else
+ byte_size = cu_header->addr_size;
- /* Get next abbreviation.
- Under Irix6 the abbreviations for a compilation unit are not
- 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. */
- if ((unsigned int) (abbrev_ptr - section->buffer) >= section->size)
- break;
- abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
- abbrev_ptr += bytes_read;
- if (abbrev_table_lookup_abbrev (abbrev_table, abbrev_number) != NULL)
- break;
+ attr_address_class = dwarf2_attr (die, DW_AT_address_class, cu);
+ if (attr_address_class)
+ addr_class = DW_UNSND (attr_address_class);
+ else
+ addr_class = DW_ADDR_none;
+
+ ULONGEST alignment = get_alignment (cu, die);
+
+ /* If the pointer size, alignment, 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
+ || (alignment != 0 && TYPE_RAW_ALIGN (type) != 0
+ && alignment != TYPE_RAW_ALIGN (type))
+ || addr_class != DW_ADDR_none)
+ {
+ if (gdbarch_address_class_type_flags_p (gdbarch))
+ {
+ int type_flags;
+
+ type_flags = gdbarch_address_class_type_flags
+ (gdbarch, byte_size, addr_class);
+ gdb_assert ((type_flags & ~TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL)
+ == 0);
+ type = make_type_with_address_space (type, type_flags);
+ }
+ else if (TYPE_LENGTH (type) != byte_size)
+ {
+ complaint (_("invalid pointer size %d"), byte_size);
+ }
+ else if (TYPE_RAW_ALIGN (type) != alignment)
+ {
+ complaint (_("Invalid DW_AT_alignment"
+ " - DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+ }
+ else
+ {
+ /* Should we also complain about unhandled address classes? */
+ }
}
- xfree (cur_attrs);
- return abbrev_table;
+ TYPE_LENGTH (type) = byte_size;
+ set_type_align (type, alignment);
+ return set_die_type (die, type, cu);
}
-/* Free the resources held by ABBREV_TABLE. */
+/* Extract all information from a DW_TAG_ptr_to_member_type DIE and add to
+ the user defined type vector. */
-static void
-abbrev_table_free (struct abbrev_table *abbrev_table)
+static struct type *
+read_tag_ptr_to_member_type (struct die_info *die, struct dwarf2_cu *cu)
{
- obstack_free (&abbrev_table->abbrev_obstack, NULL);
- xfree (abbrev_table);
-}
+ struct type *type;
+ struct type *to_type;
+ struct type *domain;
-/* Same as abbrev_table_free but as a cleanup.
- We pass in a pointer to the pointer to the table so that we can
- set the pointer to NULL when we're done. It also simplifies
- build_type_psymtabs_1. */
+ to_type = die_type (die, cu);
+ domain = die_containing_type (die, cu);
-static void
-abbrev_table_free_cleanup (void *table_ptr)
-{
- struct abbrev_table **abbrev_table_ptr = (struct abbrev_table **) table_ptr;
+ /* The calls above may have already set the type for this DIE. */
+ type = get_die_type (die, cu);
+ if (type)
+ return type;
- if (*abbrev_table_ptr != NULL)
- abbrev_table_free (*abbrev_table_ptr);
- *abbrev_table_ptr = NULL;
-}
+ if (TYPE_CODE (check_typedef (to_type)) == TYPE_CODE_METHOD)
+ type = lookup_methodptr_type (to_type);
+ else if (TYPE_CODE (check_typedef (to_type)) == TYPE_CODE_FUNC)
+ {
+ struct type *new_type
+ = alloc_type (cu->per_cu->dwarf2_per_objfile->objfile);
-/* Read the abbrev table for CU from ABBREV_SECTION. */
+ smash_to_method_type (new_type, domain, TYPE_TARGET_TYPE (to_type),
+ TYPE_FIELDS (to_type), TYPE_NFIELDS (to_type),
+ TYPE_VARARGS (to_type));
+ type = lookup_methodptr_type (new_type);
+ }
+ else
+ type = lookup_memberptr_type (to_type, domain);
-static void
-dwarf2_read_abbrevs (struct dwarf2_cu *cu,
- struct dwarf2_section_info *abbrev_section)
-{
- cu->abbrev_table =
- abbrev_table_read_table (abbrev_section, cu->header.abbrev_sect_off);
+ return set_die_type (die, type, cu);
}
-/* Release the memory used by the abbrev table for a compilation unit. */
+/* Extract all information from a DW_TAG_{rvalue_,}reference_type DIE and add to
+ the user defined type vector. */
-static void
-dwarf2_free_abbrev_table (void *ptr_to_cu)
+static struct type *
+read_tag_reference_type (struct die_info *die, struct dwarf2_cu *cu,
+ enum type_code refcode)
{
- struct dwarf2_cu *cu = (struct dwarf2_cu *) ptr_to_cu;
+ struct comp_unit_head *cu_header = &cu->header;
+ struct type *type, *target_type;
+ struct attribute *attr;
- if (cu->abbrev_table != NULL)
- abbrev_table_free (cu->abbrev_table);
- /* Set this to NULL so that we SEGV if we try to read it later,
- and also because free_comp_unit verifies this is NULL. */
- cu->abbrev_table = NULL;
-}
-\f
-/* Returns nonzero if TAG represents a type that we might generate a partial
- symbol for. */
+ gdb_assert (refcode == TYPE_CODE_REF || refcode == TYPE_CODE_RVALUE_REF);
-static int
-is_type_tag_for_partial (int tag)
-{
- switch (tag)
+ target_type = die_type (die, cu);
+
+ /* The die_type call above may have already set the type for this DIE. */
+ type = get_die_type (die, cu);
+ if (type)
+ return type;
+
+ type = lookup_reference_type (target_type, refcode);
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
{
-#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_interface_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;
+ TYPE_LENGTH (type) = DW_UNSND (attr);
+ }
+ else
+ {
+ TYPE_LENGTH (type) = cu_header->addr_size;
}
+ maybe_set_alignment (cu, die, type);
+ return set_die_type (die, type, cu);
}
-/* Load all DIEs that are interesting for partial symbols into memory. */
+/* Add the given cv-qualifiers to the element type of the array. GCC
+ outputs DWARF type qualifiers that apply to an array, not the
+ element type. But GDB relies on the array element type to carry
+ the cv-qualifiers. This mimics section 6.7.3 of the C99
+ specification. */
-static struct partial_die_info *
-load_partial_dies (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr, int building_psymtab)
+static struct type *
+add_array_cv_type (struct die_info *die, struct dwarf2_cu *cu,
+ struct type *base_type, int cnst, int voltl)
{
- struct dwarf2_cu *cu = reader->cu;
- struct objfile *objfile = cu->objfile;
- 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;
- unsigned int load_all = 0;
- int nesting_level = 1;
+ struct type *el_type, *inner_array;
- parent_die = NULL;
- last_die = NULL;
+ base_type = copy_type (base_type);
+ inner_array = base_type;
- gdb_assert (cu->per_cu != NULL);
- if (cu->per_cu->load_all_dies)
- load_all = 1;
+ while (TYPE_CODE (TYPE_TARGET_TYPE (inner_array)) == TYPE_CODE_ARRAY)
+ {
+ TYPE_TARGET_TYPE (inner_array) =
+ copy_type (TYPE_TARGET_TYPE (inner_array));
+ inner_array = TYPE_TARGET_TYPE (inner_array);
+ }
- 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);
+ el_type = TYPE_TARGET_TYPE (inner_array);
+ cnst |= TYPE_CONST (el_type);
+ voltl |= TYPE_VOLATILE (el_type);
+ TYPE_TARGET_TYPE (inner_array) = make_cv_type (cnst, voltl, el_type, NULL);
- part_die = XOBNEW (&cu->comp_unit_obstack, struct partial_die_info);
+ return set_die_type (die, base_type, cu);
+}
- while (1)
- {
- abbrev = peek_die_abbrev (info_ptr, &bytes_read, cu);
+static struct type *
+read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *base_type, *cv_type;
- /* 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;
- }
+ base_type = die_type (die, cu);
- /* Check for template arguments. We never save these; if
- they're seen, we just mark the parent, and go on our way. */
- if (parent_die != NULL
- && cu->language == language_cplus
- && (abbrev->tag == DW_TAG_template_type_param
- || abbrev->tag == DW_TAG_template_value_param))
- {
- parent_die->has_template_arguments = 1;
+ /* The die_type call above may have already set the type for this DIE. */
+ cv_type = get_die_type (die, cu);
+ if (cv_type)
+ return cv_type;
- if (!load_all)
- {
- /* We don't need a partial DIE for the template argument. */
- info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
- continue;
- }
- }
+ /* In case the const qualifier is applied to an array type, the element type
+ is so qualified, not the array type (section 6.7.3 of C99). */
+ if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
+ return add_array_cv_type (die, cu, base_type, 1, 0);
- /* We only recurse into c++ subprograms looking for template arguments.
- Skip their other children. */
- if (!load_all
- && cu->language == language_cplus
- && parent_die != NULL
- && parent_die->tag == DW_TAG_subprogram)
- {
- info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
- continue;
- }
+ cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
+ return set_die_type (die, cv_type, cu);
+}
- /* Check whether this DIE is interesting enough to save. Normally
- we would not be interested in members here, but there may be
- later variables referencing them via DW_AT_specification (for
- static members). */
- if (!load_all
- && !is_type_tag_for_partial (abbrev->tag)
- && abbrev->tag != DW_TAG_constant
- && abbrev->tag != DW_TAG_enumerator
- && abbrev->tag != DW_TAG_subprogram
- && abbrev->tag != DW_TAG_lexical_block
- && abbrev->tag != DW_TAG_variable
- && abbrev->tag != DW_TAG_namespace
- && abbrev->tag != DW_TAG_module
- && abbrev->tag != DW_TAG_member
- && abbrev->tag != DW_TAG_imported_unit
- && abbrev->tag != DW_TAG_imported_declaration)
- {
- /* Otherwise we skip to the next sibling, if any. */
- info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
- continue;
- }
+static struct type *
+read_tag_volatile_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *base_type, *cv_type;
- info_ptr = read_partial_die (reader, part_die, abbrev, bytes_read,
- info_ptr);
+ base_type = die_type (die, 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.
+ /* The die_type call above may have already set the type for this DIE. */
+ cv_type = get_die_type (die, cu);
+ if (cv_type)
+ return cv_type;
- 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. */
+ /* In case the volatile qualifier is applied to an array type, the
+ element type is so qualified, not the array type (section 6.7.3
+ of C99). */
+ if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
+ return add_array_cv_type (die, cu, base_type, 0, 1);
- /* 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->has_children)
- || 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), 0,
- VAR_DOMAIN, LOC_TYPEDEF,
- &objfile->static_psymbols,
- 0, cu->language, objfile);
- info_ptr = locate_pdi_sibling (reader, part_die, info_ptr);
- continue;
- }
+ cv_type = make_cv_type (TYPE_CONST (base_type), 1, base_type, 0);
+ return set_die_type (die, cv_type, cu);
+}
- /* The exception for DW_TAG_typedef with has_children above is
- a workaround of GCC PR debug/47510. In the case of this complaint
- type_name_no_tag_or_error will error on such types later.
+/* Handle DW_TAG_restrict_type. */
- GDB skipped children of DW_TAG_typedef by the shortcut above and then
- it could not find the child DIEs referenced later, this is checked
- above. In correct DWARF DW_TAG_typedef should have no children. */
+static struct type *
+read_tag_restrict_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *base_type, *cv_type;
- if (part_die->tag == DW_TAG_typedef && part_die->has_children)
- complaint (&symfile_complaints,
- _("DW_TAG_typedef has childen - GCC PR debug/47510 bug "
- "- DIE at 0x%x [in module %s]"),
- to_underlying (part_die->sect_off), objfile_name (objfile));
+ base_type = die_type (die, cu);
- /* 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), 0,
- VAR_DOMAIN, LOC_CONST,
- cu->language == language_cplus
- ? &objfile->global_psymbols
- : &objfile->static_psymbols,
- 0, cu->language, objfile);
+ /* The die_type call above may have already set the type for this DIE. */
+ cv_type = get_die_type (die, cu);
+ if (cv_type)
+ return cv_type;
- info_ptr = locate_pdi_sibling (reader, part_die, info_ptr);
- continue;
- }
+ cv_type = make_restrict_type (base_type);
+ return set_die_type (die, cv_type, cu);
+}
- /* 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;
+/* Handle DW_TAG_atomic_type. */
- if (last_die && last_die == parent_die)
- last_die->die_child = part_die;
- else if (last_die)
- last_die->die_sibling = part_die;
+static struct type *
+read_tag_atomic_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *base_type, *cv_type;
- last_die = part_die;
+ base_type = die_type (die, cu);
- if (first_die == NULL)
- first_die = part_die;
+ /* The die_type call above may have already set the type for this DIE. */
+ cv_type = get_die_type (die, cu);
+ if (cv_type)
+ return cv_type;
- /* 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.
+ cv_type = make_atomic_type (base_type);
+ return set_die_type (die, cv_type, cu);
+}
- 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.
+/* 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. */
- Adding more things than necessary to the hash table is harmless
- except for the performance cost. Adding too few will result in
- wasted time in find_partial_die, when we reread the compilation
- unit with load_all_dies set. */
+static struct type *
+read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct type *type, *range_type, *index_type, *char_type;
+ struct attribute *attr;
+ unsigned int length;
- if (load_all
- || abbrev->tag == DW_TAG_constant
- || abbrev->tag == DW_TAG_subprogram
- || abbrev->tag == DW_TAG_variable
- || abbrev->tag == DW_TAG_namespace
- || part_die->is_declaration)
- {
- void **slot;
+ attr = dwarf2_attr (die, DW_AT_string_length, cu);
+ if (attr)
+ {
+ length = DW_UNSND (attr);
+ }
+ else
+ {
+ /* Check for the DW_AT_byte_size attribute. */
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
+ {
+ length = DW_UNSND (attr);
+ }
+ else
+ {
+ length = 1;
+ }
+ }
- slot = htab_find_slot_with_hash (cu->partial_dies, part_die,
- to_underlying (part_die->sect_off),
- INSERT);
- *slot = part_die;
- }
+ index_type = objfile_type (objfile)->builtin_int;
+ range_type = create_static_range_type (NULL, index_type, 1, length);
+ char_type = language_string_char_type (cu->language_defn, gdbarch);
+ type = create_string_type (NULL, char_type, range_type);
- part_die = XOBNEW (&cu->comp_unit_obstack, struct partial_die_info);
+ return set_die_type (die, type, cu);
+}
- /* 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, so that we can get at method physnames
- to infer fully qualified class names, for DW_AT_specification,
- and for C++ template arguments. For C++, we also look one level
- inside functions to find template arguments (if the name of the
- function does not already contain the template arguments).
+/* Assuming that DIE corresponds to a function, returns nonzero
+ if the function is prototyped. */
- For Ada, we need to scan the children of subprograms and lexical
- blocks as well because Ada allows the definition of nested
- entities that could be interesting for the debugger, such as
- nested subprograms for instance. */
- if (last_die->has_children
- && (load_all
- || last_die->tag == DW_TAG_namespace
- || last_die->tag == DW_TAG_module
- || last_die->tag == DW_TAG_enumeration_type
- || (cu->language == language_cplus
- && last_die->tag == DW_TAG_subprogram
- && (last_die->name == NULL
- || strchr (last_die->name, '<') == NULL))
- || (cu->language != language_c
- && (last_die->tag == DW_TAG_class_type
- || last_die->tag == DW_TAG_interface_type
- || last_die->tag == DW_TAG_structure_type
- || last_die->tag == DW_TAG_union_type))
- || (cu->language == language_ada
- && (last_die->tag == DW_TAG_subprogram
- || last_die->tag == DW_TAG_lexical_block))))
- {
- nesting_level++;
- parent_die = last_die;
- continue;
- }
+static int
+prototyped_function_p (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct attribute *attr;
- /* Otherwise we skip to the next sibling, if any. */
- info_ptr = locate_pdi_sibling (reader, last_die, info_ptr);
+ attr = dwarf2_attr (die, DW_AT_prototyped, cu);
+ if (attr && (DW_UNSND (attr) != 0))
+ return 1;
- /* Back to the top, do it again. */
- }
+ /* The DWARF standard implies that the DW_AT_prototyped attribute
+ is only meaninful for C, but the concept also extends to other
+ languages that allow unprototyped functions (Eg: Objective C).
+ For all other languages, assume that functions are always
+ prototyped. */
+ if (cu->language != language_c
+ && cu->language != language_objc
+ && cu->language != language_opencl)
+ return 1;
+
+ /* RealView does not emit DW_AT_prototyped. We can not distinguish
+ prototyped and unprototyped functions; default to prototyped,
+ since that is more common in modern code (and RealView warns
+ about unprototyped functions). */
+ if (producer_is_realview (cu->producer))
+ return 1;
+
+ return 0;
}
-/* Read a minimal amount of information into the minimal die structure. */
+/* Handle DIES due to C code like:
-static const gdb_byte *
-read_partial_die (const struct die_reader_specs *reader,
- struct partial_die_info *part_die,
- struct abbrev_info *abbrev, unsigned int abbrev_len,
- const gdb_byte *info_ptr)
-{
- struct dwarf2_cu *cu = reader->cu;
- struct objfile *objfile = cu->objfile;
- const gdb_byte *buffer = reader->buffer;
- unsigned int i;
- struct attribute attr;
- int has_low_pc_attr = 0;
- int has_high_pc_attr = 0;
- int high_pc_relative = 0;
+ struct foo
+ {
+ int (*funcp)(int a, long l);
+ int b;
+ };
- memset (part_die, 0, sizeof (struct partial_die_info));
+ ('funcp' generates a DW_TAG_subroutine_type DIE). */
- part_die->sect_off = (sect_offset) (info_ptr - buffer);
+static struct type *
+read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct type *type; /* Type that this function returns. */
+ struct type *ftype; /* Function that returns above type. */
+ struct attribute *attr;
- info_ptr += abbrev_len;
+ type = die_type (die, cu);
- if (abbrev == NULL)
- return info_ptr;
+ /* The die_type call above may have already set the type for this DIE. */
+ ftype = get_die_type (die, cu);
+ if (ftype)
+ return ftype;
- part_die->tag = abbrev->tag;
- part_die->has_children = abbrev->has_children;
+ ftype = lookup_function_type (type);
- for (i = 0; i < abbrev->num_attrs; ++i)
- {
- info_ptr = read_attribute (reader, &attr, &abbrev->attrs[i], info_ptr);
+ if (prototyped_function_p (die, cu))
+ TYPE_PROTOTYPED (ftype) = 1;
- /* Store the data if it is of an attribute we want to keep in a
- partial symbol table. */
- switch (attr.name)
- {
- case DW_AT_name:
- switch (part_die->tag)
- {
- case DW_TAG_compile_unit:
- case DW_TAG_partial_unit:
- case DW_TAG_type_unit:
- /* Compilation units have a DW_AT_name that is a filename, not
- a source language identifier. */
- case DW_TAG_enumeration_type:
- case DW_TAG_enumerator:
- /* These tags always have simple identifiers already; no need
- to canonicalize them. */
- part_die->name = DW_STRING (&attr);
- break;
- default:
- part_die->name
- = dwarf2_canonicalize_name (DW_STRING (&attr), cu,
- &objfile->per_bfd->storage_obstack);
- break;
- }
- break;
- case DW_AT_linkage_name:
- case DW_AT_MIPS_linkage_name:
- /* Note that both forms of linkage name might appear. We
- assume they will be the same, and we only store the last
- one we see. */
- if (cu->language == language_ada)
- part_die->name = DW_STRING (&attr);
- part_die->linkage_name = DW_STRING (&attr);
- break;
- case DW_AT_low_pc:
- has_low_pc_attr = 1;
- part_die->lowpc = attr_value_as_address (&attr);
- break;
- case DW_AT_high_pc:
- has_high_pc_attr = 1;
- part_die->highpc = attr_value_as_address (&attr);
- if (cu->header.version >= 4 && attr_form_is_constant (&attr))
- high_pc_relative = 1;
- break;
- case DW_AT_location:
- /* Support the .debug_loc offsets. */
- if (attr_form_is_block (&attr))
- {
- part_die->d.locdesc = DW_BLOCK (&attr);
- }
- else if (attr_form_is_section_offset (&attr))
- {
- dwarf2_complex_location_expr_complaint ();
- }
- else
- {
- dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
- "partial symbol information");
- }
- 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:
- case DW_AT_extension:
- part_die->has_specification = 1;
- part_die->spec_offset = dwarf2_get_ref_die_offset (&attr);
- part_die->spec_is_dwz = (attr.form == DW_FORM_GNU_ref_alt
- || cu->per_cu->is_dwz);
- break;
- case DW_AT_sibling:
- /* Ignore absolute siblings, they might point outside of
- the current compile unit. */
- if (attr.form == DW_FORM_ref_addr)
- complaint (&symfile_complaints,
- _("ignoring absolute DW_AT_sibling"));
- else
- {
- sect_offset off = dwarf2_get_ref_die_offset (&attr);
- const gdb_byte *sibling_ptr = buffer + to_underlying (off);
+ /* Store the calling convention in the type if it's available in
+ the subroutine die. Otherwise set the calling convention to
+ the default value DW_CC_normal. */
+ attr = dwarf2_attr (die, DW_AT_calling_convention, cu);
+ if (attr)
+ TYPE_CALLING_CONVENTION (ftype) = DW_UNSND (attr);
+ else if (cu->producer && strstr (cu->producer, "IBM XL C for OpenCL"))
+ TYPE_CALLING_CONVENTION (ftype) = DW_CC_GDB_IBM_OpenCL;
+ else
+ TYPE_CALLING_CONVENTION (ftype) = DW_CC_normal;
- if (sibling_ptr < info_ptr)
- complaint (&symfile_complaints,
- _("DW_AT_sibling points backwards"));
- else if (sibling_ptr > reader->buffer_end)
- dwarf2_section_buffer_overflow_complaint (reader->die_section);
- else
- part_die->sibling = sibling_ptr;
- }
- break;
- case DW_AT_byte_size:
- part_die->has_byte_size = 1;
- break;
- case DW_AT_const_value:
- part_die->has_const_value = 1;
- break;
- case DW_AT_calling_convention:
- /* DWARF doesn't provide a way to identify a program's source-level
- entry point. DW_AT_calling_convention attributes are only meant
- to describe functions' calling conventions.
+ /* Record whether the function returns normally to its caller or not
+ if the DWARF producer set that information. */
+ attr = dwarf2_attr (die, DW_AT_noreturn, cu);
+ if (attr && (DW_UNSND (attr) != 0))
+ TYPE_NO_RETURN (ftype) = 1;
- However, because it's a necessary piece of information in
- Fortran, and before DWARF 4 DW_CC_program was the only
- piece of debugging information whose definition refers to
- a 'main program' at all, several compilers marked Fortran
- main programs with DW_CC_program --- even when those
- functions use the standard calling conventions.
+ /* We need to add the subroutine type to the die immediately so
+ we don't infinitely recurse when dealing with parameters
+ declared as the same subroutine type. */
+ set_die_type (die, ftype, cu);
- Although DWARF now specifies a way to provide this
- information, we support this practice for backward
- compatibility. */
- if (DW_UNSND (&attr) == DW_CC_program
- && cu->language == language_fortran)
- part_die->main_subprogram = 1;
- break;
- case DW_AT_inline:
- if (DW_UNSND (&attr) == DW_INL_inlined
- || DW_UNSND (&attr) == DW_INL_declared_inlined)
- part_die->may_be_inlined = 1;
- break;
+ if (die->child != NULL)
+ {
+ struct type *void_type = objfile_type (objfile)->builtin_void;
+ struct die_info *child_die;
+ int nparams, iparams;
- case DW_AT_import:
- if (part_die->tag == DW_TAG_imported_unit)
+ /* Count the number of parameters.
+ FIXME: GDB currently ignores vararg functions, but knows about
+ vararg member functions. */
+ nparams = 0;
+ child_die = die->child;
+ 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_VARARGS (ftype) = 1;
+ child_die = sibling_die (child_die);
+ }
+
+ /* Allocate storage for parameters and fill them in. */
+ TYPE_NFIELDS (ftype) = nparams;
+ TYPE_FIELDS (ftype) = (struct field *)
+ TYPE_ZALLOC (ftype, nparams * sizeof (struct field));
+
+ /* TYPE_FIELD_TYPE must never be NULL. Pre-fill the array to ensure it
+ even if we error out during the parameters reading below. */
+ for (iparams = 0; iparams < nparams; iparams++)
+ TYPE_FIELD_TYPE (ftype, iparams) = void_type;
+
+ iparams = 0;
+ child_die = die->child;
+ while (child_die && child_die->tag)
+ {
+ if (child_die->tag == DW_TAG_formal_parameter)
{
- part_die->d.sect_off = dwarf2_get_ref_die_offset (&attr);
- part_die->is_dwz = (attr.form == DW_FORM_GNU_ref_alt
- || cu->per_cu->is_dwz);
- }
- break;
+ struct type *arg_type;
- case DW_AT_main_subprogram:
- part_die->main_subprogram = DW_UNSND (&attr);
- break;
+ /* DWARF version 2 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 pass this information to
+ dwarf2_add_member_fn via TYPE_FIELD_ARTIFICIAL.
- default:
- break;
- }
- }
+ DWARF version 3 added DW_AT_object_pointer, which GCC
+ 4.5 does not yet generate. */
+ attr = dwarf2_attr (child_die, DW_AT_artificial, cu);
+ if (attr)
+ TYPE_FIELD_ARTIFICIAL (ftype, iparams) = DW_UNSND (attr);
+ else
+ TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
+ arg_type = die_type (child_die, cu);
- if (high_pc_relative)
- part_die->highpc += part_die->lowpc;
+ /* RealView does not mark THIS as const, which the testsuite
+ expects. GCC marks THIS as const in method definitions,
+ but not in the class specifications (GCC PR 43053). */
+ if (cu->language == language_cplus && !TYPE_CONST (arg_type)
+ && TYPE_FIELD_ARTIFICIAL (ftype, iparams))
+ {
+ int is_this = 0;
+ struct dwarf2_cu *arg_cu = cu;
+ const char *name = dwarf2_name (child_die, cu);
- if (has_low_pc_attr && has_high_pc_attr)
- {
- /* 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 (part_die->lowpc == 0 && !dwarf2_per_objfile->has_section_at_zero)
- {
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ attr = dwarf2_attr (die, DW_AT_object_pointer, cu);
+ if (attr)
+ {
+ /* If the compiler emits this, use it. */
+ if (follow_die_ref (die, attr, &arg_cu) == child_die)
+ is_this = 1;
+ }
+ else if (name && strcmp (name, "this") == 0)
+ /* Function definitions will have the argument names. */
+ is_this = 1;
+ else if (name == NULL && iparams == 0)
+ /* Declarations may not have the names, so like
+ elsewhere in GDB, assume an artificial first
+ argument is "this". */
+ is_this = 1;
- complaint (&symfile_complaints,
- _("DW_AT_low_pc %s is zero "
- "for DIE at 0x%x [in module %s]"),
- paddress (gdbarch, part_die->lowpc),
- to_underlying (part_die->sect_off), objfile_name (objfile));
- }
- /* dwarf2_get_pc_bounds has also the strict low < high requirement. */
- else if (part_die->lowpc >= part_die->highpc)
- {
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ if (is_this)
+ arg_type = make_cv_type (1, TYPE_VOLATILE (arg_type),
+ arg_type, 0);
+ }
- complaint (&symfile_complaints,
- _("DW_AT_low_pc %s is not < DW_AT_high_pc %s "
- "for DIE at 0x%x [in module %s]"),
- paddress (gdbarch, part_die->lowpc),
- paddress (gdbarch, part_die->highpc),
- to_underlying (part_die->sect_off),
- objfile_name (objfile));
+ TYPE_FIELD_TYPE (ftype, iparams) = arg_type;
+ iparams++;
+ }
+ child_die = sibling_die (child_die);
}
- else
- part_die->has_pc_info = 1;
}
- return info_ptr;
+ return ftype;
}
-/* Find a cached partial DIE at OFFSET in CU. */
-
-static struct partial_die_info *
-find_partial_die_in_comp_unit (sect_offset sect_off, struct dwarf2_cu *cu)
+static struct type *
+read_typedef (struct die_info *die, struct dwarf2_cu *cu)
{
- struct partial_die_info *lookup_die = NULL;
- struct partial_die_info part_die;
-
- part_die.sect_off = sect_off;
- lookup_die = ((struct partial_die_info *)
- htab_find_with_hash (cu->partial_dies, &part_die,
- to_underlying (sect_off)));
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const char *name = NULL;
+ struct type *this_type, *target_type;
- return lookup_die;
+ name = dwarf2_full_name (NULL, die, cu);
+ this_type = init_type (objfile, TYPE_CODE_TYPEDEF, 0, name);
+ TYPE_TARGET_STUB (this_type) = 1;
+ set_die_type (die, this_type, cu);
+ target_type = die_type (die, cu);
+ if (target_type != this_type)
+ TYPE_TARGET_TYPE (this_type) = target_type;
+ else
+ {
+ /* Self-referential typedefs are, it seems, not allowed by the DWARF
+ spec and cause infinite loops in GDB. */
+ complaint (_("Self-referential DW_TAG_typedef "
+ "- DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off), objfile_name (objfile));
+ TYPE_TARGET_TYPE (this_type) = NULL;
+ }
+ return this_type;
}
-/* Find a partial DIE at OFFSET, which may or may not be in CU,
- except in the case of .debug_types DIEs which do not reference
- outside their CU (they do however referencing other types via
- DW_FORM_ref_sig8). */
+/* Allocate a floating-point type of size BITS and name NAME. Pass NAME_HINT
+ (which may be different from NAME) to the architecture back-end to allow
+ it to guess the correct format if necessary. */
-static struct partial_die_info *
-find_partial_die (sect_offset sect_off, int offset_in_dwz, struct dwarf2_cu *cu)
+static struct type *
+dwarf2_init_float_type (struct objfile *objfile, int bits, const char *name,
+ const char *name_hint)
{
- struct objfile *objfile = cu->objfile;
- struct dwarf2_per_cu_data *per_cu = NULL;
- struct partial_die_info *pd = NULL;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ const struct floatformat **format;
+ struct type *type;
- if (offset_in_dwz == cu->per_cu->is_dwz
- && offset_in_cu_p (&cu->header, sect_off))
- {
- pd = find_partial_die_in_comp_unit (sect_off, cu);
- if (pd != NULL)
- return pd;
- /* We missed recording what we needed.
- Load all dies and try again. */
- per_cu = cu->per_cu;
- }
+ format = gdbarch_floatformat_for_type (gdbarch, name_hint, bits);
+ if (format)
+ type = init_float_type (objfile, bits, name, format);
else
- {
- /* TUs don't reference other CUs/TUs (except via type signatures). */
- if (cu->per_cu->is_debug_types)
- {
- error (_("Dwarf Error: Type Unit at offset 0x%x contains"
- " external reference to offset 0x%x [in module %s].\n"),
- to_underlying (cu->header.sect_off), to_underlying (sect_off),
- bfd_get_filename (objfile->obfd));
- }
- per_cu = dwarf2_find_containing_comp_unit (sect_off, offset_in_dwz,
- objfile);
-
- if (per_cu->cu == NULL || per_cu->cu->partial_dies == NULL)
- load_partial_comp_unit (per_cu);
-
- per_cu->cu->last_used = 0;
- pd = find_partial_die_in_comp_unit (sect_off, per_cu->cu);
- }
-
- /* If we didn't find it, and not all dies have been loaded,
- load them all and try again. */
-
- if (pd == NULL && per_cu->load_all_dies == 0)
- {
- per_cu->load_all_dies = 1;
-
- /* This is nasty. When we reread the DIEs, somewhere up the call chain
- THIS_CU->cu may already be in use. So we can't just free it and
- replace its DIEs with the ones we read in. Instead, we leave those
- DIEs alone (which can still be in use, e.g. in scan_partial_symbols),
- and clobber THIS_CU->cu->partial_dies with the hash table for the new
- set. */
- load_partial_comp_unit (per_cu);
-
- pd = find_partial_die_in_comp_unit (sect_off, per_cu->cu);
- }
+ type = init_type (objfile, TYPE_CODE_ERROR, bits, name);
- if (pd == NULL)
- internal_error (__FILE__, __LINE__,
- _("could not find partial DIE 0x%x "
- "in cache [from module %s]\n"),
- to_underlying (sect_off), bfd_get_filename (objfile->obfd));
- return pd;
+ return type;
}
-/* 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. */
+/* Find a representation of a given base type and install
+ it in the TYPE field of the die. */
-static void
-guess_partial_die_structure_name (struct partial_die_info *struct_pdi,
- struct dwarf2_cu *cu)
+static struct type *
+read_base_type (struct die_info *die, struct dwarf2_cu *cu)
{
- /* 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
- prefix (but see comment in read_structure_type). */
-
- struct partial_die_info *real_pdi;
- struct partial_die_info *child_pdi;
-
- /* 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. */
-
- real_pdi = struct_pdi;
- while (real_pdi->has_specification)
- real_pdi = find_partial_die (real_pdi->spec_offset,
- real_pdi->spec_is_dwz, cu);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct type *type;
+ struct attribute *attr;
+ int encoding = 0, bits = 0;
+ const char *name;
- if (real_pdi->die_parent != NULL)
- return;
+ attr = dwarf2_attr (die, DW_AT_encoding, cu);
+ if (attr)
+ {
+ encoding = DW_UNSND (attr);
+ }
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
+ {
+ bits = DW_UNSND (attr) * TARGET_CHAR_BIT;
+ }
+ name = dwarf2_name (die, cu);
+ if (!name)
+ {
+ complaint (_("DW_AT_name missing from DW_TAG_base_type"));
+ }
- for (child_pdi = struct_pdi->die_child;
- child_pdi != NULL;
- child_pdi = child_pdi->die_sibling)
+ switch (encoding)
{
- if (child_pdi->tag == DW_TAG_subprogram
- && child_pdi->linkage_name != NULL)
+ case DW_ATE_address:
+ /* Turn DW_ATE_address into a void * pointer. */
+ type = init_type (objfile, TYPE_CODE_VOID, TARGET_CHAR_BIT, NULL);
+ type = init_pointer_type (objfile, bits, name, type);
+ break;
+ case DW_ATE_boolean:
+ type = init_boolean_type (objfile, bits, 1, name);
+ break;
+ case DW_ATE_complex_float:
+ type = dwarf2_init_float_type (objfile, bits / 2, NULL, name);
+ type = init_complex_type (objfile, name, type);
+ break;
+ case DW_ATE_decimal_float:
+ type = init_decfloat_type (objfile, bits, name);
+ break;
+ case DW_ATE_float:
+ type = dwarf2_init_float_type (objfile, bits, name, name);
+ break;
+ case DW_ATE_signed:
+ type = init_integer_type (objfile, bits, 0, name);
+ break;
+ case DW_ATE_unsigned:
+ if (cu->language == language_fortran
+ && name
+ && startswith (name, "character("))
+ type = init_character_type (objfile, bits, 1, name);
+ else
+ type = init_integer_type (objfile, bits, 1, name);
+ break;
+ case DW_ATE_signed_char:
+ if (cu->language == language_ada || cu->language == language_m2
+ || cu->language == language_pascal
+ || cu->language == language_fortran)
+ type = init_character_type (objfile, bits, 0, name);
+ else
+ type = init_integer_type (objfile, bits, 0, name);
+ break;
+ case DW_ATE_unsigned_char:
+ if (cu->language == language_ada || cu->language == language_m2
+ || cu->language == language_pascal
+ || cu->language == language_fortran
+ || cu->language == language_rust)
+ type = init_character_type (objfile, bits, 1, name);
+ else
+ type = init_integer_type (objfile, bits, 1, name);
+ break;
+ case DW_ATE_UTF:
{
- char *actual_class_name
- = language_class_name_from_physname (cu->language_defn,
- child_pdi->linkage_name);
- if (actual_class_name != NULL)
+ gdbarch *arch = get_objfile_arch (objfile);
+
+ if (bits == 16)
+ type = builtin_type (arch)->builtin_char16;
+ else if (bits == 32)
+ type = builtin_type (arch)->builtin_char32;
+ else
{
- struct_pdi->name
- = ((const char *)
- obstack_copy0 (&cu->objfile->per_bfd->storage_obstack,
- actual_class_name,
- strlen (actual_class_name)));
- xfree (actual_class_name);
+ complaint (_("unsupported DW_ATE_UTF bit size: '%d'"),
+ bits);
+ type = init_integer_type (objfile, bits, 1, name);
}
- break;
+ return set_die_type (die, type, cu);
}
- }
-}
+ break;
-/* Adjust PART_DIE before generating a symbol for it. This function
- may set the is_external flag or change the DIE's name. */
+ default:
+ complaint (_("unsupported DW_AT_encoding: '%s'"),
+ dwarf_type_encoding_name (encoding));
+ type = init_type (objfile, TYPE_CODE_ERROR, bits, name);
+ break;
+ }
-static void
-fixup_partial_die (struct partial_die_info *part_die,
- struct dwarf2_cu *cu)
-{
- /* Once we've fixed up a die, there's no point in doing so again.
- This also avoids a memory leak if we were to call
- guess_partial_die_structure_name multiple times. */
- if (part_die->fixup_called)
- return;
+ if (name && strcmp (name, "char") == 0)
+ TYPE_NOSIGN (type) = 1;
- /* If we found a reference attribute and the DIE has no name, try
- to find a name in the referred to DIE. */
+ maybe_set_alignment (cu, die, type);
- if (part_die->name == NULL && part_die->has_specification)
- {
- struct partial_die_info *spec_die;
+ return set_die_type (die, type, cu);
+}
- spec_die = find_partial_die (part_die->spec_offset,
- part_die->spec_is_dwz, cu);
+/* Parse dwarf attribute if it's a block, reference or constant and put the
+ resulting value of the attribute into struct bound_prop.
+ Returns 1 if ATTR could be resolved into PROP, 0 otherwise. */
- fixup_partial_die (spec_die, cu);
+static int
+attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+ struct dwarf2_cu *cu, struct dynamic_prop *prop)
+{
+ struct dwarf2_property_baton *baton;
+ struct obstack *obstack
+ = &cu->per_cu->dwarf2_per_objfile->objfile->objfile_obstack;
- if (spec_die->name)
- {
- part_die->name = spec_die->name;
+ if (attr == NULL || prop == NULL)
+ return 0;
- /* Copy DW_AT_external attribute if it is set. */
- if (spec_die->is_external)
- part_die->is_external = spec_die->is_external;
- }
+ if (attr_form_is_block (attr))
+ {
+ baton = XOBNEW (obstack, struct dwarf2_property_baton);
+ baton->referenced_type = NULL;
+ baton->locexpr.per_cu = cu->per_cu;
+ baton->locexpr.size = DW_BLOCK (attr)->size;
+ baton->locexpr.data = DW_BLOCK (attr)->data;
+ prop->data.baton = baton;
+ prop->kind = PROP_LOCEXPR;
+ gdb_assert (prop->data.baton != NULL);
}
-
- /* Set default names for some unnamed DIEs. */
-
- if (part_die->name == NULL && part_die->tag == DW_TAG_namespace)
- part_die->name = CP_ANONYMOUS_NAMESPACE_STR;
-
- /* If there is no parent die to provide a namespace, and there are
- children, see if we can determine the namespace from their linkage
- name. */
- if (cu->language == language_cplus
- && !VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types)
- && part_die->die_parent == NULL
- && part_die->has_children
- && (part_die->tag == DW_TAG_class_type
- || part_die->tag == DW_TAG_structure_type
- || part_die->tag == DW_TAG_union_type))
- guess_partial_die_structure_name (part_die, cu);
-
- /* GCC might emit a nameless struct or union that has a linkage
- name. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
- if (part_die->name == NULL
- && (part_die->tag == DW_TAG_class_type
- || part_die->tag == DW_TAG_interface_type
- || part_die->tag == DW_TAG_structure_type
- || part_die->tag == DW_TAG_union_type)
- && part_die->linkage_name != NULL)
+ else if (attr_form_is_ref (attr))
{
- char *demangled;
+ struct dwarf2_cu *target_cu = cu;
+ struct die_info *target_die;
+ struct attribute *target_attr;
- demangled = gdb_demangle (part_die->linkage_name, DMGL_TYPES);
- if (demangled)
- {
- const char *base;
+ target_die = follow_die_ref (die, attr, &target_cu);
+ target_attr = dwarf2_attr (target_die, DW_AT_location, target_cu);
+ if (target_attr == NULL)
+ target_attr = dwarf2_attr (target_die, DW_AT_data_member_location,
+ target_cu);
+ if (target_attr == NULL)
+ return 0;
- /* Strip any leading namespaces/classes, keep only the base name.
- DW_AT_name for named DIEs does not contain the prefixes. */
- base = strrchr (demangled, ':');
- if (base && base > demangled && base[-1] == ':')
- base++;
- else
- base = demangled;
+ switch (target_attr->name)
+ {
+ case DW_AT_location:
+ if (attr_form_is_section_offset (target_attr))
+ {
+ baton = XOBNEW (obstack, struct dwarf2_property_baton);
+ baton->referenced_type = die_type (target_die, target_cu);
+ fill_in_loclist_baton (cu, &baton->loclist, target_attr);
+ prop->data.baton = baton;
+ prop->kind = PROP_LOCLIST;
+ gdb_assert (prop->data.baton != NULL);
+ }
+ else if (attr_form_is_block (target_attr))
+ {
+ baton = XOBNEW (obstack, struct dwarf2_property_baton);
+ baton->referenced_type = die_type (target_die, target_cu);
+ baton->locexpr.per_cu = cu->per_cu;
+ baton->locexpr.size = DW_BLOCK (target_attr)->size;
+ baton->locexpr.data = DW_BLOCK (target_attr)->data;
+ prop->data.baton = baton;
+ prop->kind = PROP_LOCEXPR;
+ gdb_assert (prop->data.baton != NULL);
+ }
+ else
+ {
+ dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
+ "dynamic property");
+ return 0;
+ }
+ break;
+ case DW_AT_data_member_location:
+ {
+ LONGEST offset;
- part_die->name
- = ((const char *)
- obstack_copy0 (&cu->objfile->per_bfd->storage_obstack,
- base, strlen (base)));
- xfree (demangled);
+ if (!handle_data_member_location (target_die, target_cu,
+ &offset))
+ return 0;
+
+ baton = XOBNEW (obstack, struct dwarf2_property_baton);
+ baton->referenced_type = read_type_die (target_die->parent,
+ target_cu);
+ baton->offset_info.offset = offset;
+ baton->offset_info.type = die_type (target_die, target_cu);
+ prop->data.baton = baton;
+ prop->kind = PROP_ADDR_OFFSET;
+ break;
+ }
}
}
+ else if (attr_form_is_constant (attr))
+ {
+ prop->data.const_val = dwarf2_get_attr_constant_value (attr, 0);
+ prop->kind = PROP_CONST;
+ }
+ else
+ {
+ dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form),
+ dwarf2_name (die, cu));
+ return 0;
+ }
- part_die->fixup_called = 1;
+ return 1;
}
-/* Read an attribute value described by an attribute form. */
+/* Read the given DW_AT_subrange DIE. */
-static const gdb_byte *
-read_attribute_value (const struct die_reader_specs *reader,
- struct attribute *attr, unsigned form,
- LONGEST implicit_const, const gdb_byte *info_ptr)
+static struct type *
+read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
{
- struct dwarf2_cu *cu = reader->cu;
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- bfd *abfd = reader->abfd;
- struct comp_unit_head *cu_header = &cu->header;
- unsigned int bytes_read;
- struct dwarf_block *blk;
+ struct type *base_type, *orig_base_type;
+ struct type *range_type;
+ struct attribute *attr;
+ struct dynamic_prop low, high;
+ int low_default_is_valid;
+ int high_bound_is_count = 0;
+ const char *name;
+ LONGEST negative_mask;
- attr->form = (enum dwarf_form) form;
- switch (form)
+ orig_base_type = die_type (die, cu);
+ /* If ORIG_BASE_TYPE is a typedef, it will not be TYPE_UNSIGNED,
+ whereas the real type might be. So, we use ORIG_BASE_TYPE when
+ creating the range type, but we use the result of check_typedef
+ when examining properties of the type. */
+ base_type = check_typedef (orig_base_type);
+
+ /* The die_type call above may have already set the type for this DIE. */
+ range_type = get_die_type (die, cu);
+ if (range_type)
+ return range_type;
+
+ low.kind = PROP_CONST;
+ high.kind = PROP_CONST;
+ high.data.const_val = 0;
+
+ /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
+ omitting DW_AT_lower_bound. */
+ switch (cu->language)
{
- case DW_FORM_ref_addr:
- if (cu->header.version == 2)
- DW_UNSND (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
- else
- DW_UNSND (attr) = read_offset (abfd, info_ptr,
- &cu->header, &bytes_read);
- info_ptr += bytes_read;
- break;
- case DW_FORM_GNU_ref_alt:
- DW_UNSND (attr) = read_offset (abfd, info_ptr, &cu->header, &bytes_read);
- info_ptr += bytes_read;
- break;
- case DW_FORM_addr:
- DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
- DW_ADDR (attr) = gdbarch_adjust_dwarf2_addr (gdbarch, DW_ADDR (attr));
- info_ptr += bytes_read;
- break;
- case DW_FORM_block2:
- blk = dwarf_alloc_block (cu);
- 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:
- blk = dwarf_alloc_block (cu);
- 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;
+ case language_c:
+ case language_cplus:
+ low.data.const_val = 0;
+ low_default_is_valid = 1;
break;
- case DW_FORM_data8:
- DW_UNSND (attr) = read_8_bytes (abfd, info_ptr);
- info_ptr += 8;
+ case language_fortran:
+ low.data.const_val = 1;
+ low_default_is_valid = 1;
break;
- case DW_FORM_data16:
- blk = dwarf_alloc_block (cu);
- blk->size = 16;
- blk->data = read_n_bytes (abfd, info_ptr, 16);
- info_ptr += 16;
- DW_BLOCK (attr) = blk;
+ case language_d:
+ case language_objc:
+ case language_rust:
+ low.data.const_val = 0;
+ low_default_is_valid = (cu->header.version >= 4);
break;
- case DW_FORM_sec_offset:
- DW_UNSND (attr) = read_offset (abfd, info_ptr, &cu->header, &bytes_read);
- info_ptr += bytes_read;
+ case language_ada:
+ case language_m2:
+ case language_pascal:
+ low.data.const_val = 1;
+ low_default_is_valid = (cu->header.version >= 4);
break;
- case DW_FORM_string:
- DW_STRING (attr) = read_direct_string (abfd, info_ptr, &bytes_read);
- DW_STRING_IS_CANONICAL (attr) = 0;
- info_ptr += bytes_read;
+ default:
+ low.data.const_val = 0;
+ low_default_is_valid = 0;
break;
- case DW_FORM_strp:
- if (!cu->per_cu->is_dwz)
+ }
+
+ attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
+ if (attr)
+ attr_to_dynamic_prop (attr, die, cu, &low);
+ else if (!low_default_is_valid)
+ complaint (_("Missing DW_AT_lower_bound "
+ "- DIE at %s [in module %s]"),
+ sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+
+ attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
+ if (!attr_to_dynamic_prop (attr, die, cu, &high))
+ {
+ attr = dwarf2_attr (die, DW_AT_count, cu);
+ if (attr_to_dynamic_prop (attr, die, cu, &high))
{
- DW_STRING (attr) = read_indirect_string (abfd, info_ptr, cu_header,
- &bytes_read);
- DW_STRING_IS_CANONICAL (attr) = 0;
- info_ptr += bytes_read;
- break;
+ /* If bounds are constant do the final calculation here. */
+ if (low.kind == PROP_CONST && high.kind == PROP_CONST)
+ high.data.const_val = low.data.const_val + high.data.const_val - 1;
+ else
+ high_bound_is_count = 1;
}
- /* FALLTHROUGH */
- case DW_FORM_line_strp:
- if (!cu->per_cu->is_dwz)
+ }
+
+ /* Dwarf-2 specifications explicitly allows to create subrange types
+ without specifying a base type.
+ In that case, the base type must be set to the type of
+ the lower bound, upper bound or count, in that order, if any of these
+ three attributes references an object that has a type.
+ If no base type is found, the Dwarf-2 specifications say that
+ a signed integer type of size equal to the size of an address should
+ be used.
+ For the following C code: `extern char gdb_int [];'
+ GCC produces an empty range DIE.
+ FIXME: muller/2010-05-28: Possible references to object for low bound,
+ high bound or count are not yet handled by this code. */
+ if (TYPE_CODE (base_type) == TYPE_CODE_VOID)
+ {
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ int addr_size = gdbarch_addr_bit (gdbarch) /8;
+ struct type *int_type = objfile_type (objfile)->builtin_int;
+
+ /* Test "int", "long int", and "long long int" objfile types,
+ and select the first one having a size above or equal to the
+ architecture address size. */
+ if (int_type && TYPE_LENGTH (int_type) >= addr_size)
+ base_type = int_type;
+ else
{
- DW_STRING (attr) = read_indirect_line_string (abfd, info_ptr,
- cu_header, &bytes_read);
- DW_STRING_IS_CANONICAL (attr) = 0;
- info_ptr += bytes_read;
- break;
+ int_type = objfile_type (objfile)->builtin_long;
+ if (int_type && TYPE_LENGTH (int_type) >= addr_size)
+ base_type = int_type;
+ else
+ {
+ int_type = objfile_type (objfile)->builtin_long_long;
+ if (int_type && TYPE_LENGTH (int_type) >= addr_size)
+ base_type = int_type;
+ }
}
- /* FALLTHROUGH */
- case DW_FORM_GNU_strp_alt:
- {
- struct dwz_file *dwz = dwarf2_get_dwz_file ();
- LONGEST str_offset = read_offset (abfd, info_ptr, cu_header,
- &bytes_read);
+ }
- DW_STRING (attr) = read_indirect_string_from_dwz (dwz, str_offset);
- DW_STRING_IS_CANONICAL (attr) = 0;
- info_ptr += bytes_read;
- }
- break;
- case DW_FORM_exprloc:
- case DW_FORM_block:
- blk = dwarf_alloc_block (cu);
- 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:
- blk = dwarf_alloc_block (cu);
- 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_flag_present:
- DW_UNSND (attr) = 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) = (to_underlying (cu->header.sect_off)
- + read_1_byte (abfd, info_ptr));
- info_ptr += 1;
- break;
- case DW_FORM_ref2:
- DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
- + read_2_bytes (abfd, info_ptr));
- info_ptr += 2;
- break;
- case DW_FORM_ref4:
- DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
- + read_4_bytes (abfd, info_ptr));
- info_ptr += 4;
- break;
- case DW_FORM_ref8:
- DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
- + read_8_bytes (abfd, info_ptr));
- info_ptr += 8;
- break;
- case DW_FORM_ref_sig8:
- DW_SIGNATURE (attr) = read_8_bytes (abfd, info_ptr);
- info_ptr += 8;
- break;
- case DW_FORM_ref_udata:
- DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
- + read_unsigned_leb128 (abfd, info_ptr, &bytes_read));
- info_ptr += bytes_read;
- break;
- case DW_FORM_indirect:
- form = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
- info_ptr += bytes_read;
- if (form == DW_FORM_implicit_const)
- {
- implicit_const = read_signed_leb128 (abfd, info_ptr, &bytes_read);
- info_ptr += bytes_read;
- }
- info_ptr = read_attribute_value (reader, attr, form, implicit_const,
- info_ptr);
- break;
- case DW_FORM_implicit_const:
- DW_SND (attr) = implicit_const;
- break;
- case DW_FORM_GNU_addr_index:
- if (reader->dwo_file == NULL)
- {
- /* For now flag a hard error.
- Later we can turn this into a complaint. */
- error (_("Dwarf Error: %s found in non-DWO CU [in module %s]"),
- dwarf_form_name (form),
- bfd_get_filename (abfd));
- }
- DW_ADDR (attr) = read_addr_index_from_leb128 (cu, info_ptr, &bytes_read);
- info_ptr += bytes_read;
- break;
- case DW_FORM_GNU_str_index:
- if (reader->dwo_file == NULL)
- {
- /* For now flag a hard error.
- Later we can turn this into a complaint if warranted. */
- error (_("Dwarf Error: %s found in non-DWO CU [in module %s]"),
- dwarf_form_name (form),
- bfd_get_filename (abfd));
- }
- {
- ULONGEST str_index =
- read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+ /* Normally, the DWARF producers are expected to use a signed
+ constant form (Eg. DW_FORM_sdata) to express negative bounds.
+ But this is unfortunately not always the case, as witnessed
+ with GCC, for instance, where the ambiguous DW_FORM_dataN form
+ is used instead. To work around that ambiguity, we treat
+ the bounds as signed, and thus sign-extend their values, when
+ the base type is signed. */
+ negative_mask =
+ -((LONGEST) 1 << (TYPE_LENGTH (base_type) * TARGET_CHAR_BIT - 1));
+ if (low.kind == PROP_CONST
+ && !TYPE_UNSIGNED (base_type) && (low.data.const_val & negative_mask))
+ low.data.const_val |= negative_mask;
+ if (high.kind == PROP_CONST
+ && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
+ high.data.const_val |= negative_mask;
- DW_STRING (attr) = read_str_index (reader, str_index);
- DW_STRING_IS_CANONICAL (attr) = 0;
- info_ptr += bytes_read;
- }
- break;
- default:
- error (_("Dwarf Error: Cannot handle %s in DWARF reader [in module %s]"),
- dwarf_form_name (form),
- bfd_get_filename (abfd));
- }
+ range_type = create_range_type (NULL, orig_base_type, &low, &high);
- /* Super hack. */
- if (cu->per_cu->is_dwz && attr_form_is_ref (attr))
- attr->form = DW_FORM_GNU_ref_alt;
+ if (high_bound_is_count)
+ TYPE_RANGE_DATA (range_type)->flag_upper_bound_is_count = 1;
- /* We have seen instances where the compiler tried to emit a byte
- size attribute of -1 which ended up being encoded as an unsigned
- 0xffffffff. Although 0xffffffff is technically a valid size value,
- an object of this size seems pretty unlikely so we can relatively
- safely treat these cases as if the size attribute was invalid and
- treat them as zero by default. */
- if (attr->name == DW_AT_byte_size
- && form == DW_FORM_data4
- && DW_UNSND (attr) >= 0xffffffff)
- {
- complaint
- (&symfile_complaints,
- _("Suspicious DW_AT_byte_size value treated as zero instead of %s"),
- hex_string (DW_UNSND (attr)));
- DW_UNSND (attr) = 0;
- }
+ /* Ada expects an empty array on no boundary attributes. */
+ if (attr == NULL && cu->language != language_ada)
+ TYPE_HIGH_BOUND_KIND (range_type) = PROP_UNDEFINED;
- return info_ptr;
-}
+ name = dwarf2_name (die, cu);
+ if (name)
+ TYPE_NAME (range_type) = name;
-/* Read an attribute described by an abbreviated attribute. */
+ attr = dwarf2_attr (die, DW_AT_byte_size, cu);
+ if (attr)
+ TYPE_LENGTH (range_type) = DW_UNSND (attr);
-static const gdb_byte *
-read_attribute (const struct die_reader_specs *reader,
- struct attribute *attr, struct attr_abbrev *abbrev,
- const gdb_byte *info_ptr)
-{
- attr->name = abbrev->name;
- return read_attribute_value (reader, attr, abbrev->form,
- abbrev->implicit_const, info_ptr);
-}
+ maybe_set_alignment (cu, die, range_type);
-/* Read dwarf information from a buffer. */
+ set_die_type (die, range_type, cu);
-static unsigned int
-read_1_byte (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_8 (abfd, buf);
-}
+ /* set_die_type should be already done. */
+ set_descriptive_type (range_type, die, cu);
-static int
-read_1_signed_byte (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_signed_8 (abfd, buf);
+ return range_type;
}
-static unsigned int
-read_2_bytes (bfd *abfd, const gdb_byte *buf)
+static struct type *
+read_unspecified_type (struct die_info *die, struct dwarf2_cu *cu)
{
- return bfd_get_16 (abfd, buf);
-}
+ struct type *type;
-static int
-read_2_signed_bytes (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_signed_16 (abfd, buf);
-}
+ type = init_type (cu->per_cu->dwarf2_per_objfile->objfile, TYPE_CODE_VOID,0,
+ NULL);
+ TYPE_NAME (type) = dwarf2_name (die, cu);
-static unsigned int
-read_4_bytes (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_32 (abfd, buf);
-}
+ /* In Ada, an unspecified type is typically used when the description
+ of the type is defered to a different unit. When encountering
+ such a type, we treat it as a stub, and try to resolve it later on,
+ when needed. */
+ if (cu->language == language_ada)
+ TYPE_STUB (type) = 1;
-static int
-read_4_signed_bytes (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_signed_32 (abfd, buf);
+ return set_die_type (die, type, cu);
}
-static ULONGEST
-read_8_bytes (bfd *abfd, const gdb_byte *buf)
-{
- return bfd_get_64 (abfd, buf);
-}
+/* 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 CORE_ADDR
-read_address (bfd *abfd, const gdb_byte *buf, struct dwarf2_cu *cu,
- unsigned int *bytes_read)
+static struct die_info *
+read_die_and_children (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ const gdb_byte **new_info_ptr,
+ struct die_info *parent)
{
- struct comp_unit_head *cu_header = &cu->header;
- CORE_ADDR retval = 0;
+ struct die_info *die;
+ const gdb_byte *cur_ptr;
+ int has_children;
- if (cu_header->signed_addr_p)
+ cur_ptr = read_full_die_1 (reader, &die, info_ptr, &has_children, 0);
+ if (die == NULL)
{
- switch (cu_header->addr_size)
- {
- case 2:
- retval = bfd_get_signed_16 (abfd, buf);
- break;
- case 4:
- retval = bfd_get_signed_32 (abfd, buf);
- break;
- case 8:
- retval = bfd_get_signed_64 (abfd, buf);
- break;
- default:
- internal_error (__FILE__, __LINE__,
- _("read_address: bad switch, signed [in module %s]"),
- bfd_get_filename (abfd));
- }
- }
+ *new_info_ptr = cur_ptr;
+ return NULL;
+ }
+ store_in_ref_table (die, reader->cu);
+
+ if (has_children)
+ die->child = read_die_and_siblings_1 (reader, cur_ptr, new_info_ptr, die);
else
{
- switch (cu_header->addr_size)
- {
- case 2:
- retval = bfd_get_16 (abfd, buf);
- break;
- case 4:
- retval = bfd_get_32 (abfd, buf);
- break;
- case 8:
- retval = bfd_get_64 (abfd, buf);
- break;
- default:
- internal_error (__FILE__, __LINE__,
- _("read_address: bad switch, "
- "unsigned [in module %s]"),
- bfd_get_filename (abfd));
- }
+ die->child = NULL;
+ *new_info_ptr = cur_ptr;
}
- *bytes_read = cu_header->addr_size;
- return retval;
+ die->sibling = NULL;
+ die->parent = parent;
+ return die;
}
-/* Read the initial length from a section. The (draft) DWARF 3
- 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.
+/* 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. */
- 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.
+static struct die_info *
+read_die_and_siblings_1 (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ const gdb_byte **new_info_ptr,
+ struct die_info *parent)
+{
+ struct die_info *first_die, *last_sibling;
+ const gdb_byte *cur_ptr;
- The value returned via bytes_read should be used to increment the
- relevant pointer after calling read_initial_length().
+ cur_ptr = info_ptr;
+ first_die = last_sibling = NULL;
- [ Note: read_initial_length() and read_offset() are based on the
- document entitled "DWARF Debugging Information Format", revision
- 3, draft 8, dated November 19, 2001. This document was obtained
- from:
+ while (1)
+ {
+ struct die_info *die
+ = read_die_and_children (reader, cur_ptr, &cur_ptr, parent);
- http://reality.sgiweb.org/davea/dwarf3-draft8-011125.pdf
+ if (die == NULL)
+ {
+ *new_info_ptr = cur_ptr;
+ return first_die;
+ }
- This document is only a draft and is subject to change. (So beware.)
+ if (!first_die)
+ first_die = die;
+ else
+ last_sibling->sibling = die;
- 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.
+ last_sibling = die;
+ }
+}
- - Kevin, July 16, 2002
- ] */
+/* 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.
+ This the main entry point for reading a DIE and all its children. */
-static LONGEST
-read_initial_length (bfd *abfd, const gdb_byte *buf, unsigned int *bytes_read)
+static struct die_info *
+read_die_and_siblings (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ const gdb_byte **new_info_ptr,
+ struct die_info *parent)
{
- LONGEST length = bfd_get_32 (abfd, buf);
+ struct die_info *die = read_die_and_siblings_1 (reader, info_ptr,
+ new_info_ptr, parent);
- if (length == 0xffffffff)
- {
- length = bfd_get_64 (abfd, buf + 4);
- *bytes_read = 12;
- }
- else if (length == 0)
- {
- /* Handle the (non-standard) 64-bit DWARF2 format used by IRIX. */
- length = bfd_get_64 (abfd, buf);
- *bytes_read = 8;
- }
- else
+ if (dwarf_die_debug)
{
- *bytes_read = 4;
+ fprintf_unfiltered (gdb_stdlog,
+ "Read die from %s@0x%x of %s:\n",
+ get_section_name (reader->die_section),
+ (unsigned) (info_ptr - reader->die_section->buffer),
+ bfd_get_filename (reader->abfd));
+ dump_die (die, dwarf_die_debug);
}
- return length;
+ return die;
}
-/* Cover function for read_initial_length.
- Returns the length of the object at BUF, and stores the size of the
- initial length in *BYTES_READ and stores the size that offsets will be in
- *OFFSET_SIZE.
- If the initial length size is not equivalent to that specified in
- CU_HEADER then issue a complaint.
- This is useful when reading non-comp-unit headers. */
+/* Read a die and all its attributes, leave space for NUM_EXTRA_ATTRS
+ attributes.
+ The caller is responsible for filling in the extra attributes
+ and updating (*DIEP)->num_attrs.
+ 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. */
-static LONGEST
-read_checked_initial_length_and_offset (bfd *abfd, const gdb_byte *buf,
- const struct comp_unit_head *cu_header,
- unsigned int *bytes_read,
- unsigned int *offset_size)
+static const gdb_byte *
+read_full_die_1 (const struct die_reader_specs *reader,
+ struct die_info **diep, const gdb_byte *info_ptr,
+ int *has_children, int num_extra_attrs)
{
- LONGEST length = read_initial_length (abfd, buf, bytes_read);
+ unsigned int abbrev_number, bytes_read, i;
+ struct abbrev_info *abbrev;
+ struct die_info *die;
+ struct dwarf2_cu *cu = reader->cu;
+ bfd *abfd = reader->abfd;
- gdb_assert (cu_header->initial_length_size == 4
- || cu_header->initial_length_size == 8
- || cu_header->initial_length_size == 12);
+ sect_offset sect_off = (sect_offset) (info_ptr - reader->buffer);
+ abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+ info_ptr += bytes_read;
+ if (!abbrev_number)
+ {
+ *diep = NULL;
+ *has_children = 0;
+ return info_ptr;
+ }
- if (cu_header->initial_length_size != *bytes_read)
- complaint (&symfile_complaints,
- _("intermixed 32-bit and 64-bit DWARF sections"));
+ abbrev = reader->abbrev_table->lookup_abbrev (abbrev_number);
+ if (!abbrev)
+ error (_("Dwarf Error: could not find abbrev number %d [in module %s]"),
+ abbrev_number,
+ bfd_get_filename (abfd));
- *offset_size = (*bytes_read == 4) ? 4 : 8;
- return length;
-}
+ die = dwarf_alloc_die (cu, abbrev->num_attrs + num_extra_attrs);
+ die->sect_off = sect_off;
+ die->tag = abbrev->tag;
+ die->abbrev = abbrev_number;
-/* Read an offset from the data stream. The size of the offset is
- given by cu_header->offset_size. */
+ /* Make the result usable.
+ The caller needs to update num_attrs after adding the extra
+ attributes. */
+ die->num_attrs = abbrev->num_attrs;
-static LONGEST
-read_offset (bfd *abfd, const gdb_byte *buf,
- const struct comp_unit_head *cu_header,
- unsigned int *bytes_read)
-{
- LONGEST offset = read_offset_1 (abfd, buf, cu_header->offset_size);
+ for (i = 0; i < abbrev->num_attrs; ++i)
+ info_ptr = read_attribute (reader, &die->attrs[i], &abbrev->attrs[i],
+ info_ptr);
- *bytes_read = cu_header->offset_size;
- return offset;
+ *diep = die;
+ *has_children = abbrev->has_children;
+ return info_ptr;
}
-/* Read an offset from the data stream. */
+/* Read a die and all its attributes.
+ 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. */
-static LONGEST
-read_offset_1 (bfd *abfd, const gdb_byte *buf, unsigned int offset_size)
+static const gdb_byte *
+read_full_die (const struct die_reader_specs *reader,
+ struct die_info **diep, const gdb_byte *info_ptr,
+ int *has_children)
{
- LONGEST retval = 0;
+ const gdb_byte *result;
- switch (offset_size)
+ result = read_full_die_1 (reader, diep, info_ptr, has_children, 0);
+
+ if (dwarf_die_debug)
{
- case 4:
- retval = bfd_get_32 (abfd, buf);
- break;
- case 8:
- retval = bfd_get_64 (abfd, buf);
- break;
- default:
- internal_error (__FILE__, __LINE__,
- _("read_offset_1: bad switch [in module %s]"),
- bfd_get_filename (abfd));
+ fprintf_unfiltered (gdb_stdlog,
+ "Read die from %s@0x%x of %s:\n",
+ get_section_name (reader->die_section),
+ (unsigned) (info_ptr - reader->die_section->buffer),
+ bfd_get_filename (reader->abfd));
+ dump_die (*diep, dwarf_die_debug);
}
- return retval;
+ return result;
}
+\f
+/* Abbreviation tables.
-static const gdb_byte *
-read_n_bytes (bfd *abfd, const gdb_byte *buf, unsigned int size)
+ 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
+ in a hash table. */
+
+/* Allocate space for a struct abbrev_info object in ABBREV_TABLE. */
+
+struct abbrev_info *
+abbrev_table::alloc_abbrev ()
{
- /* 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. */
- gdb_assert (HOST_CHAR_BIT == 8);
- return buf;
+ struct abbrev_info *abbrev;
+
+ abbrev = XOBNEW (&abbrev_obstack, struct abbrev_info);
+ memset (abbrev, 0, sizeof (struct abbrev_info));
+
+ return abbrev;
}
-static const char *
-read_direct_string (bfd *abfd, const gdb_byte *buf,
- unsigned int *bytes_read_ptr)
-{
- /* 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. */
- gdb_assert (HOST_CHAR_BIT == 8);
- if (*buf == '\0')
- {
- *bytes_read_ptr = 1;
- return NULL;
- }
- *bytes_read_ptr = strlen ((const char *) buf) + 1;
- return (const char *) buf;
-}
-
-/* Return pointer to string at section SECT offset STR_OFFSET with error
- reporting strings FORM_NAME and SECT_NAME. */
+/* Add an abbreviation to the table. */
-static const char *
-read_indirect_string_at_offset_from (bfd *abfd, LONGEST str_offset,
- struct dwarf2_section_info *sect,
- const char *form_name,
- const char *sect_name)
+void
+abbrev_table::add_abbrev (unsigned int abbrev_number,
+ struct abbrev_info *abbrev)
{
- dwarf2_read_section (dwarf2_per_objfile->objfile, sect);
- if (sect->buffer == NULL)
- error (_("%s used without %s section [in module %s]"),
- form_name, sect_name, bfd_get_filename (abfd));
- if (str_offset >= sect->size)
- error (_("%s pointing outside of %s section [in module %s]"),
- form_name, sect_name, bfd_get_filename (abfd));
- gdb_assert (HOST_CHAR_BIT == 8);
- if (sect->buffer[str_offset] == '\0')
- return NULL;
- return (const char *) (sect->buffer + str_offset);
+ unsigned int hash_number;
+
+ hash_number = abbrev_number % ABBREV_HASH_SIZE;
+ abbrev->next = m_abbrevs[hash_number];
+ m_abbrevs[hash_number] = abbrev;
}
-/* Return pointer to string at .debug_str offset STR_OFFSET. */
+/* Look up an abbrev in the table.
+ Returns NULL if the abbrev is not found. */
-static const char *
-read_indirect_string_at_offset (bfd *abfd, LONGEST str_offset)
+struct abbrev_info *
+abbrev_table::lookup_abbrev (unsigned int abbrev_number)
{
- return read_indirect_string_at_offset_from (abfd, str_offset,
- &dwarf2_per_objfile->str,
- "DW_FORM_strp", ".debug_str");
-}
+ unsigned int hash_number;
+ struct abbrev_info *abbrev;
-/* Return pointer to string at .debug_line_str offset STR_OFFSET. */
+ hash_number = abbrev_number % ABBREV_HASH_SIZE;
+ abbrev = m_abbrevs[hash_number];
-static const char *
-read_indirect_line_string_at_offset (bfd *abfd, LONGEST str_offset)
-{
- return read_indirect_string_at_offset_from (abfd, str_offset,
- &dwarf2_per_objfile->line_str,
- "DW_FORM_line_strp",
- ".debug_line_str");
+ while (abbrev)
+ {
+ if (abbrev->number == abbrev_number)
+ return abbrev;
+ abbrev = abbrev->next;
+ }
+ return NULL;
}
-/* Read a string at offset STR_OFFSET in the .debug_str section from
- the .dwz file DWZ. Throw an error if the offset is too large. If
- the string consists of a single NUL byte, return NULL; otherwise
- return a pointer to the string. */
+/* Read in an abbrev table. */
-static const char *
-read_indirect_string_from_dwz (struct dwz_file *dwz, LONGEST str_offset)
+static abbrev_table_up
+abbrev_table_read_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ struct dwarf2_section_info *section,
+ sect_offset sect_off)
{
- dwarf2_read_section (dwarf2_per_objfile->objfile, &dwz->str);
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *abfd = get_section_bfd_owner (section);
+ const gdb_byte *abbrev_ptr;
+ struct abbrev_info *cur_abbrev;
+ unsigned int abbrev_number, bytes_read, abbrev_name;
+ unsigned int abbrev_form;
+ struct attr_abbrev *cur_attrs;
+ unsigned int allocated_attrs;
- if (dwz->str.buffer == NULL)
- error (_("DW_FORM_GNU_strp_alt used without .debug_str "
- "section [in module %s]"),
- bfd_get_filename (dwz->dwz_bfd));
- if (str_offset >= dwz->str.size)
- error (_("DW_FORM_GNU_strp_alt pointing outside of "
- ".debug_str section [in module %s]"),
- bfd_get_filename (dwz->dwz_bfd));
- gdb_assert (HOST_CHAR_BIT == 8);
- if (dwz->str.buffer[str_offset] == '\0')
- return NULL;
- return (const char *) (dwz->str.buffer + str_offset);
-}
+ abbrev_table_up abbrev_table (new struct abbrev_table (sect_off));
-/* Return pointer to string at .debug_str offset as read from BUF.
- BUF is assumed to be in a compilation unit described by CU_HEADER.
- Return *BYTES_READ_PTR count of bytes read from BUF. */
+ dwarf2_read_section (objfile, section);
+ abbrev_ptr = section->buffer + to_underlying (sect_off);
+ abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+ abbrev_ptr += bytes_read;
-static const char *
-read_indirect_string (bfd *abfd, const gdb_byte *buf,
- const struct comp_unit_head *cu_header,
- unsigned int *bytes_read_ptr)
-{
- LONGEST str_offset = read_offset (abfd, buf, cu_header, bytes_read_ptr);
+ allocated_attrs = ATTR_ALLOC_CHUNK;
+ cur_attrs = XNEWVEC (struct attr_abbrev, allocated_attrs);
- return read_indirect_string_at_offset (abfd, str_offset);
-}
+ /* Loop until we reach an abbrev number of 0. */
+ while (abbrev_number)
+ {
+ cur_abbrev = abbrev_table->alloc_abbrev ();
-/* Return pointer to string at .debug_line_str offset as read from BUF.
- BUF is assumed to be in a compilation unit described by CU_HEADER.
- Return *BYTES_READ_PTR count of bytes read from BUF. */
+ /* read in abbrev header */
+ cur_abbrev->number = abbrev_number;
+ cur_abbrev->tag
+ = (enum dwarf_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;
-static const char *
-read_indirect_line_string (bfd *abfd, const gdb_byte *buf,
- const struct comp_unit_head *cu_header,
- unsigned int *bytes_read_ptr)
-{
- LONGEST str_offset = read_offset (abfd, buf, cu_header, bytes_read_ptr);
+ /* now read in declarations */
+ for (;;)
+ {
+ LONGEST implicit_const;
- return read_indirect_line_string_at_offset (abfd, str_offset);
-}
+ 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;
+ if (abbrev_form == DW_FORM_implicit_const)
+ {
+ implicit_const = read_signed_leb128 (abfd, abbrev_ptr,
+ &bytes_read);
+ abbrev_ptr += bytes_read;
+ }
+ else
+ {
+ /* Initialize it due to a false compiler warning. */
+ implicit_const = -1;
+ }
-ULONGEST
-read_unsigned_leb128 (bfd *abfd, const gdb_byte *buf,
- unsigned int *bytes_read_ptr)
-{
- ULONGEST result;
- unsigned int num_read;
- int shift;
- unsigned char byte;
+ if (abbrev_name == 0)
+ break;
- result = 0;
- shift = 0;
- num_read = 0;
- while (1)
- {
- byte = bfd_get_8 (abfd, buf);
- buf++;
- num_read++;
- result |= ((ULONGEST) (byte & 127) << shift);
- if ((byte & 128) == 0)
- {
- break;
+ if (cur_abbrev->num_attrs == allocated_attrs)
+ {
+ allocated_attrs += ATTR_ALLOC_CHUNK;
+ cur_attrs
+ = XRESIZEVEC (struct attr_abbrev, cur_attrs, allocated_attrs);
+ }
+
+ cur_attrs[cur_abbrev->num_attrs].name
+ = (enum dwarf_attribute) abbrev_name;
+ cur_attrs[cur_abbrev->num_attrs].form
+ = (enum dwarf_form) abbrev_form;
+ cur_attrs[cur_abbrev->num_attrs].implicit_const = implicit_const;
+ ++cur_abbrev->num_attrs;
}
- shift += 7;
+
+ cur_abbrev->attrs =
+ XOBNEWVEC (&abbrev_table->abbrev_obstack, struct attr_abbrev,
+ cur_abbrev->num_attrs);
+ memcpy (cur_abbrev->attrs, cur_attrs,
+ cur_abbrev->num_attrs * sizeof (struct attr_abbrev));
+
+ abbrev_table->add_abbrev (abbrev_number, cur_abbrev);
+
+ /* Get next abbreviation.
+ Under Irix6 the abbreviations for a compilation unit are not
+ 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. */
+ if ((unsigned int) (abbrev_ptr - section->buffer) >= section->size)
+ break;
+ abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+ abbrev_ptr += bytes_read;
+ if (abbrev_table->lookup_abbrev (abbrev_number) != NULL)
+ break;
}
- *bytes_read_ptr = num_read;
- return result;
+
+ xfree (cur_attrs);
+ return abbrev_table;
}
-static LONGEST
-read_signed_leb128 (bfd *abfd, const gdb_byte *buf,
- unsigned int *bytes_read_ptr)
-{
- LONGEST result;
- int shift, num_read;
- unsigned char byte;
+/* Returns nonzero if TAG represents a type that we might generate a partial
+ symbol for. */
- result = 0;
- shift = 0;
- num_read = 0;
- while (1)
+static int
+is_type_tag_for_partial (int tag)
+{
+ switch (tag)
{
- byte = bfd_get_8 (abfd, buf);
- buf++;
- num_read++;
- result |= ((LONGEST) (byte & 127) << shift);
- shift += 7;
- if ((byte & 128) == 0)
- {
- break;
- }
+#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_interface_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;
}
- if ((shift < 8 * sizeof (result)) && (byte & 0x40))
- result |= -(((LONGEST) 1) << shift);
- *bytes_read_ptr = num_read;
- return result;
}
-/* Given index ADDR_INDEX in .debug_addr, fetch the value.
- ADDR_BASE is the DW_AT_GNU_addr_base attribute or zero.
- ADDR_SIZE is the size of addresses from the CU header. */
+/* Load all DIEs that are interesting for partial symbols into memory. */
-static CORE_ADDR
-read_addr_index_1 (unsigned int addr_index, ULONGEST addr_base, int addr_size)
+static struct partial_die_info *
+load_partial_dies (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr, int building_psymtab)
{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- bfd *abfd = objfile->obfd;
- const gdb_byte *info_ptr;
+ struct dwarf2_cu *cu = reader->cu;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct partial_die_info *parent_die, *last_die, *first_die = NULL;
+ unsigned int bytes_read;
+ unsigned int load_all = 0;
+ int nesting_level = 1;
- dwarf2_read_section (objfile, &dwarf2_per_objfile->addr);
- if (dwarf2_per_objfile->addr.buffer == NULL)
- error (_("DW_FORM_addr_index used without .debug_addr section [in module %s]"),
- objfile_name (objfile));
- if (addr_base + addr_index * addr_size >= dwarf2_per_objfile->addr.size)
- error (_("DW_FORM_addr_index pointing outside of "
- ".debug_addr section [in module %s]"),
- objfile_name (objfile));
- info_ptr = (dwarf2_per_objfile->addr.buffer
- + addr_base + addr_index * addr_size);
- if (addr_size == 4)
- return bfd_get_32 (abfd, info_ptr);
- else
- return bfd_get_64 (abfd, info_ptr);
-}
+ parent_die = NULL;
+ last_die = NULL;
-/* Given index ADDR_INDEX in .debug_addr, fetch the value. */
+ gdb_assert (cu->per_cu != NULL);
+ if (cu->per_cu->load_all_dies)
+ load_all = 1;
-static CORE_ADDR
-read_addr_index (struct dwarf2_cu *cu, unsigned int addr_index)
-{
- return read_addr_index_1 (addr_index, cu->addr_base, cu->header.addr_size);
-}
+ 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);
-/* Given a pointer to an leb128 value, fetch the value from .debug_addr. */
+ while (1)
+ {
+ abbrev_info *abbrev = peek_die_abbrev (*reader, info_ptr, &bytes_read);
-static CORE_ADDR
-read_addr_index_from_leb128 (struct dwarf2_cu *cu, const gdb_byte *info_ptr,
- unsigned int *bytes_read)
-{
- bfd *abfd = cu->objfile->obfd;
- unsigned int addr_index = read_unsigned_leb128 (abfd, info_ptr, bytes_read);
+ /* A NULL abbrev means the end of a series of children. */
+ if (abbrev == NULL)
+ {
+ if (--nesting_level == 0)
+ return first_die;
- return read_addr_index (cu, addr_index);
-}
+ info_ptr += bytes_read;
+ last_die = parent_die;
+ parent_die = parent_die->die_parent;
+ continue;
+ }
-/* Data structure to pass results from dwarf2_read_addr_index_reader
- back to dwarf2_read_addr_index. */
+ /* Check for template arguments. We never save these; if
+ they're seen, we just mark the parent, and go on our way. */
+ if (parent_die != NULL
+ && cu->language == language_cplus
+ && (abbrev->tag == DW_TAG_template_type_param
+ || abbrev->tag == DW_TAG_template_value_param))
+ {
+ parent_die->has_template_arguments = 1;
-struct dwarf2_read_addr_index_data
-{
- ULONGEST addr_base;
- int addr_size;
-};
+ if (!load_all)
+ {
+ /* We don't need a partial DIE for the template argument. */
+ info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
+ continue;
+ }
+ }
-/* die_reader_func for dwarf2_read_addr_index. */
+ /* We only recurse into c++ subprograms looking for template arguments.
+ Skip their other children. */
+ if (!load_all
+ && cu->language == language_cplus
+ && parent_die != NULL
+ && parent_die->tag == DW_TAG_subprogram)
+ {
+ info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
+ continue;
+ }
-static void
-dwarf2_read_addr_index_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *data)
-{
- struct dwarf2_cu *cu = reader->cu;
- struct dwarf2_read_addr_index_data *aidata =
- (struct dwarf2_read_addr_index_data *) data;
+ /* Check whether this DIE is interesting enough to save. Normally
+ we would not be interested in members here, but there may be
+ later variables referencing them via DW_AT_specification (for
+ static members). */
+ if (!load_all
+ && !is_type_tag_for_partial (abbrev->tag)
+ && abbrev->tag != DW_TAG_constant
+ && abbrev->tag != DW_TAG_enumerator
+ && abbrev->tag != DW_TAG_subprogram
+ && abbrev->tag != DW_TAG_inlined_subroutine
+ && abbrev->tag != DW_TAG_lexical_block
+ && abbrev->tag != DW_TAG_variable
+ && abbrev->tag != DW_TAG_namespace
+ && abbrev->tag != DW_TAG_module
+ && abbrev->tag != DW_TAG_member
+ && abbrev->tag != DW_TAG_imported_unit
+ && abbrev->tag != DW_TAG_imported_declaration)
+ {
+ /* Otherwise we skip to the next sibling, if any. */
+ info_ptr = skip_one_die (reader, info_ptr + bytes_read, abbrev);
+ continue;
+ }
- aidata->addr_base = cu->addr_base;
- aidata->addr_size = cu->header.addr_size;
-}
+ struct partial_die_info pdi ((sect_offset) (info_ptr - reader->buffer),
+ abbrev);
-/* Given an index in .debug_addr, fetch the value.
- NOTE: This can be called during dwarf expression evaluation,
- long after the debug information has been read, and thus per_cu->cu
- may no longer exist. */
+ info_ptr = pdi.read (reader, *abbrev, info_ptr + bytes_read);
-CORE_ADDR
-dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu,
- unsigned int addr_index)
-{
- struct objfile *objfile = per_cu->objfile;
- struct dwarf2_cu *cu = per_cu->cu;
- ULONGEST addr_base;
- int addr_size;
+ /* 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 is intended to be called from outside this file. */
- dw2_setup (objfile);
+ 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. */
- /* We need addr_base and addr_size.
- If we don't have PER_CU->cu, we have to get it.
- Nasty, but the alternative is storing the needed info in PER_CU,
- which at this point doesn't seem justified: it's not clear how frequently
- it would get used and it would increase the size of every PER_CU.
- Entry points like dwarf2_per_cu_addr_size do a similar thing
- so we're not in uncharted territory here.
- Alas we need to be a bit more complicated as addr_base is contained
- in the DIE.
+ /* 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
+ && pdi.has_specification == 0
+ && pdi.is_declaration == 0
+ && ((pdi.tag == DW_TAG_typedef && !pdi.has_children)
+ || pdi.tag == DW_TAG_base_type
+ || pdi.tag == DW_TAG_subrange_type))
+ {
+ if (building_psymtab && pdi.name != NULL)
+ add_psymbol_to_list (pdi.name, strlen (pdi.name), 0,
+ VAR_DOMAIN, LOC_TYPEDEF,
+ &objfile->static_psymbols,
+ 0, cu->language, objfile);
+ info_ptr = locate_pdi_sibling (reader, &pdi, info_ptr);
+ continue;
+ }
- We don't need to read the entire CU(/TU).
- We just need the header and top level die.
+ /* The exception for DW_TAG_typedef with has_children above is
+ a workaround of GCC PR debug/47510. In the case of this complaint
+ type_name_or_error will error on such types later.
- IWBN to use the aging mechanism to let us lazily later discard the CU.
- For now we skip this optimization. */
+ GDB skipped children of DW_TAG_typedef by the shortcut above and then
+ it could not find the child DIEs referenced later, this is checked
+ above. In correct DWARF DW_TAG_typedef should have no children. */
- if (cu != NULL)
- {
- addr_base = cu->addr_base;
- addr_size = cu->header.addr_size;
- }
- else
- {
- struct dwarf2_read_addr_index_data aidata;
+ if (pdi.tag == DW_TAG_typedef && pdi.has_children)
+ complaint (_("DW_TAG_typedef has childen - GCC PR debug/47510 bug "
+ "- DIE at %s [in module %s]"),
+ sect_offset_str (pdi.sect_off), objfile_name (objfile));
- /* Note: We can't use init_cutu_and_read_dies_simple here,
- we need addr_base. */
- init_cutu_and_read_dies (per_cu, NULL, 0, 0,
- dwarf2_read_addr_index_reader, &aidata);
- addr_base = aidata.addr_base;
- addr_size = aidata.addr_size;
- }
+ /* 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 (pdi.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 (pdi.name == NULL)
+ complaint (_("malformed enumerator DIE ignored"));
+ else if (building_psymtab)
+ add_psymbol_to_list (pdi.name, strlen (pdi.name), 0,
+ VAR_DOMAIN, LOC_CONST,
+ cu->language == language_cplus
+ ? &objfile->global_psymbols
+ : &objfile->static_psymbols,
+ 0, cu->language, objfile);
- return read_addr_index_1 (addr_index, addr_base, addr_size);
-}
+ info_ptr = locate_pdi_sibling (reader, &pdi, info_ptr);
+ continue;
+ }
-/* Given a DW_FORM_GNU_str_index, fetch the string.
- This is only used by the Fission support. */
+ struct partial_die_info *part_die
+ = new (&cu->comp_unit_obstack) partial_die_info (pdi);
-static const char *
-read_str_index (const struct die_reader_specs *reader, ULONGEST str_index)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- const char *objf_name = objfile_name (objfile);
- bfd *abfd = objfile->obfd;
- struct dwarf2_cu *cu = reader->cu;
- struct dwarf2_section_info *str_section = &reader->dwo_file->sections.str;
- struct dwarf2_section_info *str_offsets_section =
- &reader->dwo_file->sections.str_offsets;
- const gdb_byte *info_ptr;
- ULONGEST str_offset;
- static const char form_name[] = "DW_FORM_GNU_str_index";
+ /* 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;
- dwarf2_read_section (objfile, str_section);
- dwarf2_read_section (objfile, str_offsets_section);
- if (str_section->buffer == NULL)
- error (_("%s used without .debug_str.dwo section"
- " in CU at offset 0x%x [in module %s]"),
- form_name, to_underlying (cu->header.sect_off), objf_name);
- if (str_offsets_section->buffer == NULL)
- error (_("%s used without .debug_str_offsets.dwo section"
- " in CU at offset 0x%x [in module %s]"),
- form_name, to_underlying (cu->header.sect_off), objf_name);
- if (str_index * cu->header.offset_size >= str_offsets_section->size)
- error (_("%s pointing outside of .debug_str_offsets.dwo"
- " section in CU at offset 0x%x [in module %s]"),
- form_name, to_underlying (cu->header.sect_off), objf_name);
- info_ptr = (str_offsets_section->buffer
- + str_index * cu->header.offset_size);
- if (cu->header.offset_size == 4)
- str_offset = bfd_get_32 (abfd, info_ptr);
- else
- str_offset = bfd_get_64 (abfd, info_ptr);
- if (str_offset >= str_section->size)
- error (_("Offset from %s pointing outside of"
- " .debug_str.dwo section in CU at offset 0x%x [in module %s]"),
- form_name, to_underlying (cu->header.sect_off), objf_name);
- return (const char *) (str_section->buffer + str_offset);
-}
+ if (last_die && last_die == parent_die)
+ last_die->die_child = part_die;
+ else if (last_die)
+ last_die->die_sibling = part_die;
-/* Return the length of an LEB128 number in BUF. */
+ last_die = part_die;
-static int
-leb128_size (const gdb_byte *buf)
-{
- const gdb_byte *begin = buf;
- gdb_byte byte;
+ if (first_die == NULL)
+ first_die = part_die;
- while (1)
- {
- byte = *buf++;
- if ((byte & 128) == 0)
- return buf - begin;
- }
-}
+ /* 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.
-static void
-set_cu_language (unsigned int lang, struct dwarf2_cu *cu)
-{
- switch (lang)
- {
- case DW_LANG_C89:
- case DW_LANG_C99:
- case DW_LANG_C11:
- case DW_LANG_C:
- case DW_LANG_UPC:
- cu->language = language_c;
- break;
- case DW_LANG_Java:
- case DW_LANG_C_plus_plus:
- case DW_LANG_C_plus_plus_11:
- case DW_LANG_C_plus_plus_14:
- cu->language = language_cplus;
- break;
- case DW_LANG_D:
- cu->language = language_d;
- break;
- case DW_LANG_Fortran77:
- case DW_LANG_Fortran90:
- case DW_LANG_Fortran95:
- case DW_LANG_Fortran03:
- case DW_LANG_Fortran08:
- cu->language = language_fortran;
- break;
- case DW_LANG_Go:
- cu->language = language_go;
- break;
- case DW_LANG_Mips_Assembler:
- cu->language = language_asm;
- break;
- case DW_LANG_Ada83:
- case DW_LANG_Ada95:
- cu->language = language_ada;
- break;
- case DW_LANG_Modula2:
- cu->language = language_m2;
- break;
- case DW_LANG_Pascal83:
- cu->language = language_pascal;
- break;
- case DW_LANG_ObjC:
- cu->language = language_objc;
- break;
- case DW_LANG_Rust:
- case DW_LANG_Rust_old:
- cu->language = language_rust;
- break;
- case DW_LANG_Cobol74:
- case DW_LANG_Cobol85:
- default:
- cu->language = language_minimal;
- break;
- }
- cu->language_defn = language_def (cu->language);
-}
+ 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.
-/* Return the named attribute or NULL if not there. */
+ Adding more things than necessary to the hash table is harmless
+ except for the performance cost. Adding too few will result in
+ wasted time in find_partial_die, when we reread the compilation
+ unit with load_all_dies set. */
-static struct attribute *
-dwarf2_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu)
-{
- for (;;)
- {
- unsigned int i;
- struct attribute *spec = NULL;
+ if (load_all
+ || abbrev->tag == DW_TAG_constant
+ || abbrev->tag == DW_TAG_subprogram
+ || abbrev->tag == DW_TAG_variable
+ || abbrev->tag == DW_TAG_namespace
+ || part_die->is_declaration)
+ {
+ void **slot;
- for (i = 0; i < die->num_attrs; ++i)
+ slot = htab_find_slot_with_hash (cu->partial_dies, part_die,
+ to_underlying (part_die->sect_off),
+ INSERT);
+ *slot = part_die;
+ }
+
+ /* 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, so that we can get at method physnames
+ to infer fully qualified class names, for DW_AT_specification,
+ and for C++ template arguments. For C++, we also look one level
+ inside functions to find template arguments (if the name of the
+ function does not already contain the template arguments).
+
+ For Ada, we need to scan the children of subprograms and lexical
+ blocks as well because Ada allows the definition of nested
+ entities that could be interesting for the debugger, such as
+ nested subprograms for instance. */
+ if (last_die->has_children
+ && (load_all
+ || last_die->tag == DW_TAG_namespace
+ || last_die->tag == DW_TAG_module
+ || last_die->tag == DW_TAG_enumeration_type
+ || (cu->language == language_cplus
+ && last_die->tag == DW_TAG_subprogram
+ && (last_die->name == NULL
+ || strchr (last_die->name, '<') == NULL))
+ || (cu->language != language_c
+ && (last_die->tag == DW_TAG_class_type
+ || last_die->tag == DW_TAG_interface_type
+ || last_die->tag == DW_TAG_structure_type
+ || last_die->tag == DW_TAG_union_type))
+ || (cu->language == language_ada
+ && (last_die->tag == DW_TAG_subprogram
+ || last_die->tag == DW_TAG_lexical_block))))
{
- 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];
+ nesting_level++;
+ parent_die = last_die;
+ continue;
}
- if (!spec)
- break;
+ /* Otherwise we skip to the next sibling, if any. */
+ info_ptr = locate_pdi_sibling (reader, last_die, info_ptr);
- die = follow_die_ref (die, spec, &cu);
+ /* Back to the top, do it again. */
}
-
- return NULL;
}
-/* Return the named attribute or NULL if not there,
- but do not follow DW_AT_specification, etc.
- This is for use in contexts where we're reading .debug_types dies.
- Following DW_AT_specification, DW_AT_abstract_origin will take us
- back up the chain, and we want to go down. */
-
-static struct attribute *
-dwarf2_attr_no_follow (struct die_info *die, unsigned int name)
+partial_die_info::partial_die_info (sect_offset sect_off_,
+ struct abbrev_info *abbrev)
+ : partial_die_info (sect_off_, abbrev->tag, abbrev->has_children)
{
- unsigned int i;
-
- for (i = 0; i < die->num_attrs; ++i)
- if (die->attrs[i].name == name)
- return &die->attrs[i];
-
- return NULL;
}
-/* Return the string associated with a string-typed attribute, or NULL if it
- is either not found or is of an incorrect type. */
+/* Read a minimal amount of information into the minimal die structure.
+ INFO_PTR should point just after the initial uleb128 of a DIE. */
-static const char *
-dwarf2_string_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu)
+const gdb_byte *
+partial_die_info::read (const struct die_reader_specs *reader,
+ const struct abbrev_info &abbrev, const gdb_byte *info_ptr)
{
- struct attribute *attr;
- const char *str = NULL;
-
- attr = dwarf2_attr (die, name, cu);
+ struct dwarf2_cu *cu = reader->cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ unsigned int i;
+ int has_low_pc_attr = 0;
+ int has_high_pc_attr = 0;
+ int high_pc_relative = 0;
- if (attr != NULL)
+ for (i = 0; i < abbrev.num_attrs; ++i)
{
- if (attr->form == DW_FORM_strp || attr->form == DW_FORM_line_strp
- || attr->form == DW_FORM_string
- || attr->form == DW_FORM_GNU_str_index
- || attr->form == DW_FORM_GNU_strp_alt)
- str = DW_STRING (attr);
- else
- complaint (&symfile_complaints,
- _("string type expected for attribute %s for "
- "DIE at 0x%x in module %s"),
- dwarf_attr_name (name), to_underlying (die->sect_off),
- objfile_name (cu->objfile));
- }
-
- return str;
-}
-
-/* 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 or DW_FORM_flag_present 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));
-}
-
-static int
-die_is_declaration (struct die_info *die, struct dwarf2_cu *cu)
-{
- /* 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);
-}
+ struct attribute attr;
-/* Return the die giving the specification for DIE, if there is
- one. *SPEC_CU is the CU containing DIE on input, and the CU
- containing the return value on output. If there is no
- specification, but there is an abstract origin, that is
- returned. */
+ info_ptr = read_attribute (reader, &attr, &abbrev.attrs[i], info_ptr);
-static struct die_info *
-die_specification (struct die_info *die, struct dwarf2_cu **spec_cu)
-{
- struct attribute *spec_attr = dwarf2_attr (die, DW_AT_specification,
- *spec_cu);
+ /* Store the data if it is of an attribute we want to keep in a
+ partial symbol table. */
+ switch (attr.name)
+ {
+ case DW_AT_name:
+ switch (tag)
+ {
+ case DW_TAG_compile_unit:
+ case DW_TAG_partial_unit:
+ case DW_TAG_type_unit:
+ /* Compilation units have a DW_AT_name that is a filename, not
+ a source language identifier. */
+ case DW_TAG_enumeration_type:
+ case DW_TAG_enumerator:
+ /* These tags always have simple identifiers already; no need
+ to canonicalize them. */
+ name = DW_STRING (&attr);
+ break;
+ default:
+ {
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
- if (spec_attr == NULL)
- spec_attr = dwarf2_attr (die, DW_AT_abstract_origin, *spec_cu);
+ name
+ = dwarf2_canonicalize_name (DW_STRING (&attr), cu,
+ &objfile->per_bfd->storage_obstack);
+ }
+ break;
+ }
+ break;
+ case DW_AT_linkage_name:
+ case DW_AT_MIPS_linkage_name:
+ /* Note that both forms of linkage name might appear. We
+ assume they will be the same, and we only store the last
+ one we see. */
+ if (cu->language == language_ada)
+ name = DW_STRING (&attr);
+ linkage_name = DW_STRING (&attr);
+ break;
+ case DW_AT_low_pc:
+ has_low_pc_attr = 1;
+ lowpc = attr_value_as_address (&attr);
+ break;
+ case DW_AT_high_pc:
+ has_high_pc_attr = 1;
+ highpc = attr_value_as_address (&attr);
+ if (cu->header.version >= 4 && attr_form_is_constant (&attr))
+ high_pc_relative = 1;
+ break;
+ case DW_AT_location:
+ /* Support the .debug_loc offsets. */
+ if (attr_form_is_block (&attr))
+ {
+ d.locdesc = DW_BLOCK (&attr);
+ }
+ else if (attr_form_is_section_offset (&attr))
+ {
+ dwarf2_complex_location_expr_complaint ();
+ }
+ else
+ {
+ dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
+ "partial symbol information");
+ }
+ break;
+ case DW_AT_external:
+ is_external = DW_UNSND (&attr);
+ break;
+ case DW_AT_declaration:
+ is_declaration = DW_UNSND (&attr);
+ break;
+ case DW_AT_type:
+ has_type = 1;
+ break;
+ case DW_AT_abstract_origin:
+ case DW_AT_specification:
+ case DW_AT_extension:
+ has_specification = 1;
+ spec_offset = dwarf2_get_ref_die_offset (&attr);
+ spec_is_dwz = (attr.form == DW_FORM_GNU_ref_alt
+ || cu->per_cu->is_dwz);
+ break;
+ case DW_AT_sibling:
+ /* Ignore absolute siblings, they might point outside of
+ the current compile unit. */
+ if (attr.form == DW_FORM_ref_addr)
+ complaint (_("ignoring absolute DW_AT_sibling"));
+ else
+ {
+ const gdb_byte *buffer = reader->buffer;
+ sect_offset off = dwarf2_get_ref_die_offset (&attr);
+ const gdb_byte *sibling_ptr = buffer + to_underlying (off);
- if (spec_attr == NULL)
- return NULL;
- else
- return follow_die_ref (die, spec_attr, spec_cu);
-}
+ if (sibling_ptr < info_ptr)
+ complaint (_("DW_AT_sibling points backwards"));
+ else if (sibling_ptr > reader->buffer_end)
+ dwarf2_section_buffer_overflow_complaint (reader->die_section);
+ else
+ sibling = sibling_ptr;
+ }
+ break;
+ case DW_AT_byte_size:
+ has_byte_size = 1;
+ break;
+ case DW_AT_const_value:
+ has_const_value = 1;
+ break;
+ case DW_AT_calling_convention:
+ /* DWARF doesn't provide a way to identify a program's source-level
+ entry point. DW_AT_calling_convention attributes are only meant
+ to describe functions' calling conventions.
-/* Stub for free_line_header to match void * callback types. */
+ However, because it's a necessary piece of information in
+ Fortran, and before DWARF 4 DW_CC_program was the only
+ piece of debugging information whose definition refers to
+ a 'main program' at all, several compilers marked Fortran
+ main programs with DW_CC_program --- even when those
+ functions use the standard calling conventions.
-static void
-free_line_header_voidp (void *arg)
-{
- struct line_header *lh = (struct line_header *) arg;
+ Although DWARF now specifies a way to provide this
+ information, we support this practice for backward
+ compatibility. */
+ if (DW_UNSND (&attr) == DW_CC_program
+ && cu->language == language_fortran)
+ main_subprogram = 1;
+ break;
+ case DW_AT_inline:
+ if (DW_UNSND (&attr) == DW_INL_inlined
+ || DW_UNSND (&attr) == DW_INL_declared_inlined)
+ may_be_inlined = 1;
+ break;
- delete lh;
-}
+ case DW_AT_import:
+ if (tag == DW_TAG_imported_unit)
+ {
+ d.sect_off = dwarf2_get_ref_die_offset (&attr);
+ is_dwz = (attr.form == DW_FORM_GNU_ref_alt
+ || cu->per_cu->is_dwz);
+ }
+ break;
-void
-line_header::add_include_dir (const char *include_dir)
-{
- if (dwarf_line_debug >= 2)
- fprintf_unfiltered (gdb_stdlog, "Adding dir %zu: %s\n",
- include_dirs.size () + 1, include_dir);
+ case DW_AT_main_subprogram:
+ main_subprogram = DW_UNSND (&attr);
+ break;
- include_dirs.push_back (include_dir);
-}
+ default:
+ break;
+ }
+ }
-void
-line_header::add_file_name (const char *name,
- dir_index d_index,
- unsigned int mod_time,
- unsigned int length)
-{
- if (dwarf_line_debug >= 2)
- fprintf_unfiltered (gdb_stdlog, "Adding file %u: %s\n",
- (unsigned) file_names.size () + 1, name);
+ if (high_pc_relative)
+ highpc += lowpc;
- file_names.emplace_back (name, d_index, mod_time, length);
+ if (has_low_pc_attr && has_high_pc_attr)
+ {
+ /* 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 (lowpc == 0 && !dwarf2_per_objfile->has_section_at_zero)
+ {
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+
+ complaint (_("DW_AT_low_pc %s is zero "
+ "for DIE at %s [in module %s]"),
+ paddress (gdbarch, lowpc),
+ sect_offset_str (sect_off),
+ objfile_name (objfile));
+ }
+ /* dwarf2_get_pc_bounds has also the strict low < high requirement. */
+ else if (lowpc >= highpc)
+ {
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+
+ complaint (_("DW_AT_low_pc %s is not < DW_AT_high_pc %s "
+ "for DIE at %s [in module %s]"),
+ paddress (gdbarch, lowpc),
+ paddress (gdbarch, highpc),
+ sect_offset_str (sect_off),
+ objfile_name (objfile));
+ }
+ else
+ has_pc_info = 1;
+ }
+
+ return info_ptr;
}
-/* A convenience function to find the proper .debug_line section for a CU. */
+/* Find a cached partial DIE at OFFSET in CU. */
-static struct dwarf2_section_info *
-get_debug_line_section (struct dwarf2_cu *cu)
+struct partial_die_info *
+dwarf2_cu::find_partial_die (sect_offset sect_off)
{
- struct dwarf2_section_info *section;
-
- /* For TUs in DWO files, the DW_AT_stmt_list attribute lives in the
- DWO file. */
- if (cu->dwo_unit && cu->per_cu->is_debug_types)
- section = &cu->dwo_unit->dwo_file->sections.line;
- else if (cu->per_cu->is_dwz)
- {
- struct dwz_file *dwz = dwarf2_get_dwz_file ();
+ struct partial_die_info *lookup_die = NULL;
+ struct partial_die_info part_die (sect_off);
- section = &dwz->line;
- }
- else
- section = &dwarf2_per_objfile->line;
+ lookup_die = ((struct partial_die_info *)
+ htab_find_with_hash (partial_dies, &part_die,
+ to_underlying (sect_off)));
- return section;
+ return lookup_die;
}
-/* Read directory or file name entry format, starting with byte of
- format count entries, ULEB128 pairs of entry formats, ULEB128 of
- entries count and the entries themselves in the described entry
- format. */
+/* Find a partial DIE at OFFSET, which may or may not be in CU,
+ except in the case of .debug_types DIEs which do not reference
+ outside their CU (they do however referencing other types via
+ DW_FORM_ref_sig8). */
-static void
-read_formatted_entries (bfd *abfd, const gdb_byte **bufp,
- struct line_header *lh,
- const struct comp_unit_head *cu_header,
- void (*callback) (struct line_header *lh,
- const char *name,
- dir_index d_index,
- unsigned int mod_time,
- unsigned int length))
+static struct partial_die_info *
+find_partial_die (sect_offset sect_off, int offset_in_dwz, struct dwarf2_cu *cu)
{
- gdb_byte format_count, formati;
- ULONGEST data_count, datai;
- const gdb_byte *buf = *bufp;
- const gdb_byte *format_header_data;
- unsigned int bytes_read;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_per_cu_data *per_cu = NULL;
+ struct partial_die_info *pd = NULL;
- format_count = read_1_byte (abfd, buf);
- buf += 1;
- format_header_data = buf;
- for (formati = 0; formati < format_count; formati++)
+ if (offset_in_dwz == cu->per_cu->is_dwz
+ && offset_in_cu_p (&cu->header, sect_off))
{
- read_unsigned_leb128 (abfd, buf, &bytes_read);
- buf += bytes_read;
- read_unsigned_leb128 (abfd, buf, &bytes_read);
- buf += bytes_read;
+ pd = cu->find_partial_die (sect_off);
+ if (pd != NULL)
+ return pd;
+ /* We missed recording what we needed.
+ Load all dies and try again. */
+ per_cu = cu->per_cu;
}
-
- data_count = read_unsigned_leb128 (abfd, buf, &bytes_read);
- buf += bytes_read;
- for (datai = 0; datai < data_count; datai++)
+ else
{
- const gdb_byte *format = format_header_data;
- struct file_entry fe;
-
- for (formati = 0; formati < format_count; formati++)
+ /* TUs don't reference other CUs/TUs (except via type signatures). */
+ if (cu->per_cu->is_debug_types)
{
- ULONGEST content_type = read_unsigned_leb128 (abfd, format, &bytes_read);
- format += bytes_read;
+ error (_("Dwarf Error: Type Unit at offset %s contains"
+ " external reference to offset %s [in module %s].\n"),
+ sect_offset_str (cu->header.sect_off), sect_offset_str (sect_off),
+ bfd_get_filename (objfile->obfd));
+ }
+ per_cu = dwarf2_find_containing_comp_unit (sect_off, offset_in_dwz,
+ dwarf2_per_objfile);
- ULONGEST form = read_unsigned_leb128 (abfd, format, &bytes_read);
- format += bytes_read;
+ if (per_cu->cu == NULL || per_cu->cu->partial_dies == NULL)
+ load_partial_comp_unit (per_cu);
- gdb::optional<const char *> string;
- gdb::optional<unsigned int> uint;
+ per_cu->cu->last_used = 0;
+ pd = per_cu->cu->find_partial_die (sect_off);
+ }
- switch (form)
- {
- case DW_FORM_string:
- string.emplace (read_direct_string (abfd, buf, &bytes_read));
- buf += bytes_read;
- break;
+ /* If we didn't find it, and not all dies have been loaded,
+ load them all and try again. */
- case DW_FORM_line_strp:
- string.emplace (read_indirect_line_string (abfd, buf,
- cu_header,
- &bytes_read));
- buf += bytes_read;
- break;
+ if (pd == NULL && per_cu->load_all_dies == 0)
+ {
+ per_cu->load_all_dies = 1;
- case DW_FORM_data1:
- uint.emplace (read_1_byte (abfd, buf));
- buf += 1;
- break;
+ /* This is nasty. When we reread the DIEs, somewhere up the call chain
+ THIS_CU->cu may already be in use. So we can't just free it and
+ replace its DIEs with the ones we read in. Instead, we leave those
+ DIEs alone (which can still be in use, e.g. in scan_partial_symbols),
+ and clobber THIS_CU->cu->partial_dies with the hash table for the new
+ set. */
+ load_partial_comp_unit (per_cu);
- case DW_FORM_data2:
- uint.emplace (read_2_bytes (abfd, buf));
- buf += 2;
- break;
+ pd = per_cu->cu->find_partial_die (sect_off);
+ }
- case DW_FORM_data4:
- uint.emplace (read_4_bytes (abfd, buf));
- buf += 4;
- break;
+ if (pd == NULL)
+ internal_error (__FILE__, __LINE__,
+ _("could not find partial DIE %s "
+ "in cache [from module %s]\n"),
+ sect_offset_str (sect_off), bfd_get_filename (objfile->obfd));
+ return pd;
+}
- case DW_FORM_data8:
- uint.emplace (read_8_bytes (abfd, buf));
- buf += 8;
- break;
+/* 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. */
- case DW_FORM_udata:
- uint.emplace (read_unsigned_leb128 (abfd, buf, &bytes_read));
- buf += bytes_read;
- break;
+static void
+guess_partial_die_structure_name (struct partial_die_info *struct_pdi,
+ struct dwarf2_cu *cu)
+{
+ /* 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
+ prefix (but see comment in read_structure_type). */
- case DW_FORM_block:
- /* It is valid only for DW_LNCT_timestamp which is ignored by
- current GDB. */
- break;
- }
+ struct partial_die_info *real_pdi;
+ struct partial_die_info *child_pdi;
- switch (content_type)
+ /* 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. */
+
+ real_pdi = struct_pdi;
+ while (real_pdi->has_specification)
+ real_pdi = find_partial_die (real_pdi->spec_offset,
+ real_pdi->spec_is_dwz, cu);
+
+ if (real_pdi->die_parent != NULL)
+ return;
+
+ for (child_pdi = struct_pdi->die_child;
+ child_pdi != NULL;
+ child_pdi = child_pdi->die_sibling)
+ {
+ if (child_pdi->tag == DW_TAG_subprogram
+ && child_pdi->linkage_name != NULL)
+ {
+ char *actual_class_name
+ = language_class_name_from_physname (cu->language_defn,
+ child_pdi->linkage_name);
+ if (actual_class_name != NULL)
{
- case DW_LNCT_path:
- if (string.has_value ())
- fe.name = *string;
- break;
- case DW_LNCT_directory_index:
- if (uint.has_value ())
- fe.d_index = (dir_index) *uint;
- break;
- case DW_LNCT_timestamp:
- if (uint.has_value ())
- fe.mod_time = *uint;
- break;
- case DW_LNCT_size:
- if (uint.has_value ())
- fe.length = *uint;
- break;
- case DW_LNCT_MD5:
- break;
- default:
- complaint (&symfile_complaints,
- _("Unknown format content type %s"),
- pulongest (content_type));
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct_pdi->name
+ = ((const char *)
+ obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ actual_class_name,
+ strlen (actual_class_name)));
+ xfree (actual_class_name);
}
+ break;
}
-
- callback (lh, fe.name, fe.d_index, fe.mod_time, fe.length);
}
-
- *bufp = buf;
}
-/* Read the statement program header starting at OFFSET in
- .debug_line, or .debug_line.dwo. Return a pointer
- to a struct line_header, allocated using xmalloc.
- Returns NULL if there is a problem reading the header, e.g., if it
- has a version we don't understand.
-
- NOTE: the strings in the include directory and file name tables of
- the returned object point into the dwarf line section buffer,
- and must not be freed. */
-
-static line_header_up
-dwarf_decode_line_header (sect_offset sect_off, struct dwarf2_cu *cu)
+void
+partial_die_info::fixup (struct dwarf2_cu *cu)
{
- const gdb_byte *line_ptr;
- unsigned int bytes_read, offset_size;
- int i;
- const char *cur_dir, *cur_file;
- struct dwarf2_section_info *section;
- bfd *abfd;
+ /* Once we've fixed up a die, there's no point in doing so again.
+ This also avoids a memory leak if we were to call
+ guess_partial_die_structure_name multiple times. */
+ if (fixup_called)
+ return;
- section = get_debug_line_section (cu);
- dwarf2_read_section (dwarf2_per_objfile->objfile, section);
- if (section->buffer == NULL)
+ /* If we found a reference attribute and the DIE has no name, try
+ to find a name in the referred to DIE. */
+
+ if (name == NULL && has_specification)
{
- if (cu->dwo_unit && cu->per_cu->is_debug_types)
- complaint (&symfile_complaints, _("missing .debug_line.dwo section"));
- else
- complaint (&symfile_complaints, _("missing .debug_line section"));
- return 0;
- }
+ struct partial_die_info *spec_die;
- /* We can't do this until we know the section is non-empty.
- Only then do we know we have such a section. */
- abfd = get_section_bfd_owner (section);
+ spec_die = find_partial_die (spec_offset, spec_is_dwz, cu);
- /* 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. */
- if (to_underlying (sect_off) + 4 >= section->size)
- {
- dwarf2_statement_list_fits_in_line_number_section_complaint ();
- return 0;
+ spec_die->fixup (cu);
+
+ if (spec_die->name)
+ {
+ name = spec_die->name;
+
+ /* Copy DW_AT_external attribute if it is set. */
+ if (spec_die->is_external)
+ is_external = spec_die->is_external;
+ }
}
- line_header_up lh (new line_header ());
+ /* Set default names for some unnamed DIEs. */
- lh->sect_off = sect_off;
- lh->offset_in_dwz = cu->per_cu->is_dwz;
+ if (name == NULL && tag == DW_TAG_namespace)
+ name = CP_ANONYMOUS_NAMESPACE_STR;
- line_ptr = section->buffer + to_underlying (sect_off);
+ /* If there is no parent die to provide a namespace, and there are
+ children, see if we can determine the namespace from their linkage
+ name. */
+ if (cu->language == language_cplus
+ && !VEC_empty (dwarf2_section_info_def,
+ cu->per_cu->dwarf2_per_objfile->types)
+ && die_parent == NULL
+ && has_children
+ && (tag == DW_TAG_class_type
+ || tag == DW_TAG_structure_type
+ || tag == DW_TAG_union_type))
+ guess_partial_die_structure_name (this, cu);
- /* Read in the header. */
- lh->total_length =
- read_checked_initial_length_and_offset (abfd, line_ptr, &cu->header,
- &bytes_read, &offset_size);
- line_ptr += bytes_read;
- if (line_ptr + lh->total_length > (section->buffer + section->size))
- {
- dwarf2_statement_list_fits_in_line_number_section_complaint ();
- return 0;
- }
- lh->statement_program_end = line_ptr + lh->total_length;
- lh->version = read_2_bytes (abfd, line_ptr);
- line_ptr += 2;
- if (lh->version > 5)
- {
- /* This is a version we don't understand. The format could have
- changed in ways we don't handle properly so just punt. */
- complaint (&symfile_complaints,
- _("unsupported version in .debug_line section"));
- return NULL;
- }
- if (lh->version >= 5)
+ /* GCC might emit a nameless struct or union that has a linkage
+ name. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
+ if (name == NULL
+ && (tag == DW_TAG_class_type
+ || tag == DW_TAG_interface_type
+ || tag == DW_TAG_structure_type
+ || tag == DW_TAG_union_type)
+ && linkage_name != NULL)
{
- gdb_byte segment_selector_size;
-
- /* Skip address size. */
- read_1_byte (abfd, line_ptr);
- line_ptr += 1;
+ char *demangled;
- segment_selector_size = read_1_byte (abfd, line_ptr);
- line_ptr += 1;
- if (segment_selector_size != 0)
+ demangled = gdb_demangle (linkage_name, DMGL_TYPES);
+ if (demangled)
{
- complaint (&symfile_complaints,
- _("unsupported segment selector size %u "
- "in .debug_line section"),
- segment_selector_size);
- return NULL;
+ const char *base;
+
+ /* Strip any leading namespaces/classes, keep only the base name.
+ DW_AT_name for named DIEs does not contain the prefixes. */
+ base = strrchr (demangled, ':');
+ if (base && base > demangled && base[-1] == ':')
+ base++;
+ else
+ base = demangled;
+
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ name
+ = ((const char *)
+ obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ base, strlen (base)));
+ xfree (demangled);
}
}
- lh->header_length = read_offset_1 (abfd, line_ptr, offset_size);
- line_ptr += offset_size;
- lh->minimum_instruction_length = read_1_byte (abfd, line_ptr);
- line_ptr += 1;
- if (lh->version >= 4)
- {
- lh->maximum_ops_per_instruction = read_1_byte (abfd, line_ptr);
- line_ptr += 1;
- }
- else
- lh->maximum_ops_per_instruction = 1;
- if (lh->maximum_ops_per_instruction == 0)
- {
- lh->maximum_ops_per_instruction = 1;
- complaint (&symfile_complaints,
- _("invalid maximum_ops_per_instruction "
- "in `.debug_line' section"));
- }
+ fixup_called = 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.reset (new unsigned char[lh->opcode_base]);
+/* Read an attribute value described by an attribute form. */
- 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;
- }
+static const gdb_byte *
+read_attribute_value (const struct die_reader_specs *reader,
+ struct attribute *attr, unsigned form,
+ LONGEST implicit_const, const gdb_byte *info_ptr)
+{
+ struct dwarf2_cu *cu = reader->cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ bfd *abfd = reader->abfd;
+ struct comp_unit_head *cu_header = &cu->header;
+ unsigned int bytes_read;
+ struct dwarf_block *blk;
- if (lh->version >= 5)
+ attr->form = (enum dwarf_form) form;
+ switch (form)
{
- /* Read directory table. */
- read_formatted_entries (abfd, &line_ptr, lh.get (), &cu->header,
- [] (struct line_header *lh, const char *name,
- dir_index d_index, unsigned int mod_time,
- unsigned int length)
+ case DW_FORM_ref_addr:
+ if (cu->header.version == 2)
+ DW_UNSND (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
+ else
+ DW_UNSND (attr) = read_offset (abfd, info_ptr,
+ &cu->header, &bytes_read);
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_GNU_ref_alt:
+ DW_UNSND (attr) = read_offset (abfd, info_ptr, &cu->header, &bytes_read);
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_addr:
+ DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
+ DW_ADDR (attr) = gdbarch_adjust_dwarf2_addr (gdbarch, DW_ADDR (attr));
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_block2:
+ blk = dwarf_alloc_block (cu);
+ 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:
+ blk = dwarf_alloc_block (cu);
+ 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_data16:
+ blk = dwarf_alloc_block (cu);
+ blk->size = 16;
+ blk->data = read_n_bytes (abfd, info_ptr, 16);
+ info_ptr += 16;
+ DW_BLOCK (attr) = blk;
+ break;
+ case DW_FORM_sec_offset:
+ DW_UNSND (attr) = read_offset (abfd, info_ptr, &cu->header, &bytes_read);
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_string:
+ DW_STRING (attr) = read_direct_string (abfd, info_ptr, &bytes_read);
+ DW_STRING_IS_CANONICAL (attr) = 0;
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_strp:
+ if (!cu->per_cu->is_dwz)
{
- lh->add_include_dir (name);
- });
+ DW_STRING (attr) = read_indirect_string (dwarf2_per_objfile,
+ abfd, info_ptr, cu_header,
+ &bytes_read);
+ DW_STRING_IS_CANONICAL (attr) = 0;
+ info_ptr += bytes_read;
+ break;
+ }
+ /* FALLTHROUGH */
+ case DW_FORM_line_strp:
+ if (!cu->per_cu->is_dwz)
+ {
+ DW_STRING (attr) = read_indirect_line_string (dwarf2_per_objfile,
+ abfd, info_ptr,
+ cu_header, &bytes_read);
+ DW_STRING_IS_CANONICAL (attr) = 0;
+ info_ptr += bytes_read;
+ break;
+ }
+ /* FALLTHROUGH */
+ case DW_FORM_GNU_strp_alt:
+ {
+ struct dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+ LONGEST str_offset = read_offset (abfd, info_ptr, cu_header,
+ &bytes_read);
- /* Read file name table. */
- read_formatted_entries (abfd, &line_ptr, lh.get (), &cu->header,
- [] (struct line_header *lh, const char *name,
- dir_index d_index, unsigned int mod_time,
- unsigned int length)
+ DW_STRING (attr) = read_indirect_string_from_dwz (objfile,
+ dwz, str_offset);
+ DW_STRING_IS_CANONICAL (attr) = 0;
+ info_ptr += bytes_read;
+ }
+ break;
+ case DW_FORM_exprloc:
+ case DW_FORM_block:
+ blk = dwarf_alloc_block (cu);
+ 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:
+ blk = dwarf_alloc_block (cu);
+ 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_flag_present:
+ DW_UNSND (attr) = 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) = (to_underlying (cu->header.sect_off)
+ + read_1_byte (abfd, info_ptr));
+ info_ptr += 1;
+ break;
+ case DW_FORM_ref2:
+ DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
+ + read_2_bytes (abfd, info_ptr));
+ info_ptr += 2;
+ break;
+ case DW_FORM_ref4:
+ DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
+ + read_4_bytes (abfd, info_ptr));
+ info_ptr += 4;
+ break;
+ case DW_FORM_ref8:
+ DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
+ + read_8_bytes (abfd, info_ptr));
+ info_ptr += 8;
+ break;
+ case DW_FORM_ref_sig8:
+ DW_SIGNATURE (attr) = read_8_bytes (abfd, info_ptr);
+ info_ptr += 8;
+ break;
+ case DW_FORM_ref_udata:
+ DW_UNSND (attr) = (to_underlying (cu->header.sect_off)
+ + read_unsigned_leb128 (abfd, info_ptr, &bytes_read));
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_indirect:
+ form = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+ info_ptr += bytes_read;
+ if (form == DW_FORM_implicit_const)
{
- lh->add_file_name (name, d_index, mod_time, length);
- });
- }
- else
- {
- /* Read directory table. */
- while ((cur_dir = read_direct_string (abfd, line_ptr, &bytes_read)) != NULL)
+ implicit_const = read_signed_leb128 (abfd, info_ptr, &bytes_read);
+ info_ptr += bytes_read;
+ }
+ info_ptr = read_attribute_value (reader, attr, form, implicit_const,
+ info_ptr);
+ break;
+ case DW_FORM_implicit_const:
+ DW_SND (attr) = implicit_const;
+ break;
+ case DW_FORM_GNU_addr_index:
+ if (reader->dwo_file == NULL)
{
- line_ptr += bytes_read;
- lh->add_include_dir (cur_dir);
+ /* For now flag a hard error.
+ Later we can turn this into a complaint. */
+ error (_("Dwarf Error: %s found in non-DWO CU [in module %s]"),
+ dwarf_form_name (form),
+ bfd_get_filename (abfd));
}
- line_ptr += bytes_read;
-
- /* Read file name table. */
- while ((cur_file = read_direct_string (abfd, line_ptr, &bytes_read)) != NULL)
+ DW_ADDR (attr) = read_addr_index_from_leb128 (cu, info_ptr, &bytes_read);
+ info_ptr += bytes_read;
+ break;
+ case DW_FORM_GNU_str_index:
+ if (reader->dwo_file == NULL)
{
- unsigned int mod_time, length;
- dir_index d_index;
-
- line_ptr += bytes_read;
- d_index = (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;
-
- lh->add_file_name (cur_file, d_index, mod_time, length);
+ /* For now flag a hard error.
+ Later we can turn this into a complaint if warranted. */
+ error (_("Dwarf Error: %s found in non-DWO CU [in module %s]"),
+ dwarf_form_name (form),
+ bfd_get_filename (abfd));
}
- line_ptr += bytes_read;
+ {
+ ULONGEST str_index =
+ read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+
+ DW_STRING (attr) = read_str_index (reader, str_index);
+ DW_STRING_IS_CANONICAL (attr) = 0;
+ info_ptr += bytes_read;
+ }
+ break;
+ default:
+ error (_("Dwarf Error: Cannot handle %s in DWARF reader [in module %s]"),
+ dwarf_form_name (form),
+ bfd_get_filename (abfd));
}
- lh->statement_program_start = line_ptr;
- if (line_ptr > (section->buffer + section->size))
- complaint (&symfile_complaints,
- _("line number info header doesn't "
- "fit in `.debug_line' section"));
+ /* Super hack. */
+ if (cu->per_cu->is_dwz && attr_form_is_ref (attr))
+ attr->form = DW_FORM_GNU_ref_alt;
- return lh;
+ /* We have seen instances where the compiler tried to emit a byte
+ size attribute of -1 which ended up being encoded as an unsigned
+ 0xffffffff. Although 0xffffffff is technically a valid size value,
+ an object of this size seems pretty unlikely so we can relatively
+ safely treat these cases as if the size attribute was invalid and
+ treat them as zero by default. */
+ if (attr->name == DW_AT_byte_size
+ && form == DW_FORM_data4
+ && DW_UNSND (attr) >= 0xffffffff)
+ {
+ complaint
+ (_("Suspicious DW_AT_byte_size value treated as zero instead of %s"),
+ hex_string (DW_UNSND (attr)));
+ DW_UNSND (attr) = 0;
+ }
+
+ return info_ptr;
}
-/* Subroutine of dwarf_decode_lines to simplify it.
- Return the file name of the psymtab for included file FILE_INDEX
- in line header LH of PST.
- COMP_DIR is the compilation directory (DW_AT_comp_dir) or NULL if unknown.
- If space for the result is malloc'd, it will be freed by a cleanup.
- Returns NULL if FILE_INDEX should be ignored, i.e., it is pst->filename.
+/* Read an attribute described by an abbreviated attribute. */
- The function creates dangling cleanup registration. */
+static const gdb_byte *
+read_attribute (const struct die_reader_specs *reader,
+ struct attribute *attr, struct attr_abbrev *abbrev,
+ const gdb_byte *info_ptr)
+{
+ attr->name = abbrev->name;
+ return read_attribute_value (reader, attr, abbrev->form,
+ abbrev->implicit_const, info_ptr);
+}
-static const char *
-psymtab_include_file_name (const struct line_header *lh, int file_index,
- const struct partial_symtab *pst,
- const char *comp_dir)
+/* Read dwarf information from a buffer. */
+
+static unsigned int
+read_1_byte (bfd *abfd, const gdb_byte *buf)
{
- const file_entry &fe = lh->file_names[file_index];
- const char *include_name = fe.name;
- const char *include_name_to_compare = include_name;
- const char *pst_filename;
- char *copied_name = NULL;
- int file_is_pst;
+ return bfd_get_8 (abfd, buf);
+}
- const char *dir_name = fe.include_dir (lh);
+static int
+read_1_signed_byte (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_signed_8 (abfd, buf);
+}
- if (!IS_ABSOLUTE_PATH (include_name)
- && (dir_name != NULL || comp_dir != NULL))
- {
- /* Avoid creating a duplicate psymtab for PST.
- We do this by comparing INCLUDE_NAME and PST_FILENAME.
- Before we do the comparison, however, we need to account
- for DIR_NAME and COMP_DIR.
- First prepend dir_name (if non-NULL). If we still don't
- have an absolute path prepend comp_dir (if non-NULL).
- However, the directory we record in the include-file's
- psymtab does not contain COMP_DIR (to match the
- corresponding symtab(s)).
+static unsigned int
+read_2_bytes (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_16 (abfd, buf);
+}
- Example:
+static int
+read_2_signed_bytes (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_signed_16 (abfd, buf);
+}
- bash$ cd /tmp
- bash$ gcc -g ./hello.c
- include_name = "hello.c"
- dir_name = "."
- DW_AT_comp_dir = comp_dir = "/tmp"
- DW_AT_name = "./hello.c"
+static unsigned int
+read_4_bytes (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_32 (abfd, buf);
+}
- */
+static int
+read_4_signed_bytes (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_signed_32 (abfd, buf);
+}
- if (dir_name != NULL)
- {
- char *tem = concat (dir_name, SLASH_STRING,
- include_name, (char *)NULL);
+static ULONGEST
+read_8_bytes (bfd *abfd, const gdb_byte *buf)
+{
+ return bfd_get_64 (abfd, buf);
+}
- make_cleanup (xfree, tem);
- include_name = tem;
- include_name_to_compare = include_name;
- }
- if (!IS_ABSOLUTE_PATH (include_name) && comp_dir != NULL)
- {
- char *tem = concat (comp_dir, SLASH_STRING,
- include_name, (char *)NULL);
+static CORE_ADDR
+read_address (bfd *abfd, const gdb_byte *buf, struct dwarf2_cu *cu,
+ unsigned int *bytes_read)
+{
+ struct comp_unit_head *cu_header = &cu->header;
+ CORE_ADDR retval = 0;
- make_cleanup (xfree, tem);
- include_name_to_compare = tem;
+ if (cu_header->signed_addr_p)
+ {
+ switch (cu_header->addr_size)
+ {
+ case 2:
+ retval = bfd_get_signed_16 (abfd, buf);
+ break;
+ case 4:
+ retval = bfd_get_signed_32 (abfd, buf);
+ break;
+ case 8:
+ retval = bfd_get_signed_64 (abfd, buf);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("read_address: bad switch, signed [in module %s]"),
+ bfd_get_filename (abfd));
}
}
-
- pst_filename = pst->filename;
- if (!IS_ABSOLUTE_PATH (pst_filename) && pst->dirname != NULL)
+ else
{
- copied_name = concat (pst->dirname, SLASH_STRING,
- pst_filename, (char *)NULL);
- pst_filename = copied_name;
+ switch (cu_header->addr_size)
+ {
+ case 2:
+ retval = bfd_get_16 (abfd, buf);
+ break;
+ case 4:
+ retval = bfd_get_32 (abfd, buf);
+ break;
+ case 8:
+ retval = bfd_get_64 (abfd, buf);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("read_address: bad switch, "
+ "unsigned [in module %s]"),
+ bfd_get_filename (abfd));
+ }
}
- file_is_pst = FILENAME_CMP (include_name_to_compare, pst_filename) == 0;
-
- if (copied_name != NULL)
- xfree (copied_name);
-
- if (file_is_pst)
- return NULL;
- return include_name;
+ *bytes_read = cu_header->addr_size;
+ return retval;
}
-/* State machine to track the state of the line number program. */
+/* Read the initial length from a section. The (draft) DWARF 3
+ 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.
-class lnp_state_machine
-{
-public:
- /* Initialize a machine state for the start of a line number
- program. */
- lnp_state_machine (gdbarch *arch, line_header *lh, bool record_lines_p);
+ 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.
- file_entry *current_file ()
- {
- /* lh->file_names is 0-based, but the file name numbers in the
- statement program are 1-based. */
- return m_line_header->file_name_at (m_file);
- }
+ The value returned via bytes_read should be used to increment the
+ relevant pointer after calling read_initial_length().
- /* Record the line in the state machine. END_SEQUENCE is true if
- we're processing the end of a sequence. */
- void record_line (bool end_sequence);
+ [ Note: read_initial_length() and read_offset() are based on the
+ document entitled "DWARF Debugging Information Format", revision
+ 3, draft 8, dated November 19, 2001. This document was obtained
+ from:
- /* Check address and if invalid nop-out the rest of the lines in this
- sequence. */
- void check_line_address (struct dwarf2_cu *cu,
- const gdb_byte *line_ptr,
- CORE_ADDR lowpc, CORE_ADDR address);
+ http://reality.sgiweb.org/davea/dwarf3-draft8-011125.pdf
- void handle_set_discriminator (unsigned int discriminator)
- {
- m_discriminator = discriminator;
- m_line_has_non_zero_discriminator |= discriminator != 0;
- }
+ This document is only a draft and is subject to change. (So beware.)
- /* Handle DW_LNE_set_address. */
- void handle_set_address (CORE_ADDR baseaddr, CORE_ADDR address)
- {
- m_op_index = 0;
- address += baseaddr;
- m_address = gdbarch_adjust_dwarf2_line (m_gdbarch, address, false);
- }
+ 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.
- /* Handle DW_LNS_advance_pc. */
- void handle_advance_pc (CORE_ADDR adjust);
+ - Kevin, July 16, 2002
+ ] */
- /* Handle a special opcode. */
- void handle_special_opcode (unsigned char op_code);
+static LONGEST
+read_initial_length (bfd *abfd, const gdb_byte *buf, unsigned int *bytes_read)
+{
+ LONGEST length = bfd_get_32 (abfd, buf);
- /* Handle DW_LNS_advance_line. */
- void handle_advance_line (int line_delta)
- {
- advance_line (line_delta);
- }
+ if (length == 0xffffffff)
+ {
+ length = bfd_get_64 (abfd, buf + 4);
+ *bytes_read = 12;
+ }
+ else if (length == 0)
+ {
+ /* Handle the (non-standard) 64-bit DWARF2 format used by IRIX. */
+ length = bfd_get_64 (abfd, buf);
+ *bytes_read = 8;
+ }
+ else
+ {
+ *bytes_read = 4;
+ }
- /* Handle DW_LNS_set_file. */
- void handle_set_file (file_name_index file);
+ return length;
+}
- /* Handle DW_LNS_negate_stmt. */
- void handle_negate_stmt ()
- {
- m_is_stmt = !m_is_stmt;
- }
+/* Cover function for read_initial_length.
+ Returns the length of the object at BUF, and stores the size of the
+ initial length in *BYTES_READ and stores the size that offsets will be in
+ *OFFSET_SIZE.
+ If the initial length size is not equivalent to that specified in
+ CU_HEADER then issue a complaint.
+ This is useful when reading non-comp-unit headers. */
- /* Handle DW_LNS_const_add_pc. */
- void handle_const_add_pc ();
+static LONGEST
+read_checked_initial_length_and_offset (bfd *abfd, const gdb_byte *buf,
+ const struct comp_unit_head *cu_header,
+ unsigned int *bytes_read,
+ unsigned int *offset_size)
+{
+ LONGEST length = read_initial_length (abfd, buf, bytes_read);
- /* Handle DW_LNS_fixed_advance_pc. */
- void handle_fixed_advance_pc (CORE_ADDR addr_adj)
- {
- m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
- m_op_index = 0;
- }
-
- /* Handle DW_LNS_copy. */
- void handle_copy ()
- {
- record_line (false);
- m_discriminator = 0;
- }
-
- /* Handle DW_LNE_end_sequence. */
- void handle_end_sequence ()
- {
- m_record_line_callback = ::record_line;
- }
-
-private:
- /* Advance the line by LINE_DELTA. */
- void advance_line (int line_delta)
- {
- m_line += line_delta;
-
- if (line_delta != 0)
- m_line_has_non_zero_discriminator = m_discriminator != 0;
- }
-
- gdbarch *m_gdbarch;
-
- /* True if we're recording lines.
- Otherwise we're building partial symtabs and are just interested in
- finding include files mentioned by the line number program. */
- bool m_record_lines_p;
-
- /* The line number header. */
- line_header *m_line_header;
+ gdb_assert (cu_header->initial_length_size == 4
+ || cu_header->initial_length_size == 8
+ || cu_header->initial_length_size == 12);
- /* These are part of the standard DWARF line number state machine,
- and initialized according to the DWARF spec. */
+ if (cu_header->initial_length_size != *bytes_read)
+ complaint (_("intermixed 32-bit and 64-bit DWARF sections"));
- unsigned char m_op_index = 0;
- /* The line table index (1-based) of the current file. */
- file_name_index m_file = (file_name_index) 1;
- unsigned int m_line = 1;
+ *offset_size = (*bytes_read == 4) ? 4 : 8;
+ return length;
+}
- /* These are initialized in the constructor. */
+/* Read an offset from the data stream. The size of the offset is
+ given by cu_header->offset_size. */
- CORE_ADDR m_address;
- bool m_is_stmt;
- unsigned int m_discriminator;
+static LONGEST
+read_offset (bfd *abfd, const gdb_byte *buf,
+ const struct comp_unit_head *cu_header,
+ unsigned int *bytes_read)
+{
+ LONGEST offset = read_offset_1 (abfd, buf, cu_header->offset_size);
- /* Additional bits of state we need to track. */
+ *bytes_read = cu_header->offset_size;
+ return offset;
+}
- /* The last file that we called dwarf2_start_subfile for.
- This is only used for TLLs. */
- unsigned int m_last_file = 0;
- /* The last file a line number was recorded for. */
- struct subfile *m_last_subfile = NULL;
+/* Read an offset from the data stream. */
- /* The function to call to record a line. */
- record_line_ftype *m_record_line_callback = NULL;
+static LONGEST
+read_offset_1 (bfd *abfd, const gdb_byte *buf, unsigned int offset_size)
+{
+ LONGEST retval = 0;
- /* The last line number that was recorded, used to coalesce
- consecutive entries for the same line. This can happen, for
- example, when discriminators are present. PR 17276. */
- unsigned int m_last_line = 0;
- bool m_line_has_non_zero_discriminator = false;
-};
+ switch (offset_size)
+ {
+ case 4:
+ retval = bfd_get_32 (abfd, buf);
+ break;
+ case 8:
+ retval = bfd_get_64 (abfd, buf);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("read_offset_1: bad switch [in module %s]"),
+ bfd_get_filename (abfd));
+ }
-void
-lnp_state_machine::handle_advance_pc (CORE_ADDR adjust)
-{
- CORE_ADDR addr_adj = (((m_op_index + adjust)
- / m_line_header->maximum_ops_per_instruction)
- * m_line_header->minimum_instruction_length);
- m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
- m_op_index = ((m_op_index + adjust)
- % m_line_header->maximum_ops_per_instruction);
+ return retval;
}
-void
-lnp_state_machine::handle_special_opcode (unsigned char op_code)
+static const gdb_byte *
+read_n_bytes (bfd *abfd, const gdb_byte *buf, unsigned int size)
{
- unsigned char adj_opcode = op_code - m_line_header->opcode_base;
- CORE_ADDR addr_adj = (((m_op_index
- + (adj_opcode / m_line_header->line_range))
- / m_line_header->maximum_ops_per_instruction)
- * m_line_header->minimum_instruction_length);
- m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
- m_op_index = ((m_op_index + (adj_opcode / m_line_header->line_range))
- % m_line_header->maximum_ops_per_instruction);
-
- int line_delta = (m_line_header->line_base
- + (adj_opcode % m_line_header->line_range));
- advance_line (line_delta);
- record_line (false);
- m_discriminator = 0;
+ /* 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. */
+ gdb_assert (HOST_CHAR_BIT == 8);
+ return buf;
}
-void
-lnp_state_machine::handle_set_file (file_name_index file)
+static const char *
+read_direct_string (bfd *abfd, const gdb_byte *buf,
+ unsigned int *bytes_read_ptr)
{
- m_file = file;
-
- const file_entry *fe = current_file ();
- if (fe == NULL)
- dwarf2_debug_line_missing_file_complaint ();
- else if (m_record_lines_p)
+ /* 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. */
+ gdb_assert (HOST_CHAR_BIT == 8);
+ if (*buf == '\0')
{
- const char *dir = fe->include_dir (m_line_header);
-
- m_last_subfile = current_subfile;
- m_line_has_non_zero_discriminator = m_discriminator != 0;
- dwarf2_start_subfile (fe->name, dir);
+ *bytes_read_ptr = 1;
+ return NULL;
}
+ *bytes_read_ptr = strlen ((const char *) buf) + 1;
+ return (const char *) buf;
}
-void
-lnp_state_machine::handle_const_add_pc ()
+/* Return pointer to string at section SECT offset STR_OFFSET with error
+ reporting strings FORM_NAME and SECT_NAME. */
+
+static const char *
+read_indirect_string_at_offset_from (struct objfile *objfile,
+ bfd *abfd, LONGEST str_offset,
+ struct dwarf2_section_info *sect,
+ const char *form_name,
+ const char *sect_name)
{
- CORE_ADDR adjust
- = (255 - m_line_header->opcode_base) / m_line_header->line_range;
+ dwarf2_read_section (objfile, sect);
+ if (sect->buffer == NULL)
+ error (_("%s used without %s section [in module %s]"),
+ form_name, sect_name, bfd_get_filename (abfd));
+ if (str_offset >= sect->size)
+ error (_("%s pointing outside of %s section [in module %s]"),
+ form_name, sect_name, bfd_get_filename (abfd));
+ gdb_assert (HOST_CHAR_BIT == 8);
+ if (sect->buffer[str_offset] == '\0')
+ return NULL;
+ return (const char *) (sect->buffer + str_offset);
+}
- CORE_ADDR addr_adj
- = (((m_op_index + adjust)
- / m_line_header->maximum_ops_per_instruction)
- * m_line_header->minimum_instruction_length);
+/* Return pointer to string at .debug_str offset STR_OFFSET. */
- m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
- m_op_index = ((m_op_index + adjust)
- % m_line_header->maximum_ops_per_instruction);
+static const char *
+read_indirect_string_at_offset (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ bfd *abfd, LONGEST str_offset)
+{
+ return read_indirect_string_at_offset_from (dwarf2_per_objfile->objfile,
+ abfd, str_offset,
+ &dwarf2_per_objfile->str,
+ "DW_FORM_strp", ".debug_str");
}
-/* Ignore this record_line request. */
+/* Return pointer to string at .debug_line_str offset STR_OFFSET. */
-static void
-noop_record_line (struct subfile *subfile, int line, CORE_ADDR pc)
+static const char *
+read_indirect_line_string_at_offset (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ bfd *abfd, LONGEST str_offset)
{
- return;
+ return read_indirect_string_at_offset_from (dwarf2_per_objfile->objfile,
+ abfd, str_offset,
+ &dwarf2_per_objfile->line_str,
+ "DW_FORM_line_strp",
+ ".debug_line_str");
}
-/* Return non-zero if we should add LINE to the line number table.
- LINE is the line to add, LAST_LINE is the last line that was added,
- LAST_SUBFILE is the subfile for LAST_LINE.
- LINE_HAS_NON_ZERO_DISCRIMINATOR is non-zero if LINE has ever
- had a non-zero discriminator.
+/* Read a string at offset STR_OFFSET in the .debug_str section from
+ the .dwz file DWZ. Throw an error if the offset is too large. If
+ the string consists of a single NUL byte, return NULL; otherwise
+ return a pointer to the string. */
- We have to be careful in the presence of discriminators.
- E.g., for this line:
+static const char *
+read_indirect_string_from_dwz (struct objfile *objfile, struct dwz_file *dwz,
+ LONGEST str_offset)
+{
+ dwarf2_read_section (objfile, &dwz->str);
- for (i = 0; i < 100000; i++);
+ if (dwz->str.buffer == NULL)
+ error (_("DW_FORM_GNU_strp_alt used without .debug_str "
+ "section [in module %s]"),
+ bfd_get_filename (dwz->dwz_bfd));
+ if (str_offset >= dwz->str.size)
+ error (_("DW_FORM_GNU_strp_alt pointing outside of "
+ ".debug_str section [in module %s]"),
+ bfd_get_filename (dwz->dwz_bfd));
+ gdb_assert (HOST_CHAR_BIT == 8);
+ if (dwz->str.buffer[str_offset] == '\0')
+ return NULL;
+ return (const char *) (dwz->str.buffer + str_offset);
+}
- clang can emit four line number entries for that one line,
- each with a different discriminator.
- See gdb.dwarf2/dw2-single-line-discriminators.exp for an example.
+/* Return pointer to string at .debug_str offset as read from BUF.
+ BUF is assumed to be in a compilation unit described by CU_HEADER.
+ Return *BYTES_READ_PTR count of bytes read from BUF. */
- However, we want gdb to coalesce all four entries into one.
- Otherwise the user could stepi into the middle of the line and
- gdb would get confused about whether the pc really was in the
- middle of the line.
+static const char *
+read_indirect_string (struct dwarf2_per_objfile *dwarf2_per_objfile, bfd *abfd,
+ const gdb_byte *buf,
+ const struct comp_unit_head *cu_header,
+ unsigned int *bytes_read_ptr)
+{
+ LONGEST str_offset = read_offset (abfd, buf, cu_header, bytes_read_ptr);
- Things are further complicated by the fact that two consecutive
- line number entries for the same line is a heuristic used by gcc
- to denote the end of the prologue. So we can't just discard duplicate
- entries, we have to be selective about it. The heuristic we use is
- that we only collapse consecutive entries for the same line if at least
- one of those entries has a non-zero discriminator. PR 17276.
+ return read_indirect_string_at_offset (dwarf2_per_objfile, abfd, str_offset);
+}
- Note: Addresses in the line number state machine can never go backwards
- within one sequence, thus this coalescing is ok. */
+/* Return pointer to string at .debug_line_str offset as read from BUF.
+ BUF is assumed to be in a compilation unit described by CU_HEADER.
+ Return *BYTES_READ_PTR count of bytes read from BUF. */
-static int
-dwarf_record_line_p (unsigned int line, unsigned int last_line,
- int line_has_non_zero_discriminator,
- struct subfile *last_subfile)
-{
- if (current_subfile != last_subfile)
- return 1;
- if (line != last_line)
- return 1;
- /* Same line for the same file that we've seen already.
- As a last check, for pr 17276, only record the line if the line
- has never had a non-zero discriminator. */
- if (!line_has_non_zero_discriminator)
- return 1;
- return 0;
-}
-
-/* Use P_RECORD_LINE to record line number LINE beginning at address ADDRESS
- in the line table of subfile SUBFILE. */
-
-static void
-dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile,
- unsigned int line, CORE_ADDR address,
- record_line_ftype p_record_line)
+static const char *
+read_indirect_line_string (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ bfd *abfd, const gdb_byte *buf,
+ const struct comp_unit_head *cu_header,
+ unsigned int *bytes_read_ptr)
{
- CORE_ADDR addr = gdbarch_addr_bits_remove (gdbarch, address);
-
- if (dwarf_line_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "Recording line %u, file %s, address %s\n",
- line, lbasename (subfile->name),
- paddress (gdbarch, address));
- }
+ LONGEST str_offset = read_offset (abfd, buf, cu_header, bytes_read_ptr);
- (*p_record_line) (subfile, line, addr);
+ return read_indirect_line_string_at_offset (dwarf2_per_objfile, abfd,
+ str_offset);
}
-/* Subroutine of dwarf_decode_lines_1 to simplify it.
- Mark the end of a set of line number records.
- The arguments are the same as for dwarf_record_line_1.
- If SUBFILE is NULL the request is ignored. */
-
-static void
-dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile,
- CORE_ADDR address, record_line_ftype p_record_line)
+ULONGEST
+read_unsigned_leb128 (bfd *abfd, const gdb_byte *buf,
+ unsigned int *bytes_read_ptr)
{
- if (subfile == NULL)
- return;
+ ULONGEST result;
+ unsigned int num_read;
+ int shift;
+ unsigned char byte;
- if (dwarf_line_debug)
+ result = 0;
+ shift = 0;
+ num_read = 0;
+ while (1)
{
- fprintf_unfiltered (gdb_stdlog,
- "Finishing current line, file %s, address %s\n",
- lbasename (subfile->name),
- paddress (gdbarch, address));
+ byte = bfd_get_8 (abfd, buf);
+ buf++;
+ num_read++;
+ result |= ((ULONGEST) (byte & 127) << shift);
+ if ((byte & 128) == 0)
+ {
+ break;
+ }
+ shift += 7;
}
-
- dwarf_record_line_1 (gdbarch, subfile, 0, address, p_record_line);
+ *bytes_read_ptr = num_read;
+ return result;
}
-void
-lnp_state_machine::record_line (bool end_sequence)
+static LONGEST
+read_signed_leb128 (bfd *abfd, const gdb_byte *buf,
+ unsigned int *bytes_read_ptr)
{
- if (dwarf_line_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "Processing actual line %u: file %u,"
- " address %s, is_stmt %u, discrim %u\n",
- m_line, to_underlying (m_file),
- paddress (m_gdbarch, m_address),
- m_is_stmt, m_discriminator);
- }
-
- file_entry *fe = current_file ();
+ LONGEST result;
+ int shift, num_read;
+ unsigned char byte;
- if (fe == NULL)
- dwarf2_debug_line_missing_file_complaint ();
- /* For now we ignore lines not starting on an instruction boundary.
- But not when processing end_sequence for compatibility with the
- previous version of the code. */
- else if (m_op_index == 0 || end_sequence)
+ result = 0;
+ shift = 0;
+ num_read = 0;
+ while (1)
{
- fe->included_p = 1;
- if (m_record_lines_p && m_is_stmt)
+ byte = bfd_get_8 (abfd, buf);
+ buf++;
+ num_read++;
+ result |= ((LONGEST) (byte & 127) << shift);
+ shift += 7;
+ if ((byte & 128) == 0)
{
- if (m_last_subfile != current_subfile || end_sequence)
- {
- dwarf_finish_line (m_gdbarch, m_last_subfile,
- m_address, m_record_line_callback);
- }
-
- if (!end_sequence)
- {
- if (dwarf_record_line_p (m_line, m_last_line,
- m_line_has_non_zero_discriminator,
- m_last_subfile))
- {
- dwarf_record_line_1 (m_gdbarch, current_subfile,
- m_line, m_address,
- m_record_line_callback);
- }
- m_last_subfile = current_subfile;
- m_last_line = m_line;
- }
+ break;
}
}
+ if ((shift < 8 * sizeof (result)) && (byte & 0x40))
+ result |= -(((LONGEST) 1) << shift);
+ *bytes_read_ptr = num_read;
+ return result;
}
-lnp_state_machine::lnp_state_machine (gdbarch *arch, line_header *lh,
- bool record_lines_p)
-{
- m_gdbarch = arch;
- m_record_lines_p = record_lines_p;
- m_line_header = lh;
+/* Given index ADDR_INDEX in .debug_addr, fetch the value.
+ ADDR_BASE is the DW_AT_GNU_addr_base attribute or zero.
+ ADDR_SIZE is the size of addresses from the CU header. */
- m_record_line_callback = ::record_line;
+static CORE_ADDR
+read_addr_index_1 (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ unsigned int addr_index, ULONGEST addr_base, int addr_size)
+{
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ bfd *abfd = objfile->obfd;
+ const gdb_byte *info_ptr;
- /* Call `gdbarch_adjust_dwarf2_line' on the initial 0 address as if there
- was a line entry for it so that the backend has a chance to adjust it
- and also record it in case it needs it. This is currently used by MIPS
- code, cf. `mips_adjust_dwarf2_line'. */
- m_address = gdbarch_adjust_dwarf2_line (arch, 0, 0);
- m_is_stmt = lh->default_is_stmt;
- m_discriminator = 0;
+ dwarf2_read_section (objfile, &dwarf2_per_objfile->addr);
+ if (dwarf2_per_objfile->addr.buffer == NULL)
+ error (_("DW_FORM_addr_index used without .debug_addr section [in module %s]"),
+ objfile_name (objfile));
+ if (addr_base + addr_index * addr_size >= dwarf2_per_objfile->addr.size)
+ error (_("DW_FORM_addr_index pointing outside of "
+ ".debug_addr section [in module %s]"),
+ objfile_name (objfile));
+ info_ptr = (dwarf2_per_objfile->addr.buffer
+ + addr_base + addr_index * addr_size);
+ if (addr_size == 4)
+ return bfd_get_32 (abfd, info_ptr);
+ else
+ return bfd_get_64 (abfd, info_ptr);
}
-void
-lnp_state_machine::check_line_address (struct dwarf2_cu *cu,
- const gdb_byte *line_ptr,
- CORE_ADDR lowpc, CORE_ADDR address)
+/* Given index ADDR_INDEX in .debug_addr, fetch the value. */
+
+static CORE_ADDR
+read_addr_index (struct dwarf2_cu *cu, unsigned int addr_index)
{
- /* If address < lowpc then it's not a usable value, it's outside the
- pc range of the CU. However, we restrict the test to only address
- values of zero to preserve GDB's previous behaviour which is to
- handle the specific case of a function being GC'd by the linker. */
+ return read_addr_index_1 (cu->per_cu->dwarf2_per_objfile, addr_index,
+ cu->addr_base, cu->header.addr_size);
+}
- if (address == 0 && address < lowpc)
- {
- /* This line table is for a function which has been
- GCd by the linker. Ignore it. PR gdb/12528 */
+/* Given a pointer to an leb128 value, fetch the value from .debug_addr. */
- struct objfile *objfile = cu->objfile;
- long line_offset = line_ptr - get_debug_line_section (cu)->buffer;
+static CORE_ADDR
+read_addr_index_from_leb128 (struct dwarf2_cu *cu, const gdb_byte *info_ptr,
+ unsigned int *bytes_read)
+{
+ bfd *abfd = cu->per_cu->dwarf2_per_objfile->objfile->obfd;
+ unsigned int addr_index = read_unsigned_leb128 (abfd, info_ptr, bytes_read);
- complaint (&symfile_complaints,
- _(".debug_line address at offset 0x%lx is 0 [in module %s]"),
- line_offset, objfile_name (objfile));
- m_record_line_callback = noop_record_line;
- /* Note: record_line_callback is left as noop_record_line until
- we see DW_LNE_end_sequence. */
- }
+ return read_addr_index (cu, addr_index);
}
-/* Subroutine of dwarf_decode_lines to simplify it.
- Process the line number information in LH.
- If DECODE_FOR_PST_P is non-zero, all we do is process the line number
- program in order to set included_p for every referenced header. */
+/* Data structure to pass results from dwarf2_read_addr_index_reader
+ back to dwarf2_read_addr_index. */
-static void
-dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu,
- const int decode_for_pst_p, CORE_ADDR lowpc)
+struct dwarf2_read_addr_index_data
{
- const gdb_byte *line_ptr, *extended_end;
- const gdb_byte *line_end;
- unsigned int bytes_read, extended_len;
- unsigned char op_code, extended_op;
- CORE_ADDR baseaddr;
- struct objfile *objfile = cu->objfile;
- bfd *abfd = objfile->obfd;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- /* True if we're recording line info (as opposed to building partial
- symtabs and just interested in finding include files mentioned by
- the line number program). */
- bool record_lines_p = !decode_for_pst_p;
+ ULONGEST addr_base;
+ int addr_size;
+};
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+/* die_reader_func for dwarf2_read_addr_index. */
- line_ptr = lh->statement_program_start;
- line_end = lh->statement_program_end;
+static void
+dwarf2_read_addr_index_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *data)
+{
+ struct dwarf2_cu *cu = reader->cu;
+ struct dwarf2_read_addr_index_data *aidata =
+ (struct dwarf2_read_addr_index_data *) data;
- /* Read the statement sequences until there's nothing left. */
- while (line_ptr < line_end)
- {
- /* The DWARF line number program state machine. Reset the state
- machine at the start of each sequence. */
- lnp_state_machine state_machine (gdbarch, lh, record_lines_p);
- bool end_sequence = false;
+ aidata->addr_base = cu->addr_base;
+ aidata->addr_size = cu->header.addr_size;
+}
- if (record_lines_p)
- {
- /* Start a subfile for the current file of the state
- machine. */
- const file_entry *fe = state_machine.current_file ();
+/* Given an index in .debug_addr, fetch the value.
+ NOTE: This can be called during dwarf expression evaluation,
+ long after the debug information has been read, and thus per_cu->cu
+ may no longer exist. */
- if (fe != NULL)
- dwarf2_start_subfile (fe->name, fe->include_dir (lh));
- }
+CORE_ADDR
+dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu,
+ unsigned int addr_index)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
+ struct dwarf2_cu *cu = per_cu->cu;
+ ULONGEST addr_base;
+ int addr_size;
- /* Decode the table. */
- while (line_ptr < line_end && !end_sequence)
- {
- op_code = read_1_byte (abfd, line_ptr);
- line_ptr += 1;
+ /* We need addr_base and addr_size.
+ If we don't have PER_CU->cu, we have to get it.
+ Nasty, but the alternative is storing the needed info in PER_CU,
+ which at this point doesn't seem justified: it's not clear how frequently
+ it would get used and it would increase the size of every PER_CU.
+ Entry points like dwarf2_per_cu_addr_size do a similar thing
+ so we're not in uncharted territory here.
+ Alas we need to be a bit more complicated as addr_base is contained
+ in the DIE.
- if (op_code >= lh->opcode_base)
- {
- /* Special opcode. */
- state_machine.handle_special_opcode (op_code);
- }
- else switch (op_code)
- {
- case DW_LNS_extended_op:
- extended_len = read_unsigned_leb128 (abfd, line_ptr,
- &bytes_read);
- line_ptr += bytes_read;
- extended_end = line_ptr + extended_len;
- extended_op = read_1_byte (abfd, line_ptr);
- line_ptr += 1;
- switch (extended_op)
- {
- case DW_LNE_end_sequence:
- state_machine.handle_end_sequence ();
- end_sequence = true;
- break;
- case DW_LNE_set_address:
- {
- CORE_ADDR address
- = read_address (abfd, line_ptr, cu, &bytes_read);
- line_ptr += bytes_read;
+ We don't need to read the entire CU(/TU).
+ We just need the header and top level die.
- state_machine.check_line_address (cu, line_ptr,
- lowpc, address);
- state_machine.handle_set_address (baseaddr, address);
- }
- break;
- case DW_LNE_define_file:
- {
- const char *cur_file;
- unsigned int mod_time, length;
- dir_index dindex;
+ IWBN to use the aging mechanism to let us lazily later discard the CU.
+ For now we skip this optimization. */
- cur_file = read_direct_string (abfd, line_ptr,
- &bytes_read);
- line_ptr += bytes_read;
- dindex = (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;
- lh->add_file_name (cur_file, dindex, mod_time, length);
- }
- break;
- case DW_LNE_set_discriminator:
- {
- /* The discriminator is not interesting to the
- debugger; just ignore it. We still need to
- check its value though:
- if there are consecutive entries for the same
- (non-prologue) line we want to coalesce them.
- PR 17276. */
- unsigned int discr
- = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
- line_ptr += bytes_read;
+ if (cu != NULL)
+ {
+ addr_base = cu->addr_base;
+ addr_size = cu->header.addr_size;
+ }
+ else
+ {
+ struct dwarf2_read_addr_index_data aidata;
- state_machine.handle_set_discriminator (discr);
- }
- break;
- default:
- complaint (&symfile_complaints,
- _("mangled .debug_line section"));
- return;
- }
- /* Make sure that we parsed the extended op correctly. If e.g.
- we expected a different address size than the producer used,
- we may have read the wrong number of bytes. */
- if (line_ptr != extended_end)
- {
- complaint (&symfile_complaints,
- _("mangled .debug_line section"));
- return;
- }
- break;
- case DW_LNS_copy:
- state_machine.handle_copy ();
- break;
- case DW_LNS_advance_pc:
- {
- CORE_ADDR adjust
- = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
- line_ptr += bytes_read;
+ /* Note: We can't use init_cutu_and_read_dies_simple here,
+ we need addr_base. */
+ init_cutu_and_read_dies (per_cu, NULL, 0, 0, false,
+ dwarf2_read_addr_index_reader, &aidata);
+ addr_base = aidata.addr_base;
+ addr_size = aidata.addr_size;
+ }
- state_machine.handle_advance_pc (adjust);
- }
- break;
- case DW_LNS_advance_line:
- {
- int line_delta
- = read_signed_leb128 (abfd, line_ptr, &bytes_read);
- line_ptr += bytes_read;
+ return read_addr_index_1 (dwarf2_per_objfile, addr_index, addr_base,
+ addr_size);
+}
- state_machine.handle_advance_line (line_delta);
- }
- break;
- case DW_LNS_set_file:
- {
- file_name_index file
- = (file_name_index) read_unsigned_leb128 (abfd, line_ptr,
- &bytes_read);
- line_ptr += bytes_read;
+/* Given a DW_FORM_GNU_str_index, fetch the string.
+ This is only used by the Fission support. */
- state_machine.handle_set_file (file);
- }
- break;
- case DW_LNS_set_column:
- (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
- line_ptr += bytes_read;
- break;
- case DW_LNS_negate_stmt:
- state_machine.handle_negate_stmt ();
- break;
- case DW_LNS_set_basic_block:
- break;
- /* Add to the address register of the state machine the
- address increment value corresponding to special opcode
- 255. I.e., this value is scaled by the minimum
- instruction length since special opcode 255 would have
- scaled the increment. */
- case DW_LNS_const_add_pc:
- state_machine.handle_const_add_pc ();
- break;
- case DW_LNS_fixed_advance_pc:
- {
- CORE_ADDR addr_adj = read_2_bytes (abfd, line_ptr);
- line_ptr += 2;
+static const char *
+read_str_index (const struct die_reader_specs *reader, ULONGEST str_index)
+{
+ struct dwarf2_cu *cu = reader->cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ const char *objf_name = objfile_name (objfile);
+ bfd *abfd = objfile->obfd;
+ struct dwarf2_section_info *str_section = &reader->dwo_file->sections.str;
+ struct dwarf2_section_info *str_offsets_section =
+ &reader->dwo_file->sections.str_offsets;
+ const gdb_byte *info_ptr;
+ ULONGEST str_offset;
+ static const char form_name[] = "DW_FORM_GNU_str_index";
- state_machine.handle_fixed_advance_pc (addr_adj);
- }
- break;
- default:
- {
- /* Unknown standard opcode, ignore it. */
- int i;
+ dwarf2_read_section (objfile, str_section);
+ dwarf2_read_section (objfile, str_offsets_section);
+ if (str_section->buffer == NULL)
+ error (_("%s used without .debug_str.dwo section"
+ " in CU at offset %s [in module %s]"),
+ form_name, sect_offset_str (cu->header.sect_off), objf_name);
+ if (str_offsets_section->buffer == NULL)
+ error (_("%s used without .debug_str_offsets.dwo section"
+ " in CU at offset %s [in module %s]"),
+ form_name, sect_offset_str (cu->header.sect_off), objf_name);
+ if (str_index * cu->header.offset_size >= str_offsets_section->size)
+ error (_("%s pointing outside of .debug_str_offsets.dwo"
+ " section in CU at offset %s [in module %s]"),
+ form_name, sect_offset_str (cu->header.sect_off), objf_name);
+ info_ptr = (str_offsets_section->buffer
+ + str_index * cu->header.offset_size);
+ if (cu->header.offset_size == 4)
+ str_offset = bfd_get_32 (abfd, info_ptr);
+ else
+ str_offset = bfd_get_64 (abfd, info_ptr);
+ if (str_offset >= str_section->size)
+ error (_("Offset from %s pointing outside of"
+ " .debug_str.dwo section in CU at offset %s [in module %s]"),
+ form_name, sect_offset_str (cu->header.sect_off), objf_name);
+ return (const char *) (str_section->buffer + str_offset);
+}
- for (i = 0; i < lh->standard_opcode_lengths[op_code]; i++)
- {
- (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
- line_ptr += bytes_read;
- }
- }
- }
- }
+/* Return the length of an LEB128 number in BUF. */
- if (!end_sequence)
- dwarf2_debug_line_missing_end_sequence_complaint ();
+static int
+leb128_size (const gdb_byte *buf)
+{
+ const gdb_byte *begin = buf;
+ gdb_byte byte;
- /* We got a DW_LNE_end_sequence (or we ran off the end of the buffer,
- in which case we still finish recording the last line). */
- state_machine.record_line (true);
+ while (1)
+ {
+ byte = *buf++;
+ if ((byte & 128) == 0)
+ return buf - begin;
}
}
-/* 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.
-
- 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.
-
- COMP_DIR is the compilation directory (DW_AT_comp_dir) or NULL if unknown.
- It is used for relative paths in the line table.
- NOTE: When processing partial symtabs (pst != NULL),
- comp_dir == pst->dirname.
-
- NOTE: It is important that psymtabs have the same file name (via strcmp)
- as the corresponding symtab. Since COMP_DIR is not used in the name of the
- symtab we don't use it in the name of the psymtabs we create.
- E.g. expand_line_sal requires this when finding psymtabs to expand.
- A good testcase for this is mb-inline.exp.
-
- LOWPC is the lowest address in CU (or 0 if not known).
-
- Boolean DECODE_MAPPING specifies we need to fully decode .debug_line
- for its PC<->lines mapping information. Otherwise only the filename
- table is read in. */
-
static void
-dwarf_decode_lines (struct line_header *lh, const char *comp_dir,
- struct dwarf2_cu *cu, struct partial_symtab *pst,
- CORE_ADDR lowpc, int decode_mapping)
+set_cu_language (unsigned int lang, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- const int decode_for_pst_p = (pst != NULL);
-
- if (decode_mapping)
- dwarf_decode_lines_1 (lh, cu, decode_for_pst_p, lowpc);
-
- if (decode_for_pst_p)
+ switch (lang)
{
- 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->file_names.size (); file_index++)
- if (lh->file_names[file_index].included_p == 1)
- {
- const char *include_name =
- psymtab_include_file_name (lh, file_index, pst, comp_dir);
- if (include_name != NULL)
- dwarf2_create_include_psymtab (include_name, pst, objfile);
- }
+ case DW_LANG_C89:
+ case DW_LANG_C99:
+ case DW_LANG_C11:
+ case DW_LANG_C:
+ case DW_LANG_UPC:
+ cu->language = language_c;
+ break;
+ case DW_LANG_Java:
+ case DW_LANG_C_plus_plus:
+ case DW_LANG_C_plus_plus_11:
+ case DW_LANG_C_plus_plus_14:
+ cu->language = language_cplus;
+ break;
+ case DW_LANG_D:
+ cu->language = language_d;
+ break;
+ case DW_LANG_Fortran77:
+ case DW_LANG_Fortran90:
+ case DW_LANG_Fortran95:
+ case DW_LANG_Fortran03:
+ case DW_LANG_Fortran08:
+ cu->language = language_fortran;
+ break;
+ case DW_LANG_Go:
+ cu->language = language_go;
+ break;
+ case DW_LANG_Mips_Assembler:
+ cu->language = language_asm;
+ break;
+ case DW_LANG_Ada83:
+ case DW_LANG_Ada95:
+ cu->language = language_ada;
+ break;
+ case DW_LANG_Modula2:
+ cu->language = language_m2;
+ break;
+ case DW_LANG_Pascal83:
+ cu->language = language_pascal;
+ break;
+ case DW_LANG_ObjC:
+ cu->language = language_objc;
+ break;
+ case DW_LANG_Rust:
+ case DW_LANG_Rust_old:
+ cu->language = language_rust;
+ break;
+ case DW_LANG_Cobol74:
+ case DW_LANG_Cobol85:
+ default:
+ cu->language = language_minimal;
+ break;
}
- else
+ cu->language_defn = language_def (cu->language);
+}
+
+/* Return the named attribute or NULL if not there. */
+
+static struct attribute *
+dwarf2_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu)
+{
+ for (;;)
{
- /* Make sure a symtab is created for every file, even files
- which contain only variables (i.e. no code with associated
- line numbers). */
- struct compunit_symtab *cust = buildsym_compunit_symtab ();
- int i;
+ unsigned int i;
+ struct attribute *spec = NULL;
- for (i = 0; i < lh->file_names.size (); i++)
+ for (i = 0; i < die->num_attrs; ++i)
{
- file_entry &fe = lh->file_names[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];
+ }
- dwarf2_start_subfile (fe.name, fe.include_dir (lh));
+ if (!spec)
+ break;
- if (current_subfile->symtab == NULL)
- {
- current_subfile->symtab
- = allocate_symtab (cust, current_subfile->name);
- }
- fe.symtab = current_subfile->symtab;
- }
+ die = follow_die_ref (die, spec, &cu);
}
+
+ return NULL;
}
-/* 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.
+/* Return the named attribute or NULL if not there,
+ but do not follow DW_AT_specification, etc.
+ This is for use in contexts where we're reading .debug_types dies.
+ Following DW_AT_specification, DW_AT_abstract_origin will take us
+ back up the chain, and we want to go down. */
- 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:
+static struct attribute *
+dwarf2_attr_no_follow (struct die_info *die, unsigned int name)
+{
+ unsigned int i;
- DW_AT_name: /srcdir/list0.c
- DW_AT_comp_dir: /compdir
- files.files[0].name: list0.h
- files.files[0].dir: /srcdir
- files.files[1].name: list0.c
- files.files[1].dir: /srcdir
+ for (i = 0; i < die->num_attrs; ++i)
+ if (die->attrs[i].name == name)
+ return &die->attrs[i];
- 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.
- start_subfile will ensure that this happens provided that we pass the
- concatenation of files.files[1].dir and files.files[1].name as the
- subfile's name. */
+ return NULL;
+}
-static void
-dwarf2_start_subfile (const char *filename, const char *dirname)
+/* Return the string associated with a string-typed attribute, or NULL if it
+ is either not found or is of an incorrect type. */
+
+static const char *
+dwarf2_string_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu)
{
- char *copy = NULL;
+ struct attribute *attr;
+ const char *str = NULL;
- /* In order not to lose the line information directory,
- we concatenate it to the filename when it makes sense.
- Note that the Dwarf3 standard says (speaking of filenames in line
- information): ``The directory index is ignored for file names
- that represent full path names''. Thus ignoring dirname in the
- `else' branch below isn't an issue. */
+ attr = dwarf2_attr (die, name, cu);
- if (!IS_ABSOLUTE_PATH (filename) && dirname != NULL)
+ if (attr != NULL)
{
- copy = concat (dirname, SLASH_STRING, filename, (char *)NULL);
- filename = copy;
+ if (attr->form == DW_FORM_strp || attr->form == DW_FORM_line_strp
+ || attr->form == DW_FORM_string
+ || attr->form == DW_FORM_GNU_str_index
+ || attr->form == DW_FORM_GNU_strp_alt)
+ str = DW_STRING (attr);
+ else
+ complaint (_("string type expected for attribute %s for "
+ "DIE at %s in module %s"),
+ dwarf_attr_name (name), sect_offset_str (die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
}
- start_subfile (filename);
-
- if (copy != NULL)
- xfree (copy);
+ return str;
}
-/* Start a symtab for DWARF.
- NAME, COMP_DIR, LOW_PC are passed to start_symtab. */
+/* 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 or DW_FORM_flag_present attributes. */
-static struct compunit_symtab *
-dwarf2_start_symtab (struct dwarf2_cu *cu,
- const char *name, const char *comp_dir, CORE_ADDR low_pc)
+static int
+dwarf2_flag_true_p (struct die_info *die, unsigned name, struct dwarf2_cu *cu)
{
- struct compunit_symtab *cust
- = start_symtab (cu->objfile, name, comp_dir, low_pc, cu->language);
+ struct attribute *attr = dwarf2_attr (die, name, cu);
- record_debugformat ("DWARF 2");
- record_producer (cu->producer);
+ return (attr && DW_UNSND (attr));
+}
- /* We assume that we're processing GCC output. */
- processing_gcc_compilation = 2;
+static int
+die_is_declaration (struct die_info *die, struct dwarf2_cu *cu)
+{
+ /* 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);
+}
- cu->processing_has_namespace_info = 0;
+/* Return the die giving the specification for DIE, if there is
+ one. *SPEC_CU is the CU containing DIE on input, and the CU
+ containing the return value on output. If there is no
+ specification, but there is an abstract origin, that is
+ returned. */
- return cust;
+static struct die_info *
+die_specification (struct die_info *die, struct dwarf2_cu **spec_cu)
+{
+ struct attribute *spec_attr = dwarf2_attr (die, DW_AT_specification,
+ *spec_cu);
+
+ if (spec_attr == NULL)
+ spec_attr = dwarf2_attr (die, DW_AT_abstract_origin, *spec_cu);
+
+ if (spec_attr == NULL)
+ return NULL;
+ else
+ return follow_die_ref (die, spec_attr, spec_cu);
}
+/* Stub for free_line_header to match void * callback types. */
+
static void
-var_decode_location (struct attribute *attr, struct symbol *sym,
- struct dwarf2_cu *cu)
+free_line_header_voidp (void *arg)
{
- struct objfile *objfile = cu->objfile;
- struct comp_unit_head *cu_header = &cu->header;
+ struct line_header *lh = (struct line_header *) arg;
- /* 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. */
+ delete lh;
+}
- /* 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_ACLASS_INDEX (sym) = LOC_OPTIMIZED_OUT;
- return;
- }
+void
+line_header::add_include_dir (const char *include_dir)
+{
+ if (dwarf_line_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "Adding dir %zu: %s\n",
+ include_dirs.size () + 1, include_dir);
- /* 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 or DW_OP_GNU_addr_index
- then mark this symbol as LOC_STATIC. */
+ include_dirs.push_back (include_dir);
+}
- if (attr_form_is_block (attr)
- && ((DW_BLOCK (attr)->data[0] == DW_OP_addr
- && DW_BLOCK (attr)->size == 1 + cu_header->addr_size)
- || (DW_BLOCK (attr)->data[0] == DW_OP_GNU_addr_index
- && (DW_BLOCK (attr)->size
- == 1 + leb128_size (&DW_BLOCK (attr)->data[1])))))
- {
- unsigned int dummy;
+void
+line_header::add_file_name (const char *name,
+ dir_index d_index,
+ unsigned int mod_time,
+ unsigned int length)
+{
+ if (dwarf_line_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "Adding file %u: %s\n",
+ (unsigned) file_names.size () + 1, name);
- if (DW_BLOCK (attr)->data[0] == DW_OP_addr)
- SYMBOL_VALUE_ADDRESS (sym) =
- read_address (objfile->obfd, DW_BLOCK (attr)->data + 1, cu, &dummy);
- else
- SYMBOL_VALUE_ADDRESS (sym) =
- read_addr_index_from_leb128 (cu, DW_BLOCK (attr)->data + 1, &dummy);
- SYMBOL_ACLASS_INDEX (sym) = LOC_STATIC;
- fixup_symbol_section (sym, objfile);
- SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets,
- SYMBOL_SECTION (sym));
- return;
- }
+ file_names.emplace_back (name, d_index, mod_time, length);
+}
- /* 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. */
+/* A convenience function to find the proper .debug_line section for a CU. */
- dwarf2_symbol_mark_computed (attr, sym, cu, 0);
+static struct dwarf2_section_info *
+get_debug_line_section (struct dwarf2_cu *cu)
+{
+ struct dwarf2_section_info *section;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- if (SYMBOL_COMPUTED_OPS (sym)->location_has_loclist)
- cu->has_loclist = 1;
+ /* For TUs in DWO files, the DW_AT_stmt_list attribute lives in the
+ DWO file. */
+ if (cu->dwo_unit && cu->per_cu->is_debug_types)
+ section = &cu->dwo_unit->dwo_file->sections.line;
+ else if (cu->per_cu->is_dwz)
+ {
+ struct dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
+
+ section = &dwz->line;
+ }
+ else
+ section = &dwarf2_per_objfile->line;
+
+ return section;
}
-/* 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
- used the passed type.
- If SPACE is not NULL, use it to hold the new symbol. If it is
- NULL, allocate a new symbol on the objfile's obstack. */
+/* Read directory or file name entry format, starting with byte of
+ format count entries, ULEB128 pairs of entry formats, ULEB128 of
+ entries count and the entries themselves in the described entry
+ format. */
-static struct symbol *
-new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
- struct symbol *space)
+static void
+read_formatted_entries (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ bfd *abfd, const gdb_byte **bufp,
+ struct line_header *lh,
+ const struct comp_unit_head *cu_header,
+ void (*callback) (struct line_header *lh,
+ const char *name,
+ dir_index d_index,
+ unsigned int mod_time,
+ unsigned int length))
{
- struct objfile *objfile = cu->objfile;
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct symbol *sym = NULL;
- const char *name;
- struct attribute *attr = NULL;
- struct attribute *attr2 = NULL;
- CORE_ADDR baseaddr;
- struct pending **list_to_add = NULL;
-
- int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
+ gdb_byte format_count, formati;
+ ULONGEST data_count, datai;
+ const gdb_byte *buf = *bufp;
+ const gdb_byte *format_header_data;
+ unsigned int bytes_read;
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ format_count = read_1_byte (abfd, buf);
+ buf += 1;
+ format_header_data = buf;
+ for (formati = 0; formati < format_count; formati++)
+ {
+ read_unsigned_leb128 (abfd, buf, &bytes_read);
+ buf += bytes_read;
+ read_unsigned_leb128 (abfd, buf, &bytes_read);
+ buf += bytes_read;
+ }
- name = dwarf2_name (die, cu);
- if (name)
+ data_count = read_unsigned_leb128 (abfd, buf, &bytes_read);
+ buf += bytes_read;
+ for (datai = 0; datai < data_count; datai++)
{
- const char *linkagename;
- int suppress_add = 0;
+ const gdb_byte *format = format_header_data;
+ struct file_entry fe;
- if (space)
- sym = space;
- else
- sym = allocate_symbol (objfile);
- OBJSTAT (objfile, n_syms++);
+ for (formati = 0; formati < format_count; formati++)
+ {
+ ULONGEST content_type = read_unsigned_leb128 (abfd, format, &bytes_read);
+ format += bytes_read;
- /* Cache this symbol's name and the name's demangled form (if any). */
- SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack);
- linkagename = dwarf2_physname (name, die, cu);
- SYMBOL_SET_NAMES (sym, linkagename, strlen (linkagename), 0, objfile);
+ ULONGEST form = read_unsigned_leb128 (abfd, format, &bytes_read);
+ format += bytes_read;
- /* Fortran does not have mangling standard and the mangling does differ
- between gfortran, iFort etc. */
- if (cu->language == language_fortran
- && symbol_get_demangled_name (&(sym->ginfo)) == NULL)
- symbol_set_demangled_name (&(sym->ginfo),
- dwarf2_full_name (name, die, cu),
- NULL);
+ gdb::optional<const char *> string;
+ gdb::optional<unsigned int> uint;
- /* Default assumptions.
- Use the passed type or decode it from the die. */
- SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
- SYMBOL_ACLASS_INDEX (sym) = LOC_OPTIMIZED_OUT;
- if (type != NULL)
- SYMBOL_TYPE (sym) = type;
- else
- SYMBOL_TYPE (sym) = die_type (die, cu);
- attr = dwarf2_attr (die,
- inlined_func ? DW_AT_call_line : DW_AT_decl_line,
- cu);
- if (attr)
- {
- SYMBOL_LINE (sym) = DW_UNSND (attr);
- }
+ switch (form)
+ {
+ case DW_FORM_string:
+ string.emplace (read_direct_string (abfd, buf, &bytes_read));
+ buf += bytes_read;
+ break;
- attr = dwarf2_attr (die,
- inlined_func ? DW_AT_call_file : DW_AT_decl_file,
- cu);
- if (attr)
- {
- file_name_index file_index = (file_name_index) DW_UNSND (attr);
- struct file_entry *fe;
+ case DW_FORM_line_strp:
+ string.emplace (read_indirect_line_string (dwarf2_per_objfile,
+ abfd, buf,
+ cu_header,
+ &bytes_read));
+ buf += bytes_read;
+ break;
- if (cu->line_header != NULL)
- fe = cu->line_header->file_name_at (file_index);
- else
- fe = NULL;
+ case DW_FORM_data1:
+ uint.emplace (read_1_byte (abfd, buf));
+ buf += 1;
+ break;
- if (fe == NULL)
- complaint (&symfile_complaints,
- _("file index out of range"));
- else
- symbol_set_symtab (sym, fe->symtab);
- }
+ case DW_FORM_data2:
+ uint.emplace (read_2_bytes (abfd, buf));
+ buf += 2;
+ break;
- switch (die->tag)
- {
- case DW_TAG_label:
- attr = dwarf2_attr (die, DW_AT_low_pc, cu);
- if (attr)
- {
- CORE_ADDR addr;
+ case DW_FORM_data4:
+ uint.emplace (read_4_bytes (abfd, buf));
+ buf += 4;
+ break;
- addr = attr_value_as_address (attr);
- addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr + baseaddr);
- SYMBOL_VALUE_ADDRESS (sym) = addr;
- }
- SYMBOL_TYPE (sym) = objfile_type (objfile)->builtin_core_addr;
- SYMBOL_DOMAIN (sym) = LABEL_DOMAIN;
- SYMBOL_ACLASS_INDEX (sym) = LOC_LABEL;
- add_symbol_to_list (sym, cu->list_in_scope);
- break;
- case DW_TAG_subprogram:
- /* SYMBOL_BLOCK_VALUE (sym) will be filled in later by
- finish_block. */
- SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
- attr2 = dwarf2_attr (die, DW_AT_external, cu);
- if ((attr2 && (DW_UNSND (attr2) != 0))
- || cu->language == language_ada)
- {
- /* Subprograms marked external are stored as a global symbol.
- Ada subprograms, whether marked external or not, are always
- stored as a global symbol, because we want to be able to
- access them globally. For instance, we want to be able
- to break on a nested subprogram without having to
- specify the context. */
- list_to_add = &global_symbols;
+ case DW_FORM_data8:
+ uint.emplace (read_8_bytes (abfd, buf));
+ buf += 8;
+ break;
+
+ case DW_FORM_udata:
+ uint.emplace (read_unsigned_leb128 (abfd, buf, &bytes_read));
+ buf += bytes_read;
+ break;
+
+ case DW_FORM_block:
+ /* It is valid only for DW_LNCT_timestamp which is ignored by
+ current GDB. */
+ break;
}
- else
+
+ switch (content_type)
{
- list_to_add = cu->list_in_scope;
- }
- break;
- case DW_TAG_inlined_subroutine:
- /* SYMBOL_BLOCK_VALUE (sym) will be filled in later by
- finish_block. */
- SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
- SYMBOL_INLINED (sym) = 1;
- list_to_add = cu->list_in_scope;
- break;
- case DW_TAG_template_value_param:
- suppress_add = 1;
- /* Fall through. */
- case DW_TAG_constant:
- case DW_TAG_variable:
- case DW_TAG_member:
- /* 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) = objfile_type (objfile)->builtin_int;
-
- attr = dwarf2_attr (die, DW_AT_const_value, cu);
- /* In the case of DW_TAG_member, we should only be called for
- static const members. */
- if (die->tag == DW_TAG_member)
- {
- /* dwarf2_add_field uses die_is_declaration,
- so we do the same. */
- gdb_assert (die_is_declaration (die, cu));
- gdb_assert (attr);
- }
- if (attr)
- {
- dwarf2_const_value (attr, sym, cu);
- attr2 = dwarf2_attr (die, DW_AT_external, cu);
- if (!suppress_add)
- {
- if (attr2 && (DW_UNSND (attr2) != 0))
- list_to_add = &global_symbols;
- else
- list_to_add = cu->list_in_scope;
- }
- break;
- }
- attr = dwarf2_attr (die, DW_AT_location, cu);
- if (attr)
- {
- var_decode_location (attr, sym, cu);
- attr2 = dwarf2_attr (die, DW_AT_external, cu);
-
- /* Fortran explicitly imports any global symbols to the local
- scope by DW_TAG_common_block. */
- if (cu->language == language_fortran && die->parent
- && die->parent->tag == DW_TAG_common_block)
- attr2 = NULL;
-
- if (SYMBOL_CLASS (sym) == LOC_STATIC
- && SYMBOL_VALUE_ADDRESS (sym) == 0
- && !dwarf2_per_objfile->has_section_at_zero)
- {
- /* When a static variable is eliminated by the linker,
- the corresponding debug information is not stripped
- out, but the variable address is set to null;
- do not add such variables into symbol table. */
- }
- else if (attr2 && (DW_UNSND (attr2) != 0))
- {
- /* Workaround gfortran PR debug/40040 - it uses
- DW_AT_location for variables in -fPIC libraries which may
- get overriden by other libraries/executable and get
- a different address. Resolve it by the minimal symbol
- which may come from inferior's executable using copy
- relocation. Make this workaround only for gfortran as for
- other compilers GDB cannot guess the minimal symbol
- Fortran mangling kind. */
- if (cu->language == language_fortran && die->parent
- && die->parent->tag == DW_TAG_module
- && cu->producer
- && startswith (cu->producer, "GNU Fortran"))
- SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED;
-
- /* A variable with DW_AT_external is never static,
- but it may be block-scoped. */
- list_to_add = (cu->list_in_scope == &file_symbols
- ? &global_symbols : cu->list_in_scope);
- }
- else
- list_to_add = cu->list_in_scope;
- }
- else
- {
- /* We do not know the address of this symbol.
- 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. */
- attr2 = dwarf2_attr (die, DW_AT_external, cu);
-
- /* Fortran explicitly imports any global symbols to the local
- scope by DW_TAG_common_block. */
- if (cu->language == language_fortran && die->parent
- && die->parent->tag == DW_TAG_common_block)
- {
- /* SYMBOL_CLASS doesn't matter here because
- read_common_block is going to reset it. */
- if (!suppress_add)
- list_to_add = cu->list_in_scope;
- }
- else if (attr2 && (DW_UNSND (attr2) != 0)
- && dwarf2_attr (die, DW_AT_type, cu) != NULL)
- {
- /* A variable with DW_AT_external is never static, but it
- may be block-scoped. */
- list_to_add = (cu->list_in_scope == &file_symbols
- ? &global_symbols : cu->list_in_scope);
-
- SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED;
- }
- else if (!die_is_declaration (die, cu))
- {
- /* Use the default LOC_OPTIMIZED_OUT class. */
- gdb_assert (SYMBOL_CLASS (sym) == LOC_OPTIMIZED_OUT);
- if (!suppress_add)
- list_to_add = cu->list_in_scope;
- }
- }
- break;
- case DW_TAG_formal_parameter:
- /* If we are inside a function, mark this as an argument. If
- not, we might be looking at an argument to an inlined function
- when we do not have enough information to show inlined frames;
- pretend it's a local variable in that case so that the user can
- still see it. */
- if (context_stack_depth > 0
- && context_stack[context_stack_depth - 1].name != NULL)
- SYMBOL_IS_ARGUMENT (sym) = 1;
- attr = dwarf2_attr (die, DW_AT_location, cu);
- if (attr)
- {
- var_decode_location (attr, sym, cu);
- }
- attr = dwarf2_attr (die, DW_AT_const_value, cu);
- if (attr)
- {
- dwarf2_const_value (attr, sym, cu);
- }
-
- list_to_add = cu->list_in_scope;
- 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_template_type_param:
- suppress_add = 1;
- /* Fall through. */
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- case DW_TAG_set_type:
- case DW_TAG_enumeration_type:
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
-
- {
- /* 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. */
-
- if (!suppress_add)
- {
- list_to_add = (cu->list_in_scope == &file_symbols
- && cu->language == language_cplus
- ? &global_symbols : cu->list_in_scope);
-
- /* The semantics of C++ state that "struct foo {
- ... }" also defines a typedef for "foo". */
- if (cu->language == language_cplus
- || cu->language == language_ada
- || cu->language == language_d
- || cu->language == language_rust)
- {
- /* The symbol's name is already allocated along
- with this objfile, so we don't need to
- duplicate it for the type. */
- if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
- TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_SEARCH_NAME (sym);
- }
- }
- }
- break;
- case DW_TAG_typedef:
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
- list_to_add = cu->list_in_scope;
- break;
- case DW_TAG_base_type:
- case DW_TAG_subrange_type:
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
- list_to_add = cu->list_in_scope;
- break;
- case DW_TAG_enumerator:
- attr = dwarf2_attr (die, DW_AT_const_value, cu);
- if (attr)
- {
- dwarf2_const_value (attr, sym, cu);
- }
- {
- /* NOTE: carlton/2003-11-10: See comment above in the
- DW_TAG_class_type, etc. block. */
-
- list_to_add = (cu->list_in_scope == &file_symbols
- && cu->language == language_cplus
- ? &global_symbols : cu->list_in_scope);
- }
- break;
- case DW_TAG_imported_declaration:
- case DW_TAG_namespace:
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- list_to_add = &global_symbols;
- break;
- case DW_TAG_module:
- SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
- SYMBOL_DOMAIN (sym) = MODULE_DOMAIN;
- list_to_add = &global_symbols;
- break;
- case DW_TAG_common_block:
- SYMBOL_ACLASS_INDEX (sym) = LOC_COMMON_BLOCK;
- SYMBOL_DOMAIN (sym) = COMMON_BLOCK_DOMAIN;
- add_symbol_to_list (sym, cu->list_in_scope);
- break;
- 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. */
- complaint (&symfile_complaints, _("unsupported tag: '%s'"),
- dwarf_tag_name (die->tag));
- break;
- }
-
- if (suppress_add)
- {
- sym->hash_next = objfile->template_symbols;
- objfile->template_symbols = sym;
- list_to_add = NULL;
- }
-
- if (list_to_add != NULL)
- add_symbol_to_list (sym, list_to_add);
-
- /* For the benefit of old versions of GCC, check for anonymous
- namespaces based on the demangled name. */
- if (!cu->processing_has_namespace_info
- && cu->language == language_cplus)
- cp_scan_for_anonymous_namespaces (sym, objfile);
- }
- return (sym);
-}
-
-/* A wrapper for new_symbol_full that always allocates a new symbol. */
-
-static struct symbol *
-new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
-{
- return new_symbol_full (die, type, cu, NULL);
-}
-
-/* Given an attr with a DW_FORM_dataN value in host byte order,
- zero-extend it as appropriate for the symbol's type. The DWARF
- standard (v4) is not entirely clear about the meaning of using
- DW_FORM_dataN for a constant with a signed type, where the type is
- wider than the data. The conclusion of a discussion on the DWARF
- list was that this is unspecified. We choose to always zero-extend
- because that is the interpretation long in use by GCC. */
-
-static gdb_byte *
-dwarf2_const_value_data (const struct attribute *attr, struct obstack *obstack,
- struct dwarf2_cu *cu, LONGEST *value, int bits)
-{
- struct objfile *objfile = cu->objfile;
- enum bfd_endian byte_order = bfd_big_endian (objfile->obfd) ?
- BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE;
- LONGEST l = DW_UNSND (attr);
-
- if (bits < sizeof (*value) * 8)
- {
- l &= ((LONGEST) 1 << bits) - 1;
- *value = l;
- }
- else if (bits == sizeof (*value) * 8)
- *value = l;
- else
- {
- gdb_byte *bytes = (gdb_byte *) obstack_alloc (obstack, bits / 8);
- store_unsigned_integer (bytes, bits / 8, byte_order, l);
- return bytes;
- }
-
- return NULL;
-}
-
-/* Read a constant value from an attribute. Either set *VALUE, or if
- the value does not fit in *VALUE, set *BYTES - either already
- allocated on the objfile obstack, or newly allocated on OBSTACK,
- or, set *BATON, if we translated the constant to a location
- expression. */
-
-static void
-dwarf2_const_value_attr (const struct attribute *attr, struct type *type,
- const char *name, struct obstack *obstack,
- struct dwarf2_cu *cu,
- LONGEST *value, const gdb_byte **bytes,
- struct dwarf2_locexpr_baton **baton)
-{
- struct objfile *objfile = cu->objfile;
- struct comp_unit_head *cu_header = &cu->header;
- struct dwarf_block *blk;
- enum bfd_endian byte_order = (bfd_big_endian (objfile->obfd) ?
- BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE);
-
- *value = 0;
- *bytes = NULL;
- *baton = NULL;
-
- switch (attr->form)
- {
- case DW_FORM_addr:
- case DW_FORM_GNU_addr_index:
- {
- gdb_byte *data;
-
- if (TYPE_LENGTH (type) != cu_header->addr_size)
- dwarf2_const_value_length_mismatch_complaint (name,
- cu_header->addr_size,
- TYPE_LENGTH (type));
- /* Symbols of this form are reasonably rare, so we just
- piggyback on the existing location code rather than writing
- a new implementation of symbol_computed_ops. */
- *baton = XOBNEW (obstack, struct dwarf2_locexpr_baton);
- (*baton)->per_cu = cu->per_cu;
- gdb_assert ((*baton)->per_cu);
-
- (*baton)->size = 2 + cu_header->addr_size;
- data = (gdb_byte *) obstack_alloc (obstack, (*baton)->size);
- (*baton)->data = data;
-
- data[0] = DW_OP_addr;
- store_unsigned_integer (&data[1], cu_header->addr_size,
- byte_order, DW_ADDR (attr));
- data[cu_header->addr_size + 1] = DW_OP_stack_value;
- }
- break;
- case DW_FORM_string:
- case DW_FORM_strp:
- case DW_FORM_GNU_str_index:
- case DW_FORM_GNU_strp_alt:
- /* DW_STRING is already allocated on the objfile obstack, point
- directly to it. */
- *bytes = (const gdb_byte *) DW_STRING (attr);
- break;
- case DW_FORM_block1:
- case DW_FORM_block2:
- case DW_FORM_block4:
- case DW_FORM_block:
- case DW_FORM_exprloc:
- case DW_FORM_data16:
- blk = DW_BLOCK (attr);
- if (TYPE_LENGTH (type) != blk->size)
- dwarf2_const_value_length_mismatch_complaint (name, blk->size,
- TYPE_LENGTH (type));
- *bytes = blk->data;
- break;
-
- /* 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:
- *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 8);
- break;
- case DW_FORM_data2:
- *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 16);
- break;
- case DW_FORM_data4:
- *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 32);
- break;
- case DW_FORM_data8:
- *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 64);
- break;
-
- case DW_FORM_sdata:
- case DW_FORM_implicit_const:
- *value = DW_SND (attr);
- break;
-
- case DW_FORM_udata:
- *value = DW_UNSND (attr);
- break;
-
- default:
- complaint (&symfile_complaints,
- _("unsupported const value attribute form: '%s'"),
- dwarf_form_name (attr->form));
- *value = 0;
- break;
- }
-}
-
-
-/* Copy constant value from an attribute to a symbol. */
-
-static void
-dwarf2_const_value (const struct attribute *attr, struct symbol *sym,
- struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- LONGEST value;
- const gdb_byte *bytes;
- struct dwarf2_locexpr_baton *baton;
-
- dwarf2_const_value_attr (attr, SYMBOL_TYPE (sym),
- SYMBOL_PRINT_NAME (sym),
- &objfile->objfile_obstack, cu,
- &value, &bytes, &baton);
-
- if (baton != NULL)
- {
- SYMBOL_LOCATION_BATON (sym) = baton;
- SYMBOL_ACLASS_INDEX (sym) = dwarf2_locexpr_index;
- }
- else if (bytes != NULL)
- {
- SYMBOL_VALUE_BYTES (sym) = bytes;
- SYMBOL_ACLASS_INDEX (sym) = LOC_CONST_BYTES;
- }
- else
- {
- SYMBOL_VALUE (sym) = value;
- SYMBOL_ACLASS_INDEX (sym) = LOC_CONST;
- }
-}
-
-/* Return the type of the die in question using its DW_AT_type attribute. */
-
-static struct type *
-die_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *type_attr;
+ case DW_LNCT_path:
+ if (string.has_value ())
+ fe.name = *string;
+ break;
+ case DW_LNCT_directory_index:
+ if (uint.has_value ())
+ fe.d_index = (dir_index) *uint;
+ break;
+ case DW_LNCT_timestamp:
+ if (uint.has_value ())
+ fe.mod_time = *uint;
+ break;
+ case DW_LNCT_size:
+ if (uint.has_value ())
+ fe.length = *uint;
+ break;
+ case DW_LNCT_MD5:
+ break;
+ default:
+ complaint (_("Unknown format content type %s"),
+ pulongest (content_type));
+ }
+ }
- type_attr = dwarf2_attr (die, DW_AT_type, cu);
- if (!type_attr)
- {
- /* A missing DW_AT_type represents a void type. */
- return objfile_type (cu->objfile)->builtin_void;
+ callback (lh, fe.name, fe.d_index, fe.mod_time, fe.length);
}
- return lookup_die_type (die, type_attr, cu);
-}
-
-/* True iff CU's producer generates GNAT Ada auxiliary information
- that allows to find parallel types through that information instead
- of having to do expensive parallel lookups by type name. */
-
-static int
-need_gnat_info (struct dwarf2_cu *cu)
-{
- /* FIXME: brobecker/2010-10-12: As of now, only the AdaCore version
- of GNAT produces this auxiliary information, without any indication
- that it is produced. Part of enhancing the FSF version of GNAT
- to produce that information will be to put in place an indicator
- that we can use in order to determine whether the descriptive type
- info is available or not. One suggestion that has been made is
- to use a new attribute, attached to the CU die. For now, assume
- that the descriptive type info is not available. */
- return 0;
+ *bufp = buf;
}
-/* Return the auxiliary type of the die in question using its
- DW_AT_GNAT_descriptive_type attribute. Returns NULL if the
- attribute is not present. */
-
-static struct type *
-die_descriptive_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *type_attr;
-
- type_attr = dwarf2_attr (die, DW_AT_GNAT_descriptive_type, cu);
- if (!type_attr)
- return NULL;
-
- return lookup_die_type (die, type_attr, cu);
-}
+/* Read the statement program header starting at OFFSET in
+ .debug_line, or .debug_line.dwo. Return a pointer
+ to a struct line_header, allocated using xmalloc.
+ Returns NULL if there is a problem reading the header, e.g., if it
+ has a version we don't understand.
-/* If DIE has a descriptive_type attribute, then set the TYPE's
- descriptive type accordingly. */
+ NOTE: the strings in the include directory and file name tables of
+ the returned object point into the dwarf line section buffer,
+ and must not be freed. */
-static void
-set_descriptive_type (struct type *type, struct die_info *die,
- struct dwarf2_cu *cu)
+static line_header_up
+dwarf_decode_line_header (sect_offset sect_off, struct dwarf2_cu *cu)
{
- struct type *descriptive_type = die_descriptive_type (die, cu);
+ const gdb_byte *line_ptr;
+ unsigned int bytes_read, offset_size;
+ int i;
+ const char *cur_dir, *cur_file;
+ struct dwarf2_section_info *section;
+ bfd *abfd;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- if (descriptive_type)
+ section = get_debug_line_section (cu);
+ dwarf2_read_section (dwarf2_per_objfile->objfile, section);
+ if (section->buffer == NULL)
{
- ALLOCATE_GNAT_AUX_TYPE (type);
- TYPE_DESCRIPTIVE_TYPE (type) = descriptive_type;
+ if (cu->dwo_unit && cu->per_cu->is_debug_types)
+ complaint (_("missing .debug_line.dwo section"));
+ else
+ complaint (_("missing .debug_line section"));
+ return 0;
}
-}
-
-/* Return the containing type of the die in question using its
- DW_AT_containing_type attribute. */
-
-static struct type *
-die_containing_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *type_attr;
- type_attr = dwarf2_attr (die, DW_AT_containing_type, cu);
- if (!type_attr)
- error (_("Dwarf Error: Problem turning containing type into gdb type "
- "[in module %s]"), objfile_name (cu->objfile));
-
- return lookup_die_type (die, type_attr, cu);
-}
-
-/* Return an error marker type to use for the ill formed type in DIE/CU. */
-
-static struct type *
-build_error_marker_type (struct dwarf2_cu *cu, struct die_info *die)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- char *message, *saved;
-
- message = xstrprintf (_("<unknown type in %s, CU 0x%x, DIE 0x%x>"),
- objfile_name (objfile),
- to_underlying (cu->header.sect_off),
- to_underlying (die->sect_off));
- saved = (char *) obstack_copy0 (&objfile->objfile_obstack,
- message, strlen (message));
- xfree (message);
-
- return init_type (objfile, TYPE_CODE_ERROR, 0, saved);
-}
+ /* We can't do this until we know the section is non-empty.
+ Only then do we know we have such a section. */
+ abfd = get_section_bfd_owner (section);
-/* Look up the type of DIE in CU using its type attribute ATTR.
- ATTR must be one of: DW_AT_type, DW_AT_GNAT_descriptive_type,
- DW_AT_containing_type.
- If there is no type substitute an error marker. */
+ /* 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. */
+ if (to_underlying (sect_off) + 4 >= section->size)
+ {
+ dwarf2_statement_list_fits_in_line_number_section_complaint ();
+ return 0;
+ }
-static struct type *
-lookup_die_type (struct die_info *die, const struct attribute *attr,
- struct dwarf2_cu *cu)
-{
- struct objfile *objfile = cu->objfile;
- struct type *this_type;
+ line_header_up lh (new line_header ());
- gdb_assert (attr->name == DW_AT_type
- || attr->name == DW_AT_GNAT_descriptive_type
- || attr->name == DW_AT_containing_type);
+ lh->sect_off = sect_off;
+ lh->offset_in_dwz = cu->per_cu->is_dwz;
- /* First see if we have it cached. */
+ line_ptr = section->buffer + to_underlying (sect_off);
- if (attr->form == DW_FORM_GNU_ref_alt)
+ /* Read in the header. */
+ lh->total_length =
+ read_checked_initial_length_and_offset (abfd, line_ptr, &cu->header,
+ &bytes_read, &offset_size);
+ line_ptr += bytes_read;
+ if (line_ptr + lh->total_length > (section->buffer + section->size))
{
- struct dwarf2_per_cu_data *per_cu;
- sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
-
- per_cu = dwarf2_find_containing_comp_unit (sect_off, 1, cu->objfile);
- this_type = get_die_type_at_offset (sect_off, per_cu);
+ dwarf2_statement_list_fits_in_line_number_section_complaint ();
+ return 0;
}
- else if (attr_form_is_ref (attr))
+ lh->statement_program_end = line_ptr + lh->total_length;
+ lh->version = read_2_bytes (abfd, line_ptr);
+ line_ptr += 2;
+ if (lh->version > 5)
{
- sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
-
- this_type = get_die_type_at_offset (sect_off, cu->per_cu);
+ /* This is a version we don't understand. The format could have
+ changed in ways we don't handle properly so just punt. */
+ complaint (_("unsupported version in .debug_line section"));
+ return NULL;
}
- else if (attr->form == DW_FORM_ref_sig8)
+ if (lh->version >= 5)
{
- ULONGEST signature = DW_SIGNATURE (attr);
+ gdb_byte segment_selector_size;
- return get_signatured_type (die, signature, cu);
+ /* Skip address size. */
+ read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
+
+ segment_selector_size = read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
+ if (segment_selector_size != 0)
+ {
+ complaint (_("unsupported segment selector size %u "
+ "in .debug_line section"),
+ segment_selector_size);
+ return NULL;
+ }
}
- else
+ lh->header_length = read_offset_1 (abfd, line_ptr, offset_size);
+ line_ptr += offset_size;
+ lh->minimum_instruction_length = read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
+ if (lh->version >= 4)
{
- complaint (&symfile_complaints,
- _("Dwarf Error: Bad type attribute %s in DIE"
- " at 0x%x [in module %s]"),
- dwarf_attr_name (attr->name), to_underlying (die->sect_off),
- objfile_name (objfile));
- return build_error_marker_type (cu, die);
+ lh->maximum_ops_per_instruction = read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
}
+ else
+ lh->maximum_ops_per_instruction = 1;
- /* If not cached we need to read it in. */
-
- if (this_type == NULL)
+ if (lh->maximum_ops_per_instruction == 0)
{
- struct die_info *type_die = NULL;
- struct dwarf2_cu *type_cu = cu;
-
- if (attr_form_is_ref (attr))
- type_die = follow_die_ref (die, attr, &type_cu);
- if (type_die == NULL)
- return build_error_marker_type (cu, die);
- /* If we find the type now, it's probably because the type came
- from an inter-CU reference and the type's CU got expanded before
- ours. */
- this_type = read_type_die (type_die, type_cu);
+ lh->maximum_ops_per_instruction = 1;
+ complaint (_("invalid maximum_ops_per_instruction "
+ "in `.debug_line' section"));
}
- /* If we still don't have a type use an error marker. */
+ 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.reset (new unsigned char[lh->opcode_base]);
- if (this_type == NULL)
- return build_error_marker_type (cu, die);
+ 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;
+ }
- return this_type;
-}
+ if (lh->version >= 5)
+ {
+ /* Read directory table. */
+ read_formatted_entries (dwarf2_per_objfile, abfd, &line_ptr, lh.get (),
+ &cu->header,
+ [] (struct line_header *lh, const char *name,
+ dir_index d_index, unsigned int mod_time,
+ unsigned int length)
+ {
+ lh->add_include_dir (name);
+ });
-/* Return the type in DIE, CU.
- Returns NULL for invalid types.
+ /* Read file name table. */
+ read_formatted_entries (dwarf2_per_objfile, abfd, &line_ptr, lh.get (),
+ &cu->header,
+ [] (struct line_header *lh, const char *name,
+ dir_index d_index, unsigned int mod_time,
+ unsigned int length)
+ {
+ lh->add_file_name (name, d_index, mod_time, length);
+ });
+ }
+ else
+ {
+ /* Read directory table. */
+ while ((cur_dir = read_direct_string (abfd, line_ptr, &bytes_read)) != NULL)
+ {
+ line_ptr += bytes_read;
+ lh->add_include_dir (cur_dir);
+ }
+ line_ptr += bytes_read;
- This first does a lookup in die_type_hash,
- and only reads the die in if necessary.
+ /* Read file name table. */
+ while ((cur_file = read_direct_string (abfd, line_ptr, &bytes_read)) != NULL)
+ {
+ unsigned int mod_time, length;
+ dir_index d_index;
- NOTE: This can be called when reading in partial or full symbols. */
+ line_ptr += bytes_read;
+ d_index = (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;
-static struct type *
-read_type_die (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct type *this_type;
+ lh->add_file_name (cur_file, d_index, mod_time, length);
+ }
+ line_ptr += bytes_read;
+ }
+ lh->statement_program_start = line_ptr;
- this_type = get_die_type (die, cu);
- if (this_type)
- return this_type;
+ if (line_ptr > (section->buffer + section->size))
+ complaint (_("line number info header doesn't "
+ "fit in `.debug_line' section"));
- return read_type_die_1 (die, cu);
+ return lh;
}
-/* Read the type in DIE, CU.
- Returns NULL for invalid types. */
+/* Subroutine of dwarf_decode_lines to simplify it.
+ Return the file name of the psymtab for included file FILE_INDEX
+ in line header LH of PST.
+ COMP_DIR is the compilation directory (DW_AT_comp_dir) or NULL if unknown.
+ If space for the result is malloc'd, *NAME_HOLDER will be set.
+ Returns NULL if FILE_INDEX should be ignored, i.e., it is pst->filename. */
-static struct type *
-read_type_die_1 (struct die_info *die, struct dwarf2_cu *cu)
+static const char *
+psymtab_include_file_name (const struct line_header *lh, int file_index,
+ const struct partial_symtab *pst,
+ const char *comp_dir,
+ gdb::unique_xmalloc_ptr<char> *name_holder)
{
- struct type *this_type = NULL;
+ const file_entry &fe = lh->file_names[file_index];
+ const char *include_name = fe.name;
+ const char *include_name_to_compare = include_name;
+ const char *pst_filename;
+ int file_is_pst;
- switch (die->tag)
+ const char *dir_name = fe.include_dir (lh);
+
+ gdb::unique_xmalloc_ptr<char> hold_compare;
+ if (!IS_ABSOLUTE_PATH (include_name)
+ && (dir_name != NULL || comp_dir != NULL))
{
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- this_type = read_structure_type (die, cu);
- break;
- case DW_TAG_enumeration_type:
- this_type = read_enumeration_type (die, cu);
- break;
- case DW_TAG_subprogram:
- case DW_TAG_subroutine_type:
- case DW_TAG_inlined_subroutine:
- this_type = read_subroutine_type (die, cu);
- break;
- case DW_TAG_array_type:
- this_type = read_array_type (die, cu);
- break;
- case DW_TAG_set_type:
- this_type = read_set_type (die, cu);
- break;
- case DW_TAG_pointer_type:
- this_type = read_tag_pointer_type (die, cu);
- break;
- case DW_TAG_ptr_to_member_type:
- this_type = read_tag_ptr_to_member_type (die, cu);
- break;
- case DW_TAG_reference_type:
- this_type = read_tag_reference_type (die, cu, TYPE_CODE_REF);
- break;
- case DW_TAG_rvalue_reference_type:
- this_type = read_tag_reference_type (die, cu, TYPE_CODE_RVALUE_REF);
- break;
- case DW_TAG_const_type:
- this_type = read_tag_const_type (die, cu);
- break;
- case DW_TAG_volatile_type:
- this_type = read_tag_volatile_type (die, cu);
- break;
- case DW_TAG_restrict_type:
- this_type = read_tag_restrict_type (die, cu);
- break;
- case DW_TAG_string_type:
- this_type = read_tag_string_type (die, cu);
- break;
- case DW_TAG_typedef:
- this_type = read_typedef (die, cu);
- break;
- case DW_TAG_subrange_type:
- this_type = read_subrange_type (die, cu);
- break;
- case DW_TAG_base_type:
- this_type = read_base_type (die, cu);
- break;
- case DW_TAG_unspecified_type:
- this_type = read_unspecified_type (die, cu);
- break;
- case DW_TAG_namespace:
- this_type = read_namespace_type (die, cu);
- break;
- case DW_TAG_module:
- this_type = read_module_type (die, cu);
- break;
- case DW_TAG_atomic_type:
- this_type = read_tag_atomic_type (die, cu);
- break;
- default:
- complaint (&symfile_complaints,
- _("unexpected tag in read_type_die: '%s'"),
- dwarf_tag_name (die->tag));
- break;
- }
+ /* Avoid creating a duplicate psymtab for PST.
+ We do this by comparing INCLUDE_NAME and PST_FILENAME.
+ Before we do the comparison, however, we need to account
+ for DIR_NAME and COMP_DIR.
+ First prepend dir_name (if non-NULL). If we still don't
+ have an absolute path prepend comp_dir (if non-NULL).
+ However, the directory we record in the include-file's
+ psymtab does not contain COMP_DIR (to match the
+ corresponding symtab(s)).
- return this_type;
-}
+ Example:
-/* 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.
- Return the computed name or NULL.
- Space for the result is allocated on the objfile's obstack.
- This is the full-die version of guess_partial_die_structure_name.
- In this case we know DIE has no useful parent. */
+ bash$ cd /tmp
+ bash$ gcc -g ./hello.c
+ include_name = "hello.c"
+ dir_name = "."
+ DW_AT_comp_dir = comp_dir = "/tmp"
+ DW_AT_name = "./hello.c"
-static char *
-guess_full_die_structure_name (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct die_info *spec_die;
- struct dwarf2_cu *spec_cu;
- struct die_info *child;
+ */
- spec_cu = cu;
- spec_die = die_specification (die, &spec_cu);
- if (spec_die != NULL)
- {
- die = spec_die;
- cu = spec_cu;
+ if (dir_name != NULL)
+ {
+ name_holder->reset (concat (dir_name, SLASH_STRING,
+ include_name, (char *) NULL));
+ include_name = name_holder->get ();
+ include_name_to_compare = include_name;
+ }
+ if (!IS_ABSOLUTE_PATH (include_name) && comp_dir != NULL)
+ {
+ hold_compare.reset (concat (comp_dir, SLASH_STRING,
+ include_name, (char *) NULL));
+ include_name_to_compare = hold_compare.get ();
+ }
}
- for (child = die->child;
- child != NULL;
- child = child->sibling)
+ pst_filename = pst->filename;
+ gdb::unique_xmalloc_ptr<char> copied_name;
+ if (!IS_ABSOLUTE_PATH (pst_filename) && pst->dirname != NULL)
{
- if (child->tag == DW_TAG_subprogram)
- {
- const char *linkage_name = dw2_linkage_name (child, cu);
+ copied_name.reset (concat (pst->dirname, SLASH_STRING,
+ pst_filename, (char *) NULL));
+ pst_filename = copied_name.get ();
+ }
- if (linkage_name != NULL)
- {
- char *actual_name
- = language_class_name_from_physname (cu->language_defn,
- linkage_name);
- char *name = NULL;
+ file_is_pst = FILENAME_CMP (include_name_to_compare, pst_filename) == 0;
- if (actual_name != NULL)
- {
- const char *die_name = dwarf2_name (die, cu);
+ if (file_is_pst)
+ return NULL;
+ return include_name;
+}
- if (die_name != NULL
- && strcmp (die_name, actual_name) != 0)
- {
- /* Strip off the class name from the full name.
- We want the prefix. */
- int die_name_len = strlen (die_name);
- int actual_name_len = strlen (actual_name);
+/* State machine to track the state of the line number program. */
- /* Test for '::' as a sanity check. */
- if (actual_name_len > die_name_len + 2
- && actual_name[actual_name_len
- - die_name_len - 1] == ':')
- name = (char *) obstack_copy0 (
- &cu->objfile->per_bfd->storage_obstack,
- actual_name, actual_name_len - die_name_len - 2);
- }
- }
- xfree (actual_name);
- return name;
- }
- }
- }
+class lnp_state_machine
+{
+public:
+ /* Initialize a machine state for the start of a line number
+ program. */
+ lnp_state_machine (gdbarch *arch, line_header *lh, bool record_lines_p);
- return NULL;
-}
+ file_entry *current_file ()
+ {
+ /* lh->file_names is 0-based, but the file name numbers in the
+ statement program are 1-based. */
+ return m_line_header->file_name_at (m_file);
+ }
-/* GCC might emit a nameless typedef that has a linkage name. Determine the
- prefix part in such case. See
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
+ /* Record the line in the state machine. END_SEQUENCE is true if
+ we're processing the end of a sequence. */
+ void record_line (bool end_sequence);
-static const char *
-anonymous_struct_prefix (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct attribute *attr;
- const char *base;
+ /* Check address and if invalid nop-out the rest of the lines in this
+ sequence. */
+ void check_line_address (struct dwarf2_cu *cu,
+ const gdb_byte *line_ptr,
+ CORE_ADDR lowpc, CORE_ADDR address);
- if (die->tag != DW_TAG_class_type && die->tag != DW_TAG_interface_type
- && die->tag != DW_TAG_structure_type && die->tag != DW_TAG_union_type)
- return NULL;
+ void handle_set_discriminator (unsigned int discriminator)
+ {
+ m_discriminator = discriminator;
+ m_line_has_non_zero_discriminator |= discriminator != 0;
+ }
- if (dwarf2_string_attr (die, DW_AT_name, cu) != NULL)
- return NULL;
+ /* Handle DW_LNE_set_address. */
+ void handle_set_address (CORE_ADDR baseaddr, CORE_ADDR address)
+ {
+ m_op_index = 0;
+ address += baseaddr;
+ m_address = gdbarch_adjust_dwarf2_line (m_gdbarch, address, false);
+ }
- attr = dw2_linkage_name_attr (die, cu);
- if (attr == NULL || DW_STRING (attr) == NULL)
- return NULL;
+ /* Handle DW_LNS_advance_pc. */
+ void handle_advance_pc (CORE_ADDR adjust);
- /* dwarf2_name had to be already called. */
- gdb_assert (DW_STRING_IS_CANONICAL (attr));
+ /* Handle a special opcode. */
+ void handle_special_opcode (unsigned char op_code);
- /* Strip the base name, keep any leading namespaces/classes. */
- base = strrchr (DW_STRING (attr), ':');
- if (base == NULL || base == DW_STRING (attr) || base[-1] != ':')
- return "";
+ /* Handle DW_LNS_advance_line. */
+ void handle_advance_line (int line_delta)
+ {
+ advance_line (line_delta);
+ }
- return (char *) obstack_copy0 (&cu->objfile->per_bfd->storage_obstack,
- DW_STRING (attr),
- &base[-1] - DW_STRING (attr));
-}
+ /* Handle DW_LNS_set_file. */
+ void handle_set_file (file_name_index file);
-/* Return the name of the namespace/class that DIE is defined within,
- or "" if we can't tell. The caller should not xfree the result.
+ /* Handle DW_LNS_negate_stmt. */
+ void handle_negate_stmt ()
+ {
+ m_is_stmt = !m_is_stmt;
+ }
- For example, if we're within the method foo() in the following
- code:
+ /* Handle DW_LNS_const_add_pc. */
+ void handle_const_add_pc ();
- namespace N {
- class C {
- void foo () {
- }
- };
- }
+ /* Handle DW_LNS_fixed_advance_pc. */
+ void handle_fixed_advance_pc (CORE_ADDR addr_adj)
+ {
+ m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
+ m_op_index = 0;
+ }
- then determine_prefix on foo's die will return "N::C". */
+ /* Handle DW_LNS_copy. */
+ void handle_copy ()
+ {
+ record_line (false);
+ m_discriminator = 0;
+ }
-static const char *
-determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
-{
- struct die_info *parent, *spec_die;
- struct dwarf2_cu *spec_cu;
- struct type *parent_type;
- const char *retval;
+ /* Handle DW_LNE_end_sequence. */
+ void handle_end_sequence ()
+ {
+ m_record_line_callback = ::record_line;
+ }
- if (cu->language != language_cplus
- && cu->language != language_fortran && cu->language != language_d
- && cu->language != language_rust)
- return "";
+private:
+ /* Advance the line by LINE_DELTA. */
+ void advance_line (int line_delta)
+ {
+ m_line += line_delta;
- retval = anonymous_struct_prefix (die, cu);
- if (retval)
- return retval;
+ if (line_delta != 0)
+ m_line_has_non_zero_discriminator = m_discriminator != 0;
+ }
- /* We have to be careful in the presence of DW_AT_specification.
- For example, with GCC 3.4, given the code
+ gdbarch *m_gdbarch;
- namespace N {
- void foo() {
- // Definition of N::foo.
- }
- }
+ /* True if we're recording lines.
+ Otherwise we're building partial symtabs and are just interested in
+ finding include files mentioned by the line number program. */
+ bool m_record_lines_p;
- then we'll have a tree of DIEs like this:
+ /* The line number header. */
+ line_header *m_line_header;
- 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
+ /* These are part of the standard DWARF line number state machine,
+ and initialized according to the DWARF spec. */
- 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. */
- spec_cu = cu;
- spec_die = die_specification (die, &spec_cu);
- if (spec_die == NULL)
- parent = die->parent;
- else
- {
- parent = spec_die->parent;
- cu = spec_cu;
- }
+ unsigned char m_op_index = 0;
+ /* The line table index (1-based) of the current file. */
+ file_name_index m_file = (file_name_index) 1;
+ unsigned int m_line = 1;
- if (parent == NULL)
- return "";
- else if (parent->building_fullname)
- {
- const char *name;
- const char *parent_name;
+ /* These are initialized in the constructor. */
- /* It has been seen on RealView 2.2 built binaries,
- DW_TAG_template_type_param types actually _defined_ as
- children of the parent class:
+ CORE_ADDR m_address;
+ bool m_is_stmt;
+ unsigned int m_discriminator;
- enum E {};
- template class <class Enum> Class{};
- Class<enum E> class_e;
+ /* Additional bits of state we need to track. */
- 1: DW_TAG_class_type (Class)
- 2: DW_TAG_enumeration_type (E)
- 3: DW_TAG_enumerator (enum1:0)
- 3: DW_TAG_enumerator (enum2:1)
- ...
- 2: DW_TAG_template_type_param
- DW_AT_type DW_FORM_ref_udata (E)
+ /* The last file that we called dwarf2_start_subfile for.
+ This is only used for TLLs. */
+ unsigned int m_last_file = 0;
+ /* The last file a line number was recorded for. */
+ struct subfile *m_last_subfile = NULL;
- Besides being broken debug info, it can put GDB into an
- infinite loop. Consider:
+ /* The function to call to record a line. */
+ record_line_ftype *m_record_line_callback = NULL;
- When we're building the full name for Class<E>, we'll start
- at Class, and go look over its template type parameters,
- finding E. We'll then try to build the full name of E, and
- reach here. We're now trying to build the full name of E,
- and look over the parent DIE for containing scope. In the
- broken case, if we followed the parent DIE of E, we'd again
- find Class, and once again go look at its template type
- arguments, etc., etc. Simply don't consider such parent die
- as source-level parent of this die (it can't be, the language
- doesn't allow it), and break the loop here. */
- name = dwarf2_name (die, cu);
- parent_name = dwarf2_name (parent, cu);
- complaint (&symfile_complaints,
- _("template param type '%s' defined within parent '%s'"),
- name ? name : "<unknown>",
- parent_name ? parent_name : "<unknown>");
- return "";
- }
- else
- switch (parent->tag)
- {
- case DW_TAG_namespace:
- parent_type = read_type_die (parent, cu);
- /* GCC 4.0 and 4.1 had a bug (PR c++/28460) where they generated bogus
- DW_TAG_namespace DIEs with a name of "::" for the global namespace.
- Work around this problem here. */
- if (cu->language == language_cplus
- && strcmp (TYPE_TAG_NAME (parent_type), "::") == 0)
- return "";
- /* We give a name to even anonymous namespaces. */
- return TYPE_TAG_NAME (parent_type);
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- case DW_TAG_module:
- parent_type = read_type_die (parent, cu);
- if (TYPE_TAG_NAME (parent_type) != NULL)
- return TYPE_TAG_NAME (parent_type);
- else
- /* An anonymous structure is only allowed non-static data
- members; no typedefs, no member functions, et cetera.
- So it does not need a prefix. */
- return "";
- case DW_TAG_compile_unit:
- case DW_TAG_partial_unit:
- /* gcc-4.5 -gdwarf-4 can drop the enclosing namespace. Cope. */
- if (cu->language == language_cplus
- && !VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types)
- && die->child != NULL
- && (die->tag == DW_TAG_class_type
- || die->tag == DW_TAG_structure_type
- || die->tag == DW_TAG_union_type))
- {
- char *name = guess_full_die_structure_name (die, cu);
- if (name != NULL)
- return name;
- }
- return "";
- case DW_TAG_enumeration_type:
- parent_type = read_type_die (parent, cu);
- if (TYPE_DECLARED_CLASS (parent_type))
- {
- if (TYPE_TAG_NAME (parent_type) != NULL)
- return TYPE_TAG_NAME (parent_type);
- return "";
- }
- /* Fall through. */
- default:
- return determine_prefix (parent, cu);
- }
+ /* The last line number that was recorded, used to coalesce
+ consecutive entries for the same line. This can happen, for
+ example, when discriminators are present. PR 17276. */
+ unsigned int m_last_line = 0;
+ bool m_line_has_non_zero_discriminator = false;
+};
+
+void
+lnp_state_machine::handle_advance_pc (CORE_ADDR adjust)
+{
+ CORE_ADDR addr_adj = (((m_op_index + adjust)
+ / m_line_header->maximum_ops_per_instruction)
+ * m_line_header->minimum_instruction_length);
+ m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
+ m_op_index = ((m_op_index + adjust)
+ % m_line_header->maximum_ops_per_instruction);
}
-/* Return a newly-allocated string formed by concatenating PREFIX and SUFFIX
- with appropriate separator. If PREFIX or SUFFIX is NULL or empty, then
- simply copy the SUFFIX or PREFIX, respectively. If OBS is non-null, perform
- an obconcat, otherwise allocate storage for the result. The CU argument is
- used to determine the language and hence, the appropriate separator. */
+void
+lnp_state_machine::handle_special_opcode (unsigned char op_code)
+{
+ unsigned char adj_opcode = op_code - m_line_header->opcode_base;
+ CORE_ADDR addr_adj = (((m_op_index
+ + (adj_opcode / m_line_header->line_range))
+ / m_line_header->maximum_ops_per_instruction)
+ * m_line_header->minimum_instruction_length);
+ m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
+ m_op_index = ((m_op_index + (adj_opcode / m_line_header->line_range))
+ % m_line_header->maximum_ops_per_instruction);
-#define MAX_SEP_LEN 7 /* strlen ("__") + strlen ("_MOD_") */
+ int line_delta = (m_line_header->line_base
+ + (adj_opcode % m_line_header->line_range));
+ advance_line (line_delta);
+ record_line (false);
+ m_discriminator = 0;
+}
-static char *
-typename_concat (struct obstack *obs, const char *prefix, const char *suffix,
- int physname, struct dwarf2_cu *cu)
+void
+lnp_state_machine::handle_set_file (file_name_index file)
{
- const char *lead = "";
- const char *sep;
+ m_file = file;
- if (suffix == NULL || suffix[0] == '\0'
- || prefix == NULL || prefix[0] == '\0')
- sep = "";
- else if (cu->language == language_d)
- {
- /* For D, the 'main' function could be defined in any module, but it
- should never be prefixed. */
- if (strcmp (suffix, "D main") == 0)
- {
- prefix = "";
- sep = "";
- }
- else
- sep = ".";
- }
- else if (cu->language == language_fortran && physname)
+ const file_entry *fe = current_file ();
+ if (fe == NULL)
+ dwarf2_debug_line_missing_file_complaint ();
+ else if (m_record_lines_p)
{
- /* This is gfortran specific mangling. Normally DW_AT_linkage_name or
- DW_AT_MIPS_linkage_name is preferred and used instead. */
+ const char *dir = fe->include_dir (m_line_header);
- lead = "__";
- sep = "_MOD_";
+ m_last_subfile = current_subfile;
+ m_line_has_non_zero_discriminator = m_discriminator != 0;
+ dwarf2_start_subfile (fe->name, dir);
}
- else
- sep = "::";
+}
- if (prefix == NULL)
- prefix = "";
- if (suffix == NULL)
- suffix = "";
+void
+lnp_state_machine::handle_const_add_pc ()
+{
+ CORE_ADDR adjust
+ = (255 - m_line_header->opcode_base) / m_line_header->line_range;
- if (obs == NULL)
- {
- char *retval
- = ((char *)
- xmalloc (strlen (prefix) + MAX_SEP_LEN + strlen (suffix) + 1));
+ CORE_ADDR addr_adj
+ = (((m_op_index + adjust)
+ / m_line_header->maximum_ops_per_instruction)
+ * m_line_header->minimum_instruction_length);
- strcpy (retval, lead);
- strcat (retval, prefix);
- strcat (retval, sep);
- strcat (retval, suffix);
- return retval;
- }
- else
- {
- /* We have an obstack. */
- return obconcat (obs, lead, prefix, sep, suffix, (char *) NULL);
- }
+ m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true);
+ m_op_index = ((m_op_index + adjust)
+ % m_line_header->maximum_ops_per_instruction);
}
-/* Return sibling of die, NULL if no sibling. */
+/* Ignore this record_line request. */
-static struct die_info *
-sibling_die (struct die_info *die)
+static void
+noop_record_line (struct subfile *subfile, int line, CORE_ADDR pc)
{
- return die->sibling;
+ return;
}
-/* Get name of a die, return NULL if not found. */
+/* Return non-zero if we should add LINE to the line number table.
+ LINE is the line to add, LAST_LINE is the last line that was added,
+ LAST_SUBFILE is the subfile for LAST_LINE.
+ LINE_HAS_NON_ZERO_DISCRIMINATOR is non-zero if LINE has ever
+ had a non-zero discriminator.
-static const char *
-dwarf2_canonicalize_name (const char *name, struct dwarf2_cu *cu,
- struct obstack *obstack)
-{
- if (name && cu->language == language_cplus)
- {
- std::string canon_name = cp_canonicalize_string (name);
+ We have to be careful in the presence of discriminators.
+ E.g., for this line:
- if (!canon_name.empty ())
- {
- if (canon_name != name)
- name = (const char *) obstack_copy0 (obstack,
- canon_name.c_str (),
- canon_name.length ());
- }
- }
+ for (i = 0; i < 100000; i++);
- return name;
-}
+ clang can emit four line number entries for that one line,
+ each with a different discriminator.
+ See gdb.dwarf2/dw2-single-line-discriminators.exp for an example.
-/* Get name of a die, return NULL if not found.
- Anonymous namespaces are converted to their magic string. */
+ However, we want gdb to coalesce all four entries into one.
+ Otherwise the user could stepi into the middle of the line and
+ gdb would get confused about whether the pc really was in the
+ middle of the line.
-static const char *
-dwarf2_name (struct die_info *die, struct dwarf2_cu *cu)
+ Things are further complicated by the fact that two consecutive
+ line number entries for the same line is a heuristic used by gcc
+ to denote the end of the prologue. So we can't just discard duplicate
+ entries, we have to be selective about it. The heuristic we use is
+ that we only collapse consecutive entries for the same line if at least
+ one of those entries has a non-zero discriminator. PR 17276.
+
+ Note: Addresses in the line number state machine can never go backwards
+ within one sequence, thus this coalescing is ok. */
+
+static int
+dwarf_record_line_p (unsigned int line, unsigned int last_line,
+ int line_has_non_zero_discriminator,
+ struct subfile *last_subfile)
{
- struct attribute *attr;
+ if (current_subfile != last_subfile)
+ return 1;
+ if (line != last_line)
+ return 1;
+ /* Same line for the same file that we've seen already.
+ As a last check, for pr 17276, only record the line if the line
+ has never had a non-zero discriminator. */
+ if (!line_has_non_zero_discriminator)
+ return 1;
+ return 0;
+}
- attr = dwarf2_attr (die, DW_AT_name, cu);
- if ((!attr || !DW_STRING (attr))
- && die->tag != DW_TAG_namespace
- && die->tag != DW_TAG_class_type
- && die->tag != DW_TAG_interface_type
- && die->tag != DW_TAG_structure_type
- && die->tag != DW_TAG_union_type)
- return NULL;
+/* Use P_RECORD_LINE to record line number LINE beginning at address ADDRESS
+ in the line table of subfile SUBFILE. */
- switch (die->tag)
+static void
+dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile,
+ unsigned int line, CORE_ADDR address,
+ record_line_ftype p_record_line)
+{
+ CORE_ADDR addr = gdbarch_addr_bits_remove (gdbarch, address);
+
+ if (dwarf_line_debug)
{
- case DW_TAG_compile_unit:
- case DW_TAG_partial_unit:
- /* Compilation units have a DW_AT_name that is a filename, not
- a source language identifier. */
- case DW_TAG_enumeration_type:
- case DW_TAG_enumerator:
- /* These tags always have simple identifiers already; no need
- to canonicalize them. */
- return DW_STRING (attr);
+ fprintf_unfiltered (gdb_stdlog,
+ "Recording line %u, file %s, address %s\n",
+ line, lbasename (subfile->name),
+ paddress (gdbarch, address));
+ }
- case DW_TAG_namespace:
- if (attr != NULL && DW_STRING (attr) != NULL)
- return DW_STRING (attr);
- return CP_ANONYMOUS_NAMESPACE_STR;
+ (*p_record_line) (subfile, line, addr);
+}
- case DW_TAG_class_type:
- case DW_TAG_interface_type:
- case DW_TAG_structure_type:
- case DW_TAG_union_type:
- /* Some GCC versions emit spurious DW_AT_name attributes for unnamed
- structures or unions. These were of the form "._%d" in GCC 4.1,
- or simply "<anonymous struct>" or "<anonymous union>" in GCC 4.3
- and GCC 4.4. We work around this problem by ignoring these. */
- if (attr && DW_STRING (attr)
- && (startswith (DW_STRING (attr), "._")
- || startswith (DW_STRING (attr), "<anonymous")))
- return NULL;
+/* Subroutine of dwarf_decode_lines_1 to simplify it.
+ Mark the end of a set of line number records.
+ The arguments are the same as for dwarf_record_line_1.
+ If SUBFILE is NULL the request is ignored. */
- /* GCC might emit a nameless typedef that has a linkage name. See
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
- if (!attr || DW_STRING (attr) == NULL)
- {
- char *demangled = NULL;
+static void
+dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile,
+ CORE_ADDR address, record_line_ftype p_record_line)
+{
+ if (subfile == NULL)
+ return;
- attr = dw2_linkage_name_attr (die, cu);
- if (attr == NULL || DW_STRING (attr) == NULL)
- return NULL;
+ if (dwarf_line_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog,
+ "Finishing current line, file %s, address %s\n",
+ lbasename (subfile->name),
+ paddress (gdbarch, address));
+ }
- /* Avoid demangling DW_STRING (attr) the second time on a second
- call for the same DIE. */
- if (!DW_STRING_IS_CANONICAL (attr))
- demangled = gdb_demangle (DW_STRING (attr), DMGL_TYPES);
+ dwarf_record_line_1 (gdbarch, subfile, 0, address, p_record_line);
+}
- if (demangled)
+void
+lnp_state_machine::record_line (bool end_sequence)
+{
+ if (dwarf_line_debug)
+ {
+ fprintf_unfiltered (gdb_stdlog,
+ "Processing actual line %u: file %u,"
+ " address %s, is_stmt %u, discrim %u\n",
+ m_line, to_underlying (m_file),
+ paddress (m_gdbarch, m_address),
+ m_is_stmt, m_discriminator);
+ }
+
+ file_entry *fe = current_file ();
+
+ if (fe == NULL)
+ dwarf2_debug_line_missing_file_complaint ();
+ /* For now we ignore lines not starting on an instruction boundary.
+ But not when processing end_sequence for compatibility with the
+ previous version of the code. */
+ else if (m_op_index == 0 || end_sequence)
+ {
+ fe->included_p = 1;
+ if (m_record_lines_p && m_is_stmt)
+ {
+ if (m_last_subfile != current_subfile || end_sequence)
{
- const char *base;
-
- /* FIXME: we already did this for the partial symbol... */
- DW_STRING (attr)
- = ((const char *)
- obstack_copy0 (&cu->objfile->per_bfd->storage_obstack,
- demangled, strlen (demangled)));
- DW_STRING_IS_CANONICAL (attr) = 1;
- xfree (demangled);
+ dwarf_finish_line (m_gdbarch, m_last_subfile,
+ m_address, m_record_line_callback);
+ }
- /* Strip any leading namespaces/classes, keep only the base name.
- DW_AT_name for named DIEs does not contain the prefixes. */
- base = strrchr (DW_STRING (attr), ':');
- if (base && base > DW_STRING (attr) && base[-1] == ':')
- return &base[1];
- else
- return DW_STRING (attr);
+ if (!end_sequence)
+ {
+ if (dwarf_record_line_p (m_line, m_last_line,
+ m_line_has_non_zero_discriminator,
+ m_last_subfile))
+ {
+ dwarf_record_line_1 (m_gdbarch, current_subfile,
+ m_line, m_address,
+ m_record_line_callback);
+ }
+ m_last_subfile = current_subfile;
+ m_last_line = m_line;
}
}
- break;
-
- default:
- break;
}
+}
- if (!DW_STRING_IS_CANONICAL (attr))
+lnp_state_machine::lnp_state_machine (gdbarch *arch, line_header *lh,
+ bool record_lines_p)
+{
+ m_gdbarch = arch;
+ m_record_lines_p = record_lines_p;
+ m_line_header = lh;
+
+ m_record_line_callback = ::record_line;
+
+ /* Call `gdbarch_adjust_dwarf2_line' on the initial 0 address as if there
+ was a line entry for it so that the backend has a chance to adjust it
+ and also record it in case it needs it. This is currently used by MIPS
+ code, cf. `mips_adjust_dwarf2_line'. */
+ m_address = gdbarch_adjust_dwarf2_line (arch, 0, 0);
+ m_is_stmt = lh->default_is_stmt;
+ m_discriminator = 0;
+}
+
+void
+lnp_state_machine::check_line_address (struct dwarf2_cu *cu,
+ const gdb_byte *line_ptr,
+ CORE_ADDR lowpc, CORE_ADDR address)
+{
+ /* If address < lowpc then it's not a usable value, it's outside the
+ pc range of the CU. However, we restrict the test to only address
+ values of zero to preserve GDB's previous behaviour which is to
+ handle the specific case of a function being GC'd by the linker. */
+
+ if (address == 0 && address < lowpc)
{
- DW_STRING (attr)
- = dwarf2_canonicalize_name (DW_STRING (attr), cu,
- &cu->objfile->per_bfd->storage_obstack);
- DW_STRING_IS_CANONICAL (attr) = 1;
+ /* This line table is for a function which has been
+ GCd by the linker. Ignore it. PR gdb/12528 */
+
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ long line_offset = line_ptr - get_debug_line_section (cu)->buffer;
+
+ complaint (_(".debug_line address at offset 0x%lx is 0 [in module %s]"),
+ line_offset, objfile_name (objfile));
+ m_record_line_callback = noop_record_line;
+ /* Note: record_line_callback is left as noop_record_line until
+ we see DW_LNE_end_sequence. */
}
- return DW_STRING (attr);
}
-/* Return the die that this die in an extension of, or NULL if there
- is none. *EXT_CU is the CU containing DIE on input, and the CU
- containing the return value on output. */
+/* Subroutine of dwarf_decode_lines to simplify it.
+ Process the line number information in LH.
+ If DECODE_FOR_PST_P is non-zero, all we do is process the line number
+ program in order to set included_p for every referenced header. */
-static struct die_info *
-dwarf2_extension (struct die_info *die, struct dwarf2_cu **ext_cu)
+static void
+dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu,
+ const int decode_for_pst_p, CORE_ADDR lowpc)
{
- struct attribute *attr;
+ const gdb_byte *line_ptr, *extended_end;
+ const gdb_byte *line_end;
+ unsigned int bytes_read, extended_len;
+ unsigned char op_code, extended_op;
+ CORE_ADDR baseaddr;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ bfd *abfd = objfile->obfd;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ /* True if we're recording line info (as opposed to building partial
+ symtabs and just interested in finding include files mentioned by
+ the line number program). */
+ bool record_lines_p = !decode_for_pst_p;
- attr = dwarf2_attr (die, DW_AT_extension, *ext_cu);
- if (attr == NULL)
- return NULL;
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- return follow_die_ref (die, attr, ext_cu);
-}
+ line_ptr = lh->statement_program_start;
+ line_end = lh->statement_program_end;
-/* Convert a DIE tag into its string name. */
+ /* Read the statement sequences until there's nothing left. */
+ while (line_ptr < line_end)
+ {
+ /* The DWARF line number program state machine. Reset the state
+ machine at the start of each sequence. */
+ lnp_state_machine state_machine (gdbarch, lh, record_lines_p);
+ bool end_sequence = false;
-static const char *
-dwarf_tag_name (unsigned tag)
-{
- const char *name = get_DW_TAG_name (tag);
+ if (record_lines_p)
+ {
+ /* Start a subfile for the current file of the state
+ machine. */
+ const file_entry *fe = state_machine.current_file ();
- if (name == NULL)
- return "DW_TAG_<unknown>";
+ if (fe != NULL)
+ dwarf2_start_subfile (fe->name, fe->include_dir (lh));
+ }
- return name;
-}
+ /* Decode the table. */
+ while (line_ptr < line_end && !end_sequence)
+ {
+ op_code = read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
-/* Convert a DWARF attribute code into its string name. */
+ if (op_code >= lh->opcode_base)
+ {
+ /* Special opcode. */
+ state_machine.handle_special_opcode (op_code);
+ }
+ else switch (op_code)
+ {
+ case DW_LNS_extended_op:
+ extended_len = read_unsigned_leb128 (abfd, line_ptr,
+ &bytes_read);
+ line_ptr += bytes_read;
+ extended_end = line_ptr + extended_len;
+ extended_op = read_1_byte (abfd, line_ptr);
+ line_ptr += 1;
+ switch (extended_op)
+ {
+ case DW_LNE_end_sequence:
+ state_machine.handle_end_sequence ();
+ end_sequence = true;
+ break;
+ case DW_LNE_set_address:
+ {
+ CORE_ADDR address
+ = read_address (abfd, line_ptr, cu, &bytes_read);
+ line_ptr += bytes_read;
-static const char *
-dwarf_attr_name (unsigned attr)
-{
- const char *name;
+ state_machine.check_line_address (cu, line_ptr,
+ lowpc, address);
+ state_machine.handle_set_address (baseaddr, address);
+ }
+ break;
+ case DW_LNE_define_file:
+ {
+ const char *cur_file;
+ unsigned int mod_time, length;
+ dir_index dindex;
-#ifdef MIPS /* collides with DW_AT_HP_block_index */
- if (attr == DW_AT_MIPS_fde)
- return "DW_AT_MIPS_fde";
-#else
- if (attr == DW_AT_HP_block_index)
- return "DW_AT_HP_block_index";
-#endif
+ cur_file = read_direct_string (abfd, line_ptr,
+ &bytes_read);
+ line_ptr += bytes_read;
+ dindex = (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;
+ lh->add_file_name (cur_file, dindex, mod_time, length);
+ }
+ break;
+ case DW_LNE_set_discriminator:
+ {
+ /* The discriminator is not interesting to the
+ debugger; just ignore it. We still need to
+ check its value though:
+ if there are consecutive entries for the same
+ (non-prologue) line we want to coalesce them.
+ PR 17276. */
+ unsigned int discr
+ = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+ line_ptr += bytes_read;
+
+ state_machine.handle_set_discriminator (discr);
+ }
+ break;
+ default:
+ complaint (_("mangled .debug_line section"));
+ return;
+ }
+ /* Make sure that we parsed the extended op correctly. If e.g.
+ we expected a different address size than the producer used,
+ we may have read the wrong number of bytes. */
+ if (line_ptr != extended_end)
+ {
+ complaint (_("mangled .debug_line section"));
+ return;
+ }
+ break;
+ case DW_LNS_copy:
+ state_machine.handle_copy ();
+ break;
+ case DW_LNS_advance_pc:
+ {
+ CORE_ADDR adjust
+ = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+ line_ptr += bytes_read;
+
+ state_machine.handle_advance_pc (adjust);
+ }
+ break;
+ case DW_LNS_advance_line:
+ {
+ int line_delta
+ = read_signed_leb128 (abfd, line_ptr, &bytes_read);
+ line_ptr += bytes_read;
+
+ state_machine.handle_advance_line (line_delta);
+ }
+ break;
+ case DW_LNS_set_file:
+ {
+ file_name_index file
+ = (file_name_index) read_unsigned_leb128 (abfd, line_ptr,
+ &bytes_read);
+ line_ptr += bytes_read;
- name = get_DW_AT_name (attr);
+ state_machine.handle_set_file (file);
+ }
+ break;
+ case DW_LNS_set_column:
+ (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+ line_ptr += bytes_read;
+ break;
+ case DW_LNS_negate_stmt:
+ state_machine.handle_negate_stmt ();
+ break;
+ case DW_LNS_set_basic_block:
+ break;
+ /* Add to the address register of the state machine the
+ address increment value corresponding to special opcode
+ 255. I.e., this value is scaled by the minimum
+ instruction length since special opcode 255 would have
+ scaled the increment. */
+ case DW_LNS_const_add_pc:
+ state_machine.handle_const_add_pc ();
+ break;
+ case DW_LNS_fixed_advance_pc:
+ {
+ CORE_ADDR addr_adj = read_2_bytes (abfd, line_ptr);
+ line_ptr += 2;
- if (name == NULL)
- return "DW_AT_<unknown>";
+ state_machine.handle_fixed_advance_pc (addr_adj);
+ }
+ break;
+ default:
+ {
+ /* Unknown standard opcode, ignore it. */
+ int i;
- return name;
-}
+ for (i = 0; i < lh->standard_opcode_lengths[op_code]; i++)
+ {
+ (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+ line_ptr += bytes_read;
+ }
+ }
+ }
+ }
-/* Convert a DWARF value form code into its string name. */
+ if (!end_sequence)
+ dwarf2_debug_line_missing_end_sequence_complaint ();
-static const char *
-dwarf_form_name (unsigned form)
-{
- const char *name = get_DW_FORM_name (form);
+ /* We got a DW_LNE_end_sequence (or we ran off the end of the buffer,
+ in which case we still finish recording the last line). */
+ state_machine.record_line (true);
+ }
+}
- if (name == NULL)
- return "DW_FORM_<unknown>";
+/* 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.
- return name;
-}
+ 1. If PST is NULL, then this procedure uses the data from the program
+ to create all necessary symbol tables, and their linetables.
-static const char *
-dwarf_bool_name (unsigned mybool)
-{
- if (mybool)
- return "TRUE";
- else
- return "FALSE";
-}
+ 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.
-/* Convert a DWARF type code into its string name. */
+ COMP_DIR is the compilation directory (DW_AT_comp_dir) or NULL if unknown.
+ It is used for relative paths in the line table.
+ NOTE: When processing partial symtabs (pst != NULL),
+ comp_dir == pst->dirname.
-static const char *
-dwarf_type_encoding_name (unsigned enc)
-{
- const char *name = get_DW_ATE_name (enc);
+ NOTE: It is important that psymtabs have the same file name (via strcmp)
+ as the corresponding symtab. Since COMP_DIR is not used in the name of the
+ symtab we don't use it in the name of the psymtabs we create.
+ E.g. expand_line_sal requires this when finding psymtabs to expand.
+ A good testcase for this is mb-inline.exp.
- if (name == NULL)
- return "DW_ATE_<unknown>";
+ LOWPC is the lowest address in CU (or 0 if not known).
- return name;
-}
+ Boolean DECODE_MAPPING specifies we need to fully decode .debug_line
+ for its PC<->lines mapping information. Otherwise only the filename
+ table is read in. */
static void
-dump_die_shallow (struct ui_file *f, int indent, struct die_info *die)
+dwarf_decode_lines (struct line_header *lh, const char *comp_dir,
+ struct dwarf2_cu *cu, struct partial_symtab *pst,
+ CORE_ADDR lowpc, int decode_mapping)
{
- unsigned int i;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ const int decode_for_pst_p = (pst != NULL);
- print_spaces (indent, f);
- fprintf_unfiltered (f, "Die: %s (abbrev %d, offset 0x%x)\n",
- dwarf_tag_name (die->tag), die->abbrev,
- to_underlying (die->sect_off));
+ if (decode_mapping)
+ dwarf_decode_lines_1 (lh, cu, decode_for_pst_p, lowpc);
- if (die->parent != NULL)
+ if (decode_for_pst_p)
{
- print_spaces (indent, f);
- fprintf_unfiltered (f, " parent at offset: 0x%x\n",
- to_underlying (die->parent->sect_off));
- }
-
- print_spaces (indent, f);
- fprintf_unfiltered (f, " has children: %s\n",
- dwarf_bool_name (die->child != NULL));
-
- print_spaces (indent, f);
- fprintf_unfiltered (f, " attributes:\n");
+ int file_index;
- for (i = 0; i < die->num_attrs; ++i)
+ /* 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->file_names.size (); file_index++)
+ if (lh->file_names[file_index].included_p == 1)
+ {
+ gdb::unique_xmalloc_ptr<char> name_holder;
+ const char *include_name =
+ psymtab_include_file_name (lh, file_index, pst, comp_dir,
+ &name_holder);
+ if (include_name != NULL)
+ dwarf2_create_include_psymtab (include_name, pst, objfile);
+ }
+ }
+ else
{
- print_spaces (indent, f);
- fprintf_unfiltered (f, " %s (%s) ",
- dwarf_attr_name (die->attrs[i].name),
- dwarf_form_name (die->attrs[i].form));
+ /* Make sure a symtab is created for every file, even files
+ which contain only variables (i.e. no code with associated
+ line numbers). */
+ struct compunit_symtab *cust = buildsym_compunit_symtab ();
+ int i;
- switch (die->attrs[i].form)
+ for (i = 0; i < lh->file_names.size (); i++)
{
- case DW_FORM_addr:
- case DW_FORM_GNU_addr_index:
- fprintf_unfiltered (f, "address: ");
- fputs_filtered (hex_string (DW_ADDR (&die->attrs[i])), f);
- break;
- case DW_FORM_block2:
- case DW_FORM_block4:
- case DW_FORM_block:
- case DW_FORM_block1:
- fprintf_unfiltered (f, "block: size %s",
- pulongest (DW_BLOCK (&die->attrs[i])->size));
- break;
- case DW_FORM_exprloc:
- fprintf_unfiltered (f, "expression: size %s",
- pulongest (DW_BLOCK (&die->attrs[i])->size));
- break;
- case DW_FORM_data16:
- fprintf_unfiltered (f, "constant of 16 bytes");
- break;
- case DW_FORM_ref_addr:
- fprintf_unfiltered (f, "ref address: ");
- fputs_filtered (hex_string (DW_UNSND (&die->attrs[i])), f);
- break;
- case DW_FORM_GNU_ref_alt:
- fprintf_unfiltered (f, "alt ref address: ");
- fputs_filtered (hex_string (DW_UNSND (&die->attrs[i])), f);
- break;
- case DW_FORM_ref1:
- case DW_FORM_ref2:
- case DW_FORM_ref4:
- case DW_FORM_ref8:
- case DW_FORM_ref_udata:
- fprintf_unfiltered (f, "constant ref: 0x%lx (adjusted)",
- (long) (DW_UNSND (&die->attrs[i])));
- break;
- case DW_FORM_data1:
- case DW_FORM_data2:
- case DW_FORM_data4:
- case DW_FORM_data8:
- case DW_FORM_udata:
- case DW_FORM_sdata:
- fprintf_unfiltered (f, "constant: %s",
- pulongest (DW_UNSND (&die->attrs[i])));
- break;
- case DW_FORM_sec_offset:
- fprintf_unfiltered (f, "section offset: %s",
- pulongest (DW_UNSND (&die->attrs[i])));
- break;
- case DW_FORM_ref_sig8:
- fprintf_unfiltered (f, "signature: %s",
- hex_string (DW_SIGNATURE (&die->attrs[i])));
- break;
- case DW_FORM_string:
- case DW_FORM_strp:
- case DW_FORM_line_strp:
- case DW_FORM_GNU_str_index:
- case DW_FORM_GNU_strp_alt:
- fprintf_unfiltered (f, "string: \"%s\" (%s canonicalized)",
- DW_STRING (&die->attrs[i])
- ? DW_STRING (&die->attrs[i]) : "",
- DW_STRING_IS_CANONICAL (&die->attrs[i]) ? "is" : "not");
- break;
- case DW_FORM_flag:
- if (DW_UNSND (&die->attrs[i]))
- fprintf_unfiltered (f, "flag: TRUE");
- else
- fprintf_unfiltered (f, "flag: FALSE");
- break;
- case DW_FORM_flag_present:
- fprintf_unfiltered (f, "flag: TRUE");
- break;
- case DW_FORM_indirect:
- /* The reader will have reduced the indirect form to
- the "base form" so this form should not occur. */
- fprintf_unfiltered (f,
- "unexpected attribute form: DW_FORM_indirect");
- break;
- case DW_FORM_implicit_const:
- fprintf_unfiltered (f, "constant: %s",
- plongest (DW_SND (&die->attrs[i])));
- break;
- default:
- fprintf_unfiltered (f, "unsupported attribute form: %d.",
- die->attrs[i].form);
- break;
+ file_entry &fe = lh->file_names[i];
+
+ dwarf2_start_subfile (fe.name, fe.include_dir (lh));
+
+ if (current_subfile->symtab == NULL)
+ {
+ current_subfile->symtab
+ = allocate_symtab (cust, current_subfile->name);
+ }
+ fe.symtab = current_subfile->symtab;
}
- fprintf_unfiltered (f, "\n");
}
}
-static void
-dump_die_for_error (struct die_info *die)
-{
- dump_die_shallow (gdb_stderr, 0, die);
-}
+/* 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:
+
+ DW_AT_name: /srcdir/list0.c
+ DW_AT_comp_dir: /compdir
+ files.files[0].name: list0.h
+ files.files[0].dir: /srcdir
+ files.files[1].name: list0.c
+ files.files[1].dir: /srcdir
+
+ 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.
+ start_subfile will ensure that this happens provided that we pass the
+ concatenation of files.files[1].dir and files.files[1].name as the
+ subfile's name. */
static void
-dump_die_1 (struct ui_file *f, int level, int max_level, struct die_info *die)
+dwarf2_start_subfile (const char *filename, const char *dirname)
{
- int indent = level * 4;
-
- gdb_assert (die != NULL);
-
- if (level >= max_level)
- return;
+ char *copy = NULL;
- dump_die_shallow (f, indent, die);
+ /* In order not to lose the line information directory,
+ we concatenate it to the filename when it makes sense.
+ Note that the Dwarf3 standard says (speaking of filenames in line
+ information): ``The directory index is ignored for file names
+ that represent full path names''. Thus ignoring dirname in the
+ `else' branch below isn't an issue. */
- if (die->child != NULL)
+ if (!IS_ABSOLUTE_PATH (filename) && dirname != NULL)
{
- print_spaces (indent, f);
- fprintf_unfiltered (f, " Children:");
- if (level + 1 < max_level)
- {
- fprintf_unfiltered (f, "\n");
- dump_die_1 (f, level + 1, max_level, die->child);
- }
- else
- {
- fprintf_unfiltered (f,
- " [not printed, max nesting level reached]\n");
- }
+ copy = concat (dirname, SLASH_STRING, filename, (char *)NULL);
+ filename = copy;
}
- if (die->sibling != NULL && level > 0)
- {
- dump_die_1 (f, level, max_level, die->sibling);
- }
+ start_subfile (filename);
+
+ if (copy != NULL)
+ xfree (copy);
}
-/* This is called from the pdie macro in gdbinit.in.
- It's not static so gcc will keep a copy callable from gdb. */
+/* Start a symtab for DWARF.
+ NAME, COMP_DIR, LOW_PC are passed to start_symtab. */
-void
-dump_die (struct die_info *die, int max_level)
+static struct compunit_symtab *
+dwarf2_start_symtab (struct dwarf2_cu *cu,
+ const char *name, const char *comp_dir, CORE_ADDR low_pc)
{
- dump_die_1 (gdb_stdlog, 0, max_level, die);
-}
+ struct compunit_symtab *cust
+ = start_symtab (cu->per_cu->dwarf2_per_objfile->objfile, name, comp_dir,
+ low_pc, cu->language);
-static void
-store_in_ref_table (struct die_info *die, struct dwarf2_cu *cu)
-{
- void **slot;
+ record_debugformat ("DWARF 2");
+ record_producer (cu->producer);
- slot = htab_find_slot_with_hash (cu->die_hash, die,
- to_underlying (die->sect_off),
- INSERT);
+ /* We assume that we're processing GCC output. */
+ processing_gcc_compilation = 2;
- *slot = die;
-}
+ cu->processing_has_namespace_info = 0;
-/* Return DIE offset of ATTR. Return 0 with complaint if ATTR is not of the
- required kind. */
+ return cust;
+}
-static sect_offset
-dwarf2_get_ref_die_offset (const struct attribute *attr)
+static void
+var_decode_location (struct attribute *attr, struct symbol *sym,
+ struct dwarf2_cu *cu)
{
- if (attr_form_is_ref (attr))
- return (sect_offset) DW_UNSND (attr);
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct comp_unit_head *cu_header = &cu->header;
- complaint (&symfile_complaints,
- _("unsupported die ref attribute form: '%s'"),
- dwarf_form_name (attr->form));
- return {};
-}
+ /* 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. */
-/* Return the constant value held by ATTR. Return DEFAULT_VALUE if
- * the value held by the attribute is not constant. */
+ /* 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_ACLASS_INDEX (sym) = LOC_OPTIMIZED_OUT;
+ return;
+ }
-static LONGEST
-dwarf2_get_attr_constant_value (const struct attribute *attr, int default_value)
-{
- if (attr->form == DW_FORM_sdata || attr->form == DW_FORM_implicit_const)
- 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
+ /* 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 or DW_OP_GNU_addr_index
+ then mark this symbol as LOC_STATIC. */
+
+ if (attr_form_is_block (attr)
+ && ((DW_BLOCK (attr)->data[0] == DW_OP_addr
+ && DW_BLOCK (attr)->size == 1 + cu_header->addr_size)
+ || (DW_BLOCK (attr)->data[0] == DW_OP_GNU_addr_index
+ && (DW_BLOCK (attr)->size
+ == 1 + leb128_size (&DW_BLOCK (attr)->data[1])))))
{
- /* For DW_FORM_data16 see attr_form_is_constant. */
- complaint (&symfile_complaints,
- _("Attribute value is not a constant (%s)"),
- dwarf_form_name (attr->form));
- return default_value;
+ unsigned int dummy;
+
+ if (DW_BLOCK (attr)->data[0] == DW_OP_addr)
+ SYMBOL_VALUE_ADDRESS (sym) =
+ read_address (objfile->obfd, DW_BLOCK (attr)->data + 1, cu, &dummy);
+ else
+ SYMBOL_VALUE_ADDRESS (sym) =
+ read_addr_index_from_leb128 (cu, DW_BLOCK (attr)->data + 1, &dummy);
+ SYMBOL_ACLASS_INDEX (sym) = LOC_STATIC;
+ fixup_symbol_section (sym, objfile);
+ SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets,
+ SYMBOL_SECTION (sym));
+ 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. */
+
+ dwarf2_symbol_mark_computed (attr, sym, cu, 0);
+
+ if (SYMBOL_COMPUTED_OPS (sym)->location_has_loclist)
+ cu->has_loclist = 1;
}
-/* Follow reference or signature attribute ATTR of SRC_DIE.
- On entry *REF_CU is the CU of SRC_DIE.
- On exit *REF_CU is the CU of the result. */
+/* 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
+ used the passed type.
+ If SPACE is not NULL, use it to hold the new symbol. If it is
+ NULL, allocate a new symbol on the objfile's obstack. */
-static struct die_info *
-follow_die_ref_or_sig (struct die_info *src_die, const struct attribute *attr,
- struct dwarf2_cu **ref_cu)
+static struct symbol *
+new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+ struct symbol *space)
{
- struct die_info *die;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct symbol *sym = NULL;
+ const char *name;
+ struct attribute *attr = NULL;
+ struct attribute *attr2 = NULL;
+ CORE_ADDR baseaddr;
+ struct pending **list_to_add = NULL;
- if (attr_form_is_ref (attr))
- die = follow_die_ref (src_die, attr, ref_cu);
- else if (attr->form == DW_FORM_ref_sig8)
- die = follow_die_sig (src_die, attr, ref_cu);
- else
+ int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
+
+ baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+
+ name = dwarf2_name (die, cu);
+ if (name)
{
- dump_die_for_error (src_die);
- error (_("Dwarf Error: Expected reference attribute [in module %s]"),
- objfile_name ((*ref_cu)->objfile));
- }
+ const char *linkagename;
+ int suppress_add = 0;
- return die;
-}
+ if (space)
+ sym = space;
+ else
+ sym = allocate_symbol (objfile);
+ OBJSTAT (objfile, n_syms++);
-/* Follow reference OFFSET.
- On entry *REF_CU is the CU of the source die referencing OFFSET.
- On exit *REF_CU is the CU of the result.
- Returns NULL if OFFSET is invalid. */
+ /* Cache this symbol's name and the name's demangled form (if any). */
+ SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack);
+ linkagename = dwarf2_physname (name, die, cu);
+ SYMBOL_SET_NAMES (sym, linkagename, strlen (linkagename), 0, objfile);
+
+ /* Fortran does not have mangling standard and the mangling does differ
+ between gfortran, iFort etc. */
+ if (cu->language == language_fortran
+ && symbol_get_demangled_name (&(sym->ginfo)) == NULL)
+ symbol_set_demangled_name (&(sym->ginfo),
+ dwarf2_full_name (name, die, cu),
+ NULL);
+
+ /* Default assumptions.
+ Use the passed type or decode it from the die. */
+ SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
+ SYMBOL_ACLASS_INDEX (sym) = LOC_OPTIMIZED_OUT;
+ if (type != NULL)
+ SYMBOL_TYPE (sym) = type;
+ else
+ SYMBOL_TYPE (sym) = die_type (die, cu);
+ attr = dwarf2_attr (die,
+ inlined_func ? DW_AT_call_line : DW_AT_decl_line,
+ cu);
+ if (attr)
+ {
+ SYMBOL_LINE (sym) = DW_UNSND (attr);
+ }
+
+ attr = dwarf2_attr (die,
+ inlined_func ? DW_AT_call_file : DW_AT_decl_file,
+ cu);
+ if (attr)
+ {
+ file_name_index file_index = (file_name_index) DW_UNSND (attr);
+ struct file_entry *fe;
+
+ if (cu->line_header != NULL)
+ fe = cu->line_header->file_name_at (file_index);
+ else
+ fe = NULL;
+
+ if (fe == NULL)
+ complaint (_("file index out of range"));
+ else
+ symbol_set_symtab (sym, fe->symtab);
+ }
-static struct die_info *
-follow_die_offset (sect_offset sect_off, int offset_in_dwz,
- struct dwarf2_cu **ref_cu)
-{
- struct die_info temp_die;
- struct dwarf2_cu *target_cu, *cu = *ref_cu;
+ switch (die->tag)
+ {
+ case DW_TAG_label:
+ attr = dwarf2_attr (die, DW_AT_low_pc, cu);
+ if (attr)
+ {
+ CORE_ADDR addr;
- gdb_assert (cu->per_cu != NULL);
+ addr = attr_value_as_address (attr);
+ addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr + baseaddr);
+ SYMBOL_VALUE_ADDRESS (sym) = addr;
+ }
+ SYMBOL_TYPE (sym) = objfile_type (objfile)->builtin_core_addr;
+ SYMBOL_DOMAIN (sym) = LABEL_DOMAIN;
+ SYMBOL_ACLASS_INDEX (sym) = LOC_LABEL;
+ add_symbol_to_list (sym, cu->list_in_scope);
+ break;
+ case DW_TAG_subprogram:
+ /* SYMBOL_BLOCK_VALUE (sym) will be filled in later by
+ finish_block. */
+ SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
+ attr2 = dwarf2_attr (die, DW_AT_external, cu);
+ if ((attr2 && (DW_UNSND (attr2) != 0))
+ || cu->language == language_ada)
+ {
+ /* Subprograms marked external are stored as a global symbol.
+ Ada subprograms, whether marked external or not, are always
+ stored as a global symbol, because we want to be able to
+ access them globally. For instance, we want to be able
+ to break on a nested subprogram without having to
+ specify the context. */
+ list_to_add = &global_symbols;
+ }
+ else
+ {
+ list_to_add = cu->list_in_scope;
+ }
+ break;
+ case DW_TAG_inlined_subroutine:
+ /* SYMBOL_BLOCK_VALUE (sym) will be filled in later by
+ finish_block. */
+ SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
+ SYMBOL_INLINED (sym) = 1;
+ list_to_add = cu->list_in_scope;
+ break;
+ case DW_TAG_template_value_param:
+ suppress_add = 1;
+ /* Fall through. */
+ case DW_TAG_constant:
+ case DW_TAG_variable:
+ case DW_TAG_member:
+ /* 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) = objfile_type (objfile)->builtin_int;
- target_cu = cu;
+ attr = dwarf2_attr (die, DW_AT_const_value, cu);
+ /* In the case of DW_TAG_member, we should only be called for
+ static const members. */
+ if (die->tag == DW_TAG_member)
+ {
+ /* dwarf2_add_field uses die_is_declaration,
+ so we do the same. */
+ gdb_assert (die_is_declaration (die, cu));
+ gdb_assert (attr);
+ }
+ if (attr)
+ {
+ dwarf2_const_value (attr, sym, cu);
+ attr2 = dwarf2_attr (die, DW_AT_external, cu);
+ if (!suppress_add)
+ {
+ if (attr2 && (DW_UNSND (attr2) != 0))
+ list_to_add = &global_symbols;
+ else
+ list_to_add = cu->list_in_scope;
+ }
+ break;
+ }
+ attr = dwarf2_attr (die, DW_AT_location, cu);
+ if (attr)
+ {
+ var_decode_location (attr, sym, cu);
+ attr2 = dwarf2_attr (die, DW_AT_external, cu);
- if (cu->per_cu->is_debug_types)
- {
- /* .debug_types CUs cannot reference anything outside their CU.
- If they need to, they have to reference a signatured type via
- DW_FORM_ref_sig8. */
- if (!offset_in_cu_p (&cu->header, sect_off))
- return NULL;
- }
- else if (offset_in_dwz != cu->per_cu->is_dwz
- || !offset_in_cu_p (&cu->header, sect_off))
- {
- struct dwarf2_per_cu_data *per_cu;
+ /* Fortran explicitly imports any global symbols to the local
+ scope by DW_TAG_common_block. */
+ if (cu->language == language_fortran && die->parent
+ && die->parent->tag == DW_TAG_common_block)
+ attr2 = NULL;
- per_cu = dwarf2_find_containing_comp_unit (sect_off, offset_in_dwz,
- cu->objfile);
+ if (SYMBOL_CLASS (sym) == LOC_STATIC
+ && SYMBOL_VALUE_ADDRESS (sym) == 0
+ && !dwarf2_per_objfile->has_section_at_zero)
+ {
+ /* When a static variable is eliminated by the linker,
+ the corresponding debug information is not stripped
+ out, but the variable address is set to null;
+ do not add such variables into symbol table. */
+ }
+ else if (attr2 && (DW_UNSND (attr2) != 0))
+ {
+ /* Workaround gfortran PR debug/40040 - it uses
+ DW_AT_location for variables in -fPIC libraries which may
+ get overriden by other libraries/executable and get
+ a different address. Resolve it by the minimal symbol
+ which may come from inferior's executable using copy
+ relocation. Make this workaround only for gfortran as for
+ other compilers GDB cannot guess the minimal symbol
+ Fortran mangling kind. */
+ if (cu->language == language_fortran && die->parent
+ && die->parent->tag == DW_TAG_module
+ && cu->producer
+ && startswith (cu->producer, "GNU Fortran"))
+ SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED;
- /* If necessary, add it to the queue and load its DIEs. */
- if (maybe_queue_comp_unit (cu, per_cu, cu->language))
- load_full_comp_unit (per_cu, cu->language);
+ /* A variable with DW_AT_external is never static,
+ but it may be block-scoped. */
+ list_to_add = (cu->list_in_scope == &file_symbols
+ ? &global_symbols : cu->list_in_scope);
+ }
+ else
+ list_to_add = cu->list_in_scope;
+ }
+ else
+ {
+ /* We do not know the address of this symbol.
+ 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. */
+ attr2 = dwarf2_attr (die, DW_AT_external, cu);
- target_cu = per_cu->cu;
- }
- else if (cu->dies == NULL)
- {
- /* We're loading full DIEs during partial symbol reading. */
- gdb_assert (dwarf2_per_objfile->reading_partial_symbols);
- load_full_comp_unit (cu->per_cu, language_minimal);
- }
+ /* Fortran explicitly imports any global symbols to the local
+ scope by DW_TAG_common_block. */
+ if (cu->language == language_fortran && die->parent
+ && die->parent->tag == DW_TAG_common_block)
+ {
+ /* SYMBOL_CLASS doesn't matter here because
+ read_common_block is going to reset it. */
+ if (!suppress_add)
+ list_to_add = cu->list_in_scope;
+ }
+ else if (attr2 && (DW_UNSND (attr2) != 0)
+ && dwarf2_attr (die, DW_AT_type, cu) != NULL)
+ {
+ /* A variable with DW_AT_external is never static, but it
+ may be block-scoped. */
+ list_to_add = (cu->list_in_scope == &file_symbols
+ ? &global_symbols : cu->list_in_scope);
- *ref_cu = target_cu;
- temp_die.sect_off = sect_off;
- return (struct die_info *) htab_find_with_hash (target_cu->die_hash,
- &temp_die,
- to_underlying (sect_off));
-}
+ SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED;
+ }
+ else if (!die_is_declaration (die, cu))
+ {
+ /* Use the default LOC_OPTIMIZED_OUT class. */
+ gdb_assert (SYMBOL_CLASS (sym) == LOC_OPTIMIZED_OUT);
+ if (!suppress_add)
+ list_to_add = cu->list_in_scope;
+ }
+ }
+ break;
+ case DW_TAG_formal_parameter:
+ /* If we are inside a function, mark this as an argument. If
+ not, we might be looking at an argument to an inlined function
+ when we do not have enough information to show inlined frames;
+ pretend it's a local variable in that case so that the user can
+ still see it. */
+ if (context_stack_depth > 0
+ && context_stack[context_stack_depth - 1].name != NULL)
+ SYMBOL_IS_ARGUMENT (sym) = 1;
+ attr = dwarf2_attr (die, DW_AT_location, cu);
+ if (attr)
+ {
+ var_decode_location (attr, sym, cu);
+ }
+ attr = dwarf2_attr (die, DW_AT_const_value, cu);
+ if (attr)
+ {
+ dwarf2_const_value (attr, sym, cu);
+ }
-/* Follow reference attribute ATTR of SRC_DIE.
- On entry *REF_CU is the CU of SRC_DIE.
- On exit *REF_CU is the CU of the result. */
+ list_to_add = cu->list_in_scope;
+ 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_template_type_param:
+ suppress_add = 1;
+ /* Fall through. */
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ case DW_TAG_set_type:
+ case DW_TAG_enumeration_type:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
-static struct die_info *
-follow_die_ref (struct die_info *src_die, const struct attribute *attr,
- struct dwarf2_cu **ref_cu)
-{
- sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
- struct dwarf2_cu *cu = *ref_cu;
- struct die_info *die;
+ {
+ /* 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. */
- die = follow_die_offset (sect_off,
- (attr->form == DW_FORM_GNU_ref_alt
- || cu->per_cu->is_dwz),
- ref_cu);
- if (!die)
- error (_("Dwarf Error: Cannot find DIE at 0x%x referenced from DIE "
- "at 0x%x [in module %s]"),
- to_underlying (sect_off), to_underlying (src_die->sect_off),
- objfile_name (cu->objfile));
+ if (!suppress_add)
+ {
+ list_to_add = (cu->list_in_scope == &file_symbols
+ && cu->language == language_cplus
+ ? &global_symbols : cu->list_in_scope);
- return die;
-}
+ /* The semantics of C++ state that "struct foo {
+ ... }" also defines a typedef for "foo". */
+ if (cu->language == language_cplus
+ || cu->language == language_ada
+ || cu->language == language_d
+ || cu->language == language_rust)
+ {
+ /* The symbol's name is already allocated along
+ with this objfile, so we don't need to
+ duplicate it for the type. */
+ if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
+ TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_SEARCH_NAME (sym);
+ }
+ }
+ }
+ break;
+ case DW_TAG_typedef:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
+ list_to_add = cu->list_in_scope;
+ break;
+ case DW_TAG_base_type:
+ case DW_TAG_subrange_type:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ SYMBOL_DOMAIN (sym) = VAR_DOMAIN;
+ list_to_add = cu->list_in_scope;
+ break;
+ case DW_TAG_enumerator:
+ attr = dwarf2_attr (die, DW_AT_const_value, cu);
+ if (attr)
+ {
+ dwarf2_const_value (attr, sym, cu);
+ }
+ {
+ /* NOTE: carlton/2003-11-10: See comment above in the
+ DW_TAG_class_type, etc. block. */
-/* Return DWARF block referenced by DW_AT_location of DIE at SECT_OFF at PER_CU.
- Returned value is intended for DW_OP_call*. Returned
- dwarf2_locexpr_baton->data has lifetime of PER_CU->OBJFILE. */
+ list_to_add = (cu->list_in_scope == &file_symbols
+ && cu->language == language_cplus
+ ? &global_symbols : cu->list_in_scope);
+ }
+ break;
+ case DW_TAG_imported_declaration:
+ case DW_TAG_namespace:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ list_to_add = &global_symbols;
+ break;
+ case DW_TAG_module:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF;
+ SYMBOL_DOMAIN (sym) = MODULE_DOMAIN;
+ list_to_add = &global_symbols;
+ break;
+ case DW_TAG_common_block:
+ SYMBOL_ACLASS_INDEX (sym) = LOC_COMMON_BLOCK;
+ SYMBOL_DOMAIN (sym) = COMMON_BLOCK_DOMAIN;
+ add_symbol_to_list (sym, cu->list_in_scope);
+ break;
+ 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. */
+ complaint (_("unsupported tag: '%s'"),
+ dwarf_tag_name (die->tag));
+ break;
+ }
-struct dwarf2_locexpr_baton
-dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
- struct dwarf2_per_cu_data *per_cu,
- CORE_ADDR (*get_frame_pc) (void *baton),
- void *baton)
-{
- struct dwarf2_cu *cu;
- struct die_info *die;
- struct attribute *attr;
- struct dwarf2_locexpr_baton retval;
+ if (suppress_add)
+ {
+ sym->hash_next = objfile->template_symbols;
+ objfile->template_symbols = sym;
+ list_to_add = NULL;
+ }
- dw2_setup (per_cu->objfile);
+ if (list_to_add != NULL)
+ add_symbol_to_list (sym, list_to_add);
- if (per_cu->cu == NULL)
- load_cu (per_cu);
- cu = per_cu->cu;
- if (cu == NULL)
- {
- /* We shouldn't get here for a dummy CU, but don't crash on the user.
- Instead just throw an error, not much else we can do. */
- error (_("Dwarf Error: Dummy CU at 0x%x referenced in module %s"),
- to_underlying (sect_off), objfile_name (per_cu->objfile));
+ /* For the benefit of old versions of GCC, check for anonymous
+ namespaces based on the demangled name. */
+ if (!cu->processing_has_namespace_info
+ && cu->language == language_cplus)
+ cp_scan_for_anonymous_namespaces (sym, objfile);
}
+ return (sym);
+}
- die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
- if (!die)
- error (_("Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"),
- to_underlying (sect_off), objfile_name (per_cu->objfile));
+/* Given an attr with a DW_FORM_dataN value in host byte order,
+ zero-extend it as appropriate for the symbol's type. The DWARF
+ standard (v4) is not entirely clear about the meaning of using
+ DW_FORM_dataN for a constant with a signed type, where the type is
+ wider than the data. The conclusion of a discussion on the DWARF
+ list was that this is unspecified. We choose to always zero-extend
+ because that is the interpretation long in use by GCC. */
- attr = dwarf2_attr (die, DW_AT_location, cu);
- if (!attr)
- {
- /* DWARF: "If there is no such attribute, then there is no effect.".
- DATA is ignored if SIZE is 0. */
+static gdb_byte *
+dwarf2_const_value_data (const struct attribute *attr, struct obstack *obstack,
+ struct dwarf2_cu *cu, LONGEST *value, int bits)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ enum bfd_endian byte_order = bfd_big_endian (objfile->obfd) ?
+ BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE;
+ LONGEST l = DW_UNSND (attr);
- retval.data = NULL;
- retval.size = 0;
- }
- else if (attr_form_is_section_offset (attr))
+ if (bits < sizeof (*value) * 8)
{
- struct dwarf2_loclist_baton loclist_baton;
- CORE_ADDR pc = (*get_frame_pc) (baton);
- size_t size;
-
- fill_in_loclist_baton (cu, &loclist_baton, attr);
-
- retval.data = dwarf2_find_location_expression (&loclist_baton,
- &size, pc);
- retval.size = size;
+ l &= ((LONGEST) 1 << bits) - 1;
+ *value = l;
}
+ else if (bits == sizeof (*value) * 8)
+ *value = l;
else
{
- if (!attr_form_is_block (attr))
- error (_("Dwarf Error: DIE at 0x%x referenced in module %s "
- "is neither DW_FORM_block* nor DW_FORM_exprloc"),
- to_underlying (sect_off), objfile_name (per_cu->objfile));
-
- retval.data = DW_BLOCK (attr)->data;
- retval.size = DW_BLOCK (attr)->size;
+ gdb_byte *bytes = (gdb_byte *) obstack_alloc (obstack, bits / 8);
+ store_unsigned_integer (bytes, bits / 8, byte_order, l);
+ return bytes;
}
- retval.per_cu = cu->per_cu;
-
- age_cached_comp_units ();
-
- return retval;
-}
-
-/* Like dwarf2_fetch_die_loc_sect_off, but take a CU
- offset. */
-
-struct dwarf2_locexpr_baton
-dwarf2_fetch_die_loc_cu_off (cu_offset offset_in_cu,
- struct dwarf2_per_cu_data *per_cu,
- CORE_ADDR (*get_frame_pc) (void *baton),
- void *baton)
-{
- sect_offset sect_off = per_cu->sect_off + to_underlying (offset_in_cu);
-
- return dwarf2_fetch_die_loc_sect_off (sect_off, per_cu, get_frame_pc, baton);
-}
-
-/* Write a constant of a given type as target-ordered bytes into
- OBSTACK. */
-
-static const gdb_byte *
-write_constant_as_bytes (struct obstack *obstack,
- enum bfd_endian byte_order,
- struct type *type,
- ULONGEST value,
- LONGEST *len)
-{
- gdb_byte *result;
-
- *len = TYPE_LENGTH (type);
- result = (gdb_byte *) obstack_alloc (obstack, *len);
- store_unsigned_integer (result, *len, byte_order, value);
- return result;
+ return NULL;
}
-/* If the DIE at OFFSET in PER_CU has a DW_AT_const_value, return a
- pointer to the constant bytes and set LEN to the length of the
- data. If memory is needed, allocate it on OBSTACK. If the DIE
- does not have a DW_AT_const_value, return NULL. */
+/* Read a constant value from an attribute. Either set *VALUE, or if
+ the value does not fit in *VALUE, set *BYTES - either already
+ allocated on the objfile obstack, or newly allocated on OBSTACK,
+ or, set *BATON, if we translated the constant to a location
+ expression. */
-const gdb_byte *
-dwarf2_fetch_constant_bytes (sect_offset sect_off,
- struct dwarf2_per_cu_data *per_cu,
- struct obstack *obstack,
- LONGEST *len)
+static void
+dwarf2_const_value_attr (const struct attribute *attr, struct type *type,
+ const char *name, struct obstack *obstack,
+ struct dwarf2_cu *cu,
+ LONGEST *value, const gdb_byte **bytes,
+ struct dwarf2_locexpr_baton **baton)
{
- struct dwarf2_cu *cu;
- struct die_info *die;
- struct attribute *attr;
- const gdb_byte *result = NULL;
- struct type *type;
- LONGEST value;
- enum bfd_endian byte_order;
-
- dw2_setup (per_cu->objfile);
-
- if (per_cu->cu == NULL)
- load_cu (per_cu);
- cu = per_cu->cu;
- if (cu == NULL)
- {
- /* We shouldn't get here for a dummy CU, but don't crash on the user.
- Instead just throw an error, not much else we can do. */
- error (_("Dwarf Error: Dummy CU at 0x%x referenced in module %s"),
- to_underlying (sect_off), objfile_name (per_cu->objfile));
- }
-
- die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
- if (!die)
- error (_("Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"),
- to_underlying (sect_off), objfile_name (per_cu->objfile));
-
-
- attr = dwarf2_attr (die, DW_AT_const_value, cu);
- if (attr == NULL)
- return NULL;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ struct comp_unit_head *cu_header = &cu->header;
+ struct dwarf_block *blk;
+ enum bfd_endian byte_order = (bfd_big_endian (objfile->obfd) ?
+ BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE);
- byte_order = (bfd_big_endian (per_cu->objfile->obfd)
- ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE);
+ *value = 0;
+ *bytes = NULL;
+ *baton = NULL;
switch (attr->form)
{
case DW_FORM_addr:
case DW_FORM_GNU_addr_index:
{
- gdb_byte *tem;
+ gdb_byte *data;
- *len = cu->header.addr_size;
- tem = (gdb_byte *) obstack_alloc (obstack, *len);
- store_unsigned_integer (tem, *len, byte_order, DW_ADDR (attr));
- result = tem;
+ if (TYPE_LENGTH (type) != cu_header->addr_size)
+ dwarf2_const_value_length_mismatch_complaint (name,
+ cu_header->addr_size,
+ TYPE_LENGTH (type));
+ /* Symbols of this form are reasonably rare, so we just
+ piggyback on the existing location code rather than writing
+ a new implementation of symbol_computed_ops. */
+ *baton = XOBNEW (obstack, struct dwarf2_locexpr_baton);
+ (*baton)->per_cu = cu->per_cu;
+ gdb_assert ((*baton)->per_cu);
+
+ (*baton)->size = 2 + cu_header->addr_size;
+ data = (gdb_byte *) obstack_alloc (obstack, (*baton)->size);
+ (*baton)->data = data;
+
+ data[0] = DW_OP_addr;
+ store_unsigned_integer (&data[1], cu_header->addr_size,
+ byte_order, DW_ADDR (attr));
+ data[cu_header->addr_size + 1] = DW_OP_stack_value;
}
break;
case DW_FORM_string:
case DW_FORM_GNU_strp_alt:
/* DW_STRING is already allocated on the objfile obstack, point
directly to it. */
- result = (const gdb_byte *) DW_STRING (attr);
- *len = strlen (DW_STRING (attr));
+ *bytes = (const gdb_byte *) DW_STRING (attr);
break;
case DW_FORM_block1:
case DW_FORM_block2:
case DW_FORM_block:
case DW_FORM_exprloc:
case DW_FORM_data16:
- result = DW_BLOCK (attr)->data;
- *len = DW_BLOCK (attr)->size;
+ blk = DW_BLOCK (attr);
+ if (TYPE_LENGTH (type) != blk->size)
+ dwarf2_const_value_length_mismatch_complaint (name, blk->size,
+ TYPE_LENGTH (type));
+ *bytes = blk->data;
break;
/* The DW_AT_const_value attributes are supposed to carry the
converted to host endianness, so we just need to sign- or
zero-extend it as appropriate. */
case DW_FORM_data1:
- type = die_type (die, cu);
- result = dwarf2_const_value_data (attr, obstack, cu, &value, 8);
- if (result == NULL)
- result = write_constant_as_bytes (obstack, byte_order,
- type, value, len);
+ *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 8);
break;
case DW_FORM_data2:
- type = die_type (die, cu);
- result = dwarf2_const_value_data (attr, obstack, cu, &value, 16);
- if (result == NULL)
- result = write_constant_as_bytes (obstack, byte_order,
- type, value, len);
+ *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 16);
break;
case DW_FORM_data4:
- type = die_type (die, cu);
- result = dwarf2_const_value_data (attr, obstack, cu, &value, 32);
- if (result == NULL)
- result = write_constant_as_bytes (obstack, byte_order,
- type, value, len);
+ *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 32);
break;
case DW_FORM_data8:
- type = die_type (die, cu);
- result = dwarf2_const_value_data (attr, obstack, cu, &value, 64);
- if (result == NULL)
- result = write_constant_as_bytes (obstack, byte_order,
- type, value, len);
+ *bytes = dwarf2_const_value_data (attr, obstack, cu, value, 64);
break;
case DW_FORM_sdata:
case DW_FORM_implicit_const:
- type = die_type (die, cu);
- result = write_constant_as_bytes (obstack, byte_order,
- type, DW_SND (attr), len);
+ *value = DW_SND (attr);
break;
case DW_FORM_udata:
- type = die_type (die, cu);
- result = write_constant_as_bytes (obstack, byte_order,
- type, DW_UNSND (attr), len);
+ *value = DW_UNSND (attr);
break;
default:
- complaint (&symfile_complaints,
- _("unsupported const value attribute form: '%s'"),
+ complaint (_("unsupported const value attribute form: '%s'"),
dwarf_form_name (attr->form));
+ *value = 0;
break;
}
-
- return result;
}
-/* Return the type of the die at OFFSET in PER_CU. Return NULL if no
- valid type for this die is found. */
-
-struct type *
-dwarf2_fetch_die_type_sect_off (sect_offset sect_off,
- struct dwarf2_per_cu_data *per_cu)
-{
- struct dwarf2_cu *cu;
- struct die_info *die;
- dw2_setup (per_cu->objfile);
+/* Copy constant value from an attribute to a symbol. */
- if (per_cu->cu == NULL)
- load_cu (per_cu);
- cu = per_cu->cu;
- if (!cu)
- return NULL;
+static void
+dwarf2_const_value (const struct attribute *attr, struct symbol *sym,
+ struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ LONGEST value;
+ const gdb_byte *bytes;
+ struct dwarf2_locexpr_baton *baton;
- die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
- if (!die)
- return NULL;
+ dwarf2_const_value_attr (attr, SYMBOL_TYPE (sym),
+ SYMBOL_PRINT_NAME (sym),
+ &objfile->objfile_obstack, cu,
+ &value, &bytes, &baton);
- return die_type (die, cu);
+ if (baton != NULL)
+ {
+ SYMBOL_LOCATION_BATON (sym) = baton;
+ SYMBOL_ACLASS_INDEX (sym) = dwarf2_locexpr_index;
+ }
+ else if (bytes != NULL)
+ {
+ SYMBOL_VALUE_BYTES (sym) = bytes;
+ SYMBOL_ACLASS_INDEX (sym) = LOC_CONST_BYTES;
+ }
+ else
+ {
+ SYMBOL_VALUE (sym) = value;
+ SYMBOL_ACLASS_INDEX (sym) = LOC_CONST;
+ }
}
-/* Return the type of the DIE at DIE_OFFSET in the CU named by
- PER_CU. */
+/* Return the type of the die in question using its DW_AT_type attribute. */
-struct type *
-dwarf2_get_die_type (cu_offset die_offset,
- struct dwarf2_per_cu_data *per_cu)
+static struct type *
+die_type (struct die_info *die, struct dwarf2_cu *cu)
{
- dw2_setup (per_cu->objfile);
+ struct attribute *type_attr;
- sect_offset die_offset_sect = per_cu->sect_off + to_underlying (die_offset);
- return get_die_type_at_offset (die_offset_sect, per_cu);
+ type_attr = dwarf2_attr (die, DW_AT_type, cu);
+ if (!type_attr)
+ {
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ /* A missing DW_AT_type represents a void type. */
+ return objfile_type (objfile)->builtin_void;
+ }
+
+ return lookup_die_type (die, type_attr, cu);
}
-/* Follow type unit SIG_TYPE referenced by SRC_DIE.
- On entry *REF_CU is the CU of SRC_DIE.
- On exit *REF_CU is the CU of the result.
- Returns NULL if the referenced DIE isn't found. */
+/* True iff CU's producer generates GNAT Ada auxiliary information
+ that allows to find parallel types through that information instead
+ of having to do expensive parallel lookups by type name. */
-static struct die_info *
-follow_die_sig_1 (struct die_info *src_die, struct signatured_type *sig_type,
- struct dwarf2_cu **ref_cu)
+static int
+need_gnat_info (struct dwarf2_cu *cu)
{
- struct die_info temp_die;
- struct dwarf2_cu *sig_cu;
- struct die_info *die;
-
- /* While it might be nice to assert sig_type->type == NULL here,
- we can get here for DW_AT_imported_declaration where we need
- the DIE not the type. */
-
- /* If necessary, add it to the queue and load its DIEs. */
+ /* Assume that the Ada compiler was GNAT, which always produces
+ the auxiliary information. */
+ return (cu->language == language_ada);
+}
- if (maybe_queue_comp_unit (*ref_cu, &sig_type->per_cu, language_minimal))
- read_signatured_type (sig_type);
+/* Return the auxiliary type of the die in question using its
+ DW_AT_GNAT_descriptive_type attribute. Returns NULL if the
+ attribute is not present. */
- sig_cu = sig_type->per_cu.cu;
- gdb_assert (sig_cu != NULL);
- gdb_assert (to_underlying (sig_type->type_offset_in_section) != 0);
- temp_die.sect_off = sig_type->type_offset_in_section;
- die = (struct die_info *) htab_find_with_hash (sig_cu->die_hash, &temp_die,
- to_underlying (temp_die.sect_off));
- if (die)
- {
- /* For .gdb_index version 7 keep track of included TUs.
- http://sourceware.org/bugzilla/show_bug.cgi?id=15021. */
- if (dwarf2_per_objfile->index_table != NULL
- && dwarf2_per_objfile->index_table->version <= 7)
- {
- VEC_safe_push (dwarf2_per_cu_ptr,
- (*ref_cu)->per_cu->imported_symtabs,
- sig_cu->per_cu);
- }
+static struct type *
+die_descriptive_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct attribute *type_attr;
- *ref_cu = sig_cu;
- return die;
- }
+ type_attr = dwarf2_attr (die, DW_AT_GNAT_descriptive_type, cu);
+ if (!type_attr)
+ return NULL;
- return NULL;
+ return lookup_die_type (die, type_attr, cu);
}
-/* Follow signatured type referenced by ATTR in SRC_DIE.
- On entry *REF_CU is the CU of SRC_DIE.
- On exit *REF_CU is the CU of the result.
- The result is the DIE of the type.
- If the referenced type cannot be found an error is thrown. */
+/* If DIE has a descriptive_type attribute, then set the TYPE's
+ descriptive type accordingly. */
-static struct die_info *
-follow_die_sig (struct die_info *src_die, const struct attribute *attr,
- struct dwarf2_cu **ref_cu)
+static void
+set_descriptive_type (struct type *type, struct die_info *die,
+ struct dwarf2_cu *cu)
{
- ULONGEST signature = DW_SIGNATURE (attr);
- struct signatured_type *sig_type;
- struct die_info *die;
-
- gdb_assert (attr->form == DW_FORM_ref_sig8);
-
- sig_type = lookup_signatured_type (*ref_cu, signature);
- /* sig_type will be NULL if the signatured type is missing from
- the debug info. */
- if (sig_type == NULL)
- {
- error (_("Dwarf Error: Cannot find signatured DIE %s referenced"
- " from DIE at 0x%x [in module %s]"),
- hex_string (signature), to_underlying (src_die->sect_off),
- objfile_name ((*ref_cu)->objfile));
- }
+ struct type *descriptive_type = die_descriptive_type (die, cu);
- die = follow_die_sig_1 (src_die, sig_type, ref_cu);
- if (die == NULL)
+ if (descriptive_type)
{
- dump_die_for_error (src_die);
- error (_("Dwarf Error: Problem reading signatured DIE %s referenced"
- " from DIE at 0x%x [in module %s]"),
- hex_string (signature), to_underlying (src_die->sect_off),
- objfile_name ((*ref_cu)->objfile));
+ ALLOCATE_GNAT_AUX_TYPE (type);
+ TYPE_DESCRIPTIVE_TYPE (type) = descriptive_type;
}
-
- return die;
}
-/* Get the type specified by SIGNATURE referenced in DIE/CU,
- reading in and processing the type unit if necessary. */
+/* Return the containing type of the die in question using its
+ DW_AT_containing_type attribute. */
static struct type *
-get_signatured_type (struct die_info *die, ULONGEST signature,
- struct dwarf2_cu *cu)
+die_containing_type (struct die_info *die, struct dwarf2_cu *cu)
{
- struct signatured_type *sig_type;
- struct dwarf2_cu *type_cu;
- struct die_info *type_die;
- struct type *type;
+ struct attribute *type_attr;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
- sig_type = lookup_signatured_type (cu, signature);
- /* sig_type will be NULL if the signatured type is missing from
- the debug info. */
- if (sig_type == NULL)
- {
- complaint (&symfile_complaints,
- _("Dwarf Error: Cannot find signatured DIE %s referenced"
- " from DIE at 0x%x [in module %s]"),
- hex_string (signature), to_underlying (die->sect_off),
- objfile_name (dwarf2_per_objfile->objfile));
- return build_error_marker_type (cu, die);
- }
+ type_attr = dwarf2_attr (die, DW_AT_containing_type, cu);
+ if (!type_attr)
+ error (_("Dwarf Error: Problem turning containing type into gdb type "
+ "[in module %s]"), objfile_name (objfile));
- /* If we already know the type we're done. */
- if (sig_type->type != NULL)
- return sig_type->type;
+ return lookup_die_type (die, type_attr, cu);
+}
- type_cu = cu;
- type_die = follow_die_sig_1 (die, sig_type, &type_cu);
- if (type_die != NULL)
- {
- /* N.B. We need to call get_die_type to ensure only one type for this DIE
- is created. This is important, for example, because for c++ classes
- we need TYPE_NAME set which is only done by new_symbol. Blech. */
- type = read_type_die (type_die, type_cu);
- if (type == NULL)
- {
- complaint (&symfile_complaints,
- _("Dwarf Error: Cannot build signatured type %s"
- " referenced from DIE at 0x%x [in module %s]"),
- hex_string (signature), to_underlying (die->sect_off),
- objfile_name (dwarf2_per_objfile->objfile));
- type = build_error_marker_type (cu, die);
- }
- }
- else
- {
- complaint (&symfile_complaints,
- _("Dwarf Error: Problem reading signatured DIE %s referenced"
- " from DIE at 0x%x [in module %s]"),
- hex_string (signature), to_underlying (die->sect_off),
- objfile_name (dwarf2_per_objfile->objfile));
- type = build_error_marker_type (cu, die);
- }
- sig_type->type = type;
+/* Return an error marker type to use for the ill formed type in DIE/CU. */
+
+static struct type *
+build_error_marker_type (struct dwarf2_cu *cu, struct die_info *die)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ char *message, *saved;
- return type;
+ message = xstrprintf (_("<unknown type in %s, CU %s, DIE %s>"),
+ objfile_name (objfile),
+ sect_offset_str (cu->header.sect_off),
+ sect_offset_str (die->sect_off));
+ saved = (char *) obstack_copy0 (&objfile->objfile_obstack,
+ message, strlen (message));
+ xfree (message);
+
+ return init_type (objfile, TYPE_CODE_ERROR, 0, saved);
}
-/* Get the type specified by the DW_AT_signature ATTR in DIE/CU,
- reading in and processing the type unit if necessary. */
+/* Look up the type of DIE in CU using its type attribute ATTR.
+ ATTR must be one of: DW_AT_type, DW_AT_GNAT_descriptive_type,
+ DW_AT_containing_type.
+ If there is no type substitute an error marker. */
static struct type *
-get_DW_AT_signature_type (struct die_info *die, const struct attribute *attr,
- struct dwarf2_cu *cu) /* ARI: editCase function */
+lookup_die_type (struct die_info *die, const struct attribute *attr,
+ struct dwarf2_cu *cu)
{
- /* Yes, DW_AT_signature can use a non-ref_sig8 reference. */
- if (attr_form_is_ref (attr))
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct type *this_type;
+
+ gdb_assert (attr->name == DW_AT_type
+ || attr->name == DW_AT_GNAT_descriptive_type
+ || attr->name == DW_AT_containing_type);
+
+ /* First see if we have it cached. */
+
+ if (attr->form == DW_FORM_GNU_ref_alt)
{
- struct dwarf2_cu *type_cu = cu;
- struct die_info *type_die = follow_die_ref (die, attr, &type_cu);
+ struct dwarf2_per_cu_data *per_cu;
+ sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
- return read_type_die (type_die, type_cu);
+ per_cu = dwarf2_find_containing_comp_unit (sect_off, 1,
+ dwarf2_per_objfile);
+ this_type = get_die_type_at_offset (sect_off, per_cu);
+ }
+ else if (attr_form_is_ref (attr))
+ {
+ sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
+
+ this_type = get_die_type_at_offset (sect_off, cu->per_cu);
}
else if (attr->form == DW_FORM_ref_sig8)
{
- return get_signatured_type (die, DW_SIGNATURE (attr), cu);
+ ULONGEST signature = DW_SIGNATURE (attr);
+
+ return get_signatured_type (die, signature, cu);
}
else
{
- complaint (&symfile_complaints,
- _("Dwarf Error: DW_AT_signature has bad form %s in DIE"
- " at 0x%x [in module %s]"),
- dwarf_form_name (attr->form), to_underlying (die->sect_off),
- objfile_name (dwarf2_per_objfile->objfile));
+ complaint (_("Dwarf Error: Bad type attribute %s in DIE"
+ " at %s [in module %s]"),
+ dwarf_attr_name (attr->name), sect_offset_str (die->sect_off),
+ objfile_name (objfile));
return build_error_marker_type (cu, die);
}
-}
-/* Load the DIEs associated with type unit PER_CU into memory. */
-
-static void
-load_full_type_unit (struct dwarf2_per_cu_data *per_cu)
-{
- struct signatured_type *sig_type;
+ /* If not cached we need to read it in. */
- /* Caller is responsible for ensuring type_unit_groups don't get here. */
- gdb_assert (! IS_TYPE_UNIT_GROUP (per_cu));
+ if (this_type == NULL)
+ {
+ struct die_info *type_die = NULL;
+ struct dwarf2_cu *type_cu = cu;
- /* We have the per_cu, but we need the signatured_type.
- Fortunately this is an easy translation. */
- gdb_assert (per_cu->is_debug_types);
- sig_type = (struct signatured_type *) per_cu;
+ if (attr_form_is_ref (attr))
+ type_die = follow_die_ref (die, attr, &type_cu);
+ if (type_die == NULL)
+ return build_error_marker_type (cu, die);
+ /* If we find the type now, it's probably because the type came
+ from an inter-CU reference and the type's CU got expanded before
+ ours. */
+ this_type = read_type_die (type_die, type_cu);
+ }
- gdb_assert (per_cu->cu == NULL);
+ /* If we still don't have a type use an error marker. */
- read_signatured_type (sig_type);
+ if (this_type == NULL)
+ return build_error_marker_type (cu, die);
- gdb_assert (per_cu->cu != NULL);
+ return this_type;
}
-/* die_reader_func for read_signatured_type.
- This is identical to load_full_comp_unit_reader,
- but is kept separate for now. */
+/* Return the type in DIE, CU.
+ Returns NULL for invalid types.
-static void
-read_signatured_type_reader (const struct die_reader_specs *reader,
- const gdb_byte *info_ptr,
- struct die_info *comp_unit_die,
- int has_children,
- void *data)
-{
- struct dwarf2_cu *cu = reader->cu;
+ This first does a lookup in die_type_hash,
+ and only reads the die in if necessary.
- gdb_assert (cu->die_hash == NULL);
- cu->die_hash =
- htab_create_alloc_ex (cu->header.length / 12,
- die_hash,
- die_eq,
- NULL,
- &cu->comp_unit_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ NOTE: This can be called when reading in partial or full symbols. */
- if (has_children)
- comp_unit_die->child = read_die_and_siblings (reader, info_ptr,
- &info_ptr, comp_unit_die);
- cu->dies = comp_unit_die;
- /* comp_unit_die is not stored in die_hash, no need. */
+static struct type *
+read_type_die (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *this_type;
- /* We try not to read any attributes in this function, because not
- all CUs needed for references have been loaded yet, and symbol
- table processing isn't initialized. But we have to set the CU language,
- or we won't be able to build types correctly.
- Similarly, if we do not read the producer, we can not apply
- producer-specific interpretation. */
- prepare_one_comp_unit (cu, cu->dies, language_minimal);
+ this_type = get_die_type (die, cu);
+ if (this_type)
+ return this_type;
+
+ return read_type_die_1 (die, cu);
}
-/* Read in a signatured type and build its CU and DIEs.
- If the type is a stub for the real type in a DWO file,
- read in the real type from the DWO file as well. */
+/* Read the type in DIE, CU.
+ Returns NULL for invalid types. */
-static void
-read_signatured_type (struct signatured_type *sig_type)
+static struct type *
+read_type_die_1 (struct die_info *die, struct dwarf2_cu *cu)
{
- struct dwarf2_per_cu_data *per_cu = &sig_type->per_cu;
+ struct type *this_type = NULL;
- gdb_assert (per_cu->is_debug_types);
- gdb_assert (per_cu->cu == NULL);
+ switch (die->tag)
+ {
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ this_type = read_structure_type (die, cu);
+ break;
+ case DW_TAG_enumeration_type:
+ this_type = read_enumeration_type (die, cu);
+ break;
+ case DW_TAG_subprogram:
+ case DW_TAG_subroutine_type:
+ case DW_TAG_inlined_subroutine:
+ this_type = read_subroutine_type (die, cu);
+ break;
+ case DW_TAG_array_type:
+ this_type = read_array_type (die, cu);
+ break;
+ case DW_TAG_set_type:
+ this_type = read_set_type (die, cu);
+ break;
+ case DW_TAG_pointer_type:
+ this_type = read_tag_pointer_type (die, cu);
+ break;
+ case DW_TAG_ptr_to_member_type:
+ this_type = read_tag_ptr_to_member_type (die, cu);
+ break;
+ case DW_TAG_reference_type:
+ this_type = read_tag_reference_type (die, cu, TYPE_CODE_REF);
+ break;
+ case DW_TAG_rvalue_reference_type:
+ this_type = read_tag_reference_type (die, cu, TYPE_CODE_RVALUE_REF);
+ break;
+ case DW_TAG_const_type:
+ this_type = read_tag_const_type (die, cu);
+ break;
+ case DW_TAG_volatile_type:
+ this_type = read_tag_volatile_type (die, cu);
+ break;
+ case DW_TAG_restrict_type:
+ this_type = read_tag_restrict_type (die, cu);
+ break;
+ case DW_TAG_string_type:
+ this_type = read_tag_string_type (die, cu);
+ break;
+ case DW_TAG_typedef:
+ this_type = read_typedef (die, cu);
+ break;
+ case DW_TAG_subrange_type:
+ this_type = read_subrange_type (die, cu);
+ break;
+ case DW_TAG_base_type:
+ this_type = read_base_type (die, cu);
+ break;
+ case DW_TAG_unspecified_type:
+ this_type = read_unspecified_type (die, cu);
+ break;
+ case DW_TAG_namespace:
+ this_type = read_namespace_type (die, cu);
+ break;
+ case DW_TAG_module:
+ this_type = read_module_type (die, cu);
+ break;
+ case DW_TAG_atomic_type:
+ this_type = read_tag_atomic_type (die, cu);
+ break;
+ default:
+ complaint (_("unexpected tag in read_type_die: '%s'"),
+ dwarf_tag_name (die->tag));
+ break;
+ }
- init_cutu_and_read_dies (per_cu, NULL, 0, 1,
- read_signatured_type_reader, NULL);
- sig_type->per_cu.tu_read = 1;
+ return this_type;
}
-/* Decode simple location descriptions.
- Given a pointer to a dwarf block that defines a location, compute
- the location and return the value.
-
- 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).
-
- A location description containing no operations indicates that the
- object is optimized out. The return value is 0 for that case.
- 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.
-
- Note that stack[0] is unused except as a default error return. */
+/* 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.
+ Return the computed name or NULL.
+ Space for the result is allocated on the objfile's obstack.
+ This is the full-die version of guess_partial_die_structure_name.
+ In this case we know DIE has no useful parent. */
-static CORE_ADDR
-decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
+static char *
+guess_full_die_structure_name (struct die_info *die, struct dwarf2_cu *cu)
{
- struct objfile *objfile = cu->objfile;
- size_t i;
- size_t size = blk->size;
- const gdb_byte *data = blk->data;
- CORE_ADDR stack[64];
- int stacki;
- unsigned int bytes_read, unsnd;
- gdb_byte op;
+ struct die_info *spec_die;
+ struct dwarf2_cu *spec_cu;
+ struct die_info *child;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
- i = 0;
- stacki = 0;
- stack[stacki] = 0;
- stack[++stacki] = 0;
+ spec_cu = cu;
+ spec_die = die_specification (die, &spec_cu);
+ if (spec_die != NULL)
+ {
+ die = spec_die;
+ cu = spec_cu;
+ }
- while (i < size)
+ for (child = die->child;
+ child != NULL;
+ child = child->sibling)
{
- op = data[i++];
- switch (op)
+ if (child->tag == DW_TAG_subprogram)
{
- 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;
+ const char *linkage_name = dw2_linkage_name (child, cu);
- 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:
- stack[++stacki] = op - DW_OP_reg0;
- if (i < size)
- dwarf2_complex_location_expr_complaint ();
- break;
+ if (linkage_name != NULL)
+ {
+ char *actual_name
+ = language_class_name_from_physname (cu->language_defn,
+ linkage_name);
+ char *name = NULL;
- case DW_OP_regx:
- unsnd = read_unsigned_leb128 (NULL, (data + i), &bytes_read);
- i += bytes_read;
- stack[++stacki] = unsnd;
- if (i < size)
- dwarf2_complex_location_expr_complaint ();
- break;
+ if (actual_name != NULL)
+ {
+ const char *die_name = dwarf2_name (die, cu);
- case DW_OP_addr:
- stack[++stacki] = read_address (objfile->obfd, &data[i],
- cu, &bytes_read);
- i += bytes_read;
- break;
+ if (die_name != NULL
+ && strcmp (die_name, actual_name) != 0)
+ {
+ /* Strip off the class name from the full name.
+ We want the prefix. */
+ int die_name_len = strlen (die_name);
+ int actual_name_len = strlen (actual_name);
- case DW_OP_const1u:
- stack[++stacki] = read_1_byte (objfile->obfd, &data[i]);
- i += 1;
- break;
+ /* Test for '::' as a sanity check. */
+ if (actual_name_len > die_name_len + 2
+ && actual_name[actual_name_len
+ - die_name_len - 1] == ':')
+ name = (char *) obstack_copy0 (
+ &objfile->per_bfd->storage_obstack,
+ actual_name, actual_name_len - die_name_len - 2);
+ }
+ }
+ xfree (actual_name);
+ return name;
+ }
+ }
+ }
- case DW_OP_const1s:
- stack[++stacki] = read_1_signed_byte (objfile->obfd, &data[i]);
- i += 1;
- break;
+ return NULL;
+}
- case DW_OP_const2u:
- stack[++stacki] = read_2_bytes (objfile->obfd, &data[i]);
- i += 2;
- break;
+/* GCC might emit a nameless typedef that has a linkage name. Determine the
+ prefix part in such case. See
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
- case DW_OP_const2s:
- stack[++stacki] = read_2_signed_bytes (objfile->obfd, &data[i]);
- i += 2;
- break;
+static const char *
+anonymous_struct_prefix (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct attribute *attr;
+ const char *base;
- case DW_OP_const4u:
- stack[++stacki] = read_4_bytes (objfile->obfd, &data[i]);
- i += 4;
- break;
+ if (die->tag != DW_TAG_class_type && die->tag != DW_TAG_interface_type
+ && die->tag != DW_TAG_structure_type && die->tag != DW_TAG_union_type)
+ return NULL;
- case DW_OP_const4s:
- stack[++stacki] = read_4_signed_bytes (objfile->obfd, &data[i]);
- i += 4;
- break;
+ if (dwarf2_string_attr (die, DW_AT_name, cu) != NULL)
+ return NULL;
- case DW_OP_const8u:
- stack[++stacki] = read_8_bytes (objfile->obfd, &data[i]);
- i += 8;
- break;
+ attr = dw2_linkage_name_attr (die, cu);
+ if (attr == NULL || DW_STRING (attr) == NULL)
+ return NULL;
- case DW_OP_constu:
- stack[++stacki] = read_unsigned_leb128 (NULL, (data + i),
- &bytes_read);
- i += bytes_read;
- break;
+ /* dwarf2_name had to be already called. */
+ gdb_assert (DW_STRING_IS_CANONICAL (attr));
- case DW_OP_consts:
- stack[++stacki] = read_signed_leb128 (NULL, (data + i), &bytes_read);
- i += bytes_read;
- break;
+ /* Strip the base name, keep any leading namespaces/classes. */
+ base = strrchr (DW_STRING (attr), ':');
+ if (base == NULL || base == DW_STRING (attr) || base[-1] != ':')
+ return "";
- case DW_OP_dup:
- stack[stacki + 1] = stack[stacki];
- stacki++;
- break;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ return (char *) obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ DW_STRING (attr),
+ &base[-1] - DW_STRING (attr));
+}
- case DW_OP_plus:
- stack[stacki - 1] += stack[stacki];
- stacki--;
- break;
+/* Return the name of the namespace/class that DIE is defined within,
+ or "" if we can't tell. The caller should not xfree the result.
- case DW_OP_plus_uconst:
- stack[stacki] += read_unsigned_leb128 (NULL, (data + i),
- &bytes_read);
- i += bytes_read;
- break;
+ For example, if we're within the method foo() in the following
+ code:
- case DW_OP_minus:
- stack[stacki - 1] -= stack[stacki];
- stacki--;
- break;
+ namespace N {
+ class C {
+ void foo () {
+ }
+ };
+ }
- case DW_OP_deref:
- /* If we're not the last op, then we definitely can't encode
- 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. */
- if (i < size)
- dwarf2_complex_location_expr_complaint ();
- break;
+ then determine_prefix on foo's die will return "N::C". */
- case DW_OP_GNU_push_tls_address:
- case DW_OP_form_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. */
- /* This is valid for partial global symbols, but the variable's
- address will be bogus in the psymtab. Make it always at least
- non-zero to not look as a variable garbage collected by linker
- which have DW_OP_addr 0. */
- if (i < size)
- dwarf2_complex_location_expr_complaint ();
- stack[stacki]++;
- break;
+static const char *
+determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct die_info *parent, *spec_die;
+ struct dwarf2_cu *spec_cu;
+ struct type *parent_type;
+ const char *retval;
- case DW_OP_GNU_uninit:
- break;
+ if (cu->language != language_cplus
+ && cu->language != language_fortran && cu->language != language_d
+ && cu->language != language_rust)
+ return "";
- case DW_OP_GNU_addr_index:
- case DW_OP_GNU_const_index:
- stack[++stacki] = read_addr_index_from_leb128 (cu, &data[i],
- &bytes_read);
- i += bytes_read;
- break;
+ retval = anonymous_struct_prefix (die, cu);
+ if (retval)
+ return retval;
- default:
- {
- const char *name = get_DW_OP_name (op);
+ /* We have to be careful in the presence of DW_AT_specification.
+ For example, with GCC 3.4, given the code
- if (name)
- complaint (&symfile_complaints, _("unsupported stack op: '%s'"),
- name);
- else
- complaint (&symfile_complaints, _("unsupported stack op: '%02x'"),
- op);
- }
+ namespace N {
+ void foo() {
+ // Definition of N::foo.
+ }
+ }
- return (stack[stacki]);
- }
+ then we'll have a tree of DIEs like this:
- /* Enforce maximum stack depth of SIZE-1 to avoid writing
- outside of the allocated space. Also enforce minimum>0. */
- if (stacki >= ARRAY_SIZE (stack) - 1)
- {
- complaint (&symfile_complaints,
- _("location description stack overflow"));
- return 0;
- }
+ 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
- if (stacki <= 0)
- {
- complaint (&symfile_complaints,
- _("location description stack underflow"));
- return 0;
- }
+ 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. */
+ spec_cu = cu;
+ spec_die = die_specification (die, &spec_cu);
+ if (spec_die == NULL)
+ parent = die->parent;
+ else
+ {
+ parent = spec_die->parent;
+ cu = spec_cu;
}
- return (stack[stacki]);
-}
-/* memory allocation interface */
+ if (parent == NULL)
+ return "";
+ else if (parent->building_fullname)
+ {
+ const char *name;
+ const char *parent_name;
-static struct dwarf_block *
-dwarf_alloc_block (struct dwarf2_cu *cu)
-{
- return XOBNEW (&cu->comp_unit_obstack, struct dwarf_block);
-}
+ /* It has been seen on RealView 2.2 built binaries,
+ DW_TAG_template_type_param types actually _defined_ as
+ children of the parent class:
-static struct die_info *
-dwarf_alloc_die (struct dwarf2_cu *cu, int num_attrs)
-{
- struct die_info *die;
- size_t size = sizeof (struct die_info);
+ enum E {};
+ template class <class Enum> Class{};
+ Class<enum E> class_e;
- if (num_attrs > 1)
- size += (num_attrs - 1) * sizeof (struct attribute);
+ 1: DW_TAG_class_type (Class)
+ 2: DW_TAG_enumeration_type (E)
+ 3: DW_TAG_enumerator (enum1:0)
+ 3: DW_TAG_enumerator (enum2:1)
+ ...
+ 2: DW_TAG_template_type_param
+ DW_AT_type DW_FORM_ref_udata (E)
- die = (struct die_info *) obstack_alloc (&cu->comp_unit_obstack, size);
- memset (die, 0, sizeof (struct die_info));
- return (die);
+ Besides being broken debug info, it can put GDB into an
+ infinite loop. Consider:
+
+ When we're building the full name for Class<E>, we'll start
+ at Class, and go look over its template type parameters,
+ finding E. We'll then try to build the full name of E, and
+ reach here. We're now trying to build the full name of E,
+ and look over the parent DIE for containing scope. In the
+ broken case, if we followed the parent DIE of E, we'd again
+ find Class, and once again go look at its template type
+ arguments, etc., etc. Simply don't consider such parent die
+ as source-level parent of this die (it can't be, the language
+ doesn't allow it), and break the loop here. */
+ name = dwarf2_name (die, cu);
+ parent_name = dwarf2_name (parent, cu);
+ complaint (_("template param type '%s' defined within parent '%s'"),
+ name ? name : "<unknown>",
+ parent_name ? parent_name : "<unknown>");
+ return "";
+ }
+ else
+ switch (parent->tag)
+ {
+ case DW_TAG_namespace:
+ parent_type = read_type_die (parent, cu);
+ /* GCC 4.0 and 4.1 had a bug (PR c++/28460) where they generated bogus
+ DW_TAG_namespace DIEs with a name of "::" for the global namespace.
+ Work around this problem here. */
+ if (cu->language == language_cplus
+ && strcmp (TYPE_NAME (parent_type), "::") == 0)
+ return "";
+ /* We give a name to even anonymous namespaces. */
+ return TYPE_NAME (parent_type);
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ case DW_TAG_module:
+ parent_type = read_type_die (parent, cu);
+ if (TYPE_NAME (parent_type) != NULL)
+ return TYPE_NAME (parent_type);
+ else
+ /* An anonymous structure is only allowed non-static data
+ members; no typedefs, no member functions, et cetera.
+ So it does not need a prefix. */
+ return "";
+ case DW_TAG_compile_unit:
+ case DW_TAG_partial_unit:
+ /* gcc-4.5 -gdwarf-4 can drop the enclosing namespace. Cope. */
+ if (cu->language == language_cplus
+ && !VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types)
+ && die->child != NULL
+ && (die->tag == DW_TAG_class_type
+ || die->tag == DW_TAG_structure_type
+ || die->tag == DW_TAG_union_type))
+ {
+ char *name = guess_full_die_structure_name (die, cu);
+ if (name != NULL)
+ return name;
+ }
+ return "";
+ case DW_TAG_enumeration_type:
+ parent_type = read_type_die (parent, cu);
+ if (TYPE_DECLARED_CLASS (parent_type))
+ {
+ if (TYPE_NAME (parent_type) != NULL)
+ return TYPE_NAME (parent_type);
+ return "";
+ }
+ /* Fall through. */
+ default:
+ return determine_prefix (parent, cu);
+ }
}
-\f
-/* Macro support. */
+/* Return a newly-allocated string formed by concatenating PREFIX and SUFFIX
+ with appropriate separator. If PREFIX or SUFFIX is NULL or empty, then
+ simply copy the SUFFIX or PREFIX, respectively. If OBS is non-null, perform
+ an obconcat, otherwise allocate storage for the result. The CU argument is
+ used to determine the language and hence, the appropriate separator. */
-/* Return file name relative to the compilation directory of file number I in
- *LH's file name table. The result is allocated using xmalloc; the caller is
- responsible for freeing it. */
+#define MAX_SEP_LEN 7 /* strlen ("__") + strlen ("_MOD_") */
static char *
-file_file_name (int file, struct line_header *lh)
+typename_concat (struct obstack *obs, const char *prefix, const char *suffix,
+ int physname, struct dwarf2_cu *cu)
{
- /* Is the file number a valid index into the line header's file name
- table? Remember that file numbers start with one, not zero. */
- if (1 <= file && file <= lh->file_names.size ())
- {
- const file_entry &fe = lh->file_names[file - 1];
+ const char *lead = "";
+ const char *sep;
- if (!IS_ABSOLUTE_PATH (fe.name))
+ if (suffix == NULL || suffix[0] == '\0'
+ || prefix == NULL || prefix[0] == '\0')
+ sep = "";
+ else if (cu->language == language_d)
+ {
+ /* For D, the 'main' function could be defined in any module, but it
+ should never be prefixed. */
+ if (strcmp (suffix, "D main") == 0)
{
- const char *dir = fe.include_dir (lh);
- if (dir != NULL)
- return concat (dir, SLASH_STRING, fe.name, (char *) NULL);
+ prefix = "";
+ sep = "";
}
- return xstrdup (fe.name);
- }
- else
- {
- /* The compiler produced a bogus file number. We can at least
- record the macro definitions made in the file, even if we
- won't be able to find the file by name. */
- char fake_name[80];
-
- xsnprintf (fake_name, sizeof (fake_name),
- "<bad macro file number %d>", file);
-
- complaint (&symfile_complaints,
- _("bad file number in macro information (%d)"),
- file);
-
- return xstrdup (fake_name);
+ else
+ sep = ".";
}
-}
-
-/* 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)
-{
- /* Is the file number a valid index into the line header's file name
- table? Remember that file numbers start with one, not zero. */
- if (1 <= file && file <= lh->file_names.size ())
+ else if (cu->language == language_fortran && physname)
{
- char *relative = file_file_name (file, lh);
+ /* This is gfortran specific mangling. Normally DW_AT_linkage_name or
+ DW_AT_MIPS_linkage_name is preferred and used instead. */
- if (IS_ABSOLUTE_PATH (relative) || comp_dir == NULL)
- return relative;
- return reconcat (relative, comp_dir, SLASH_STRING,
- relative, (char *) NULL);
+ lead = "__";
+ sep = "_MOD_";
}
else
- return file_file_name (file, lh);
-}
-
+ sep = "::";
-static struct macro_source_file *
-macro_start_file (int file, int line,
- struct macro_source_file *current_file,
- struct line_header *lh)
-{
- /* File name relative to the compilation directory of this source file. */
- char *file_name = file_file_name (file, lh);
+ if (prefix == NULL)
+ prefix = "";
+ if (suffix == NULL)
+ suffix = "";
- if (! current_file)
+ if (obs == NULL)
{
- /* Note: We don't create a macro table for this compilation unit
- at all until we actually get a filename. */
- struct macro_table *macro_table = get_macro_table ();
+ char *retval
+ = ((char *)
+ xmalloc (strlen (prefix) + MAX_SEP_LEN + strlen (suffix) + 1));
- /* 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 (macro_table, file_name);
- macro_define_special (macro_table);
+ strcpy (retval, lead);
+ strcat (retval, prefix);
+ strcat (retval, sep);
+ strcat (retval, suffix);
+ return retval;
}
else
- current_file = macro_include (current_file, line, file_name);
+ {
+ /* We have an obstack. */
+ return obconcat (obs, lead, prefix, sep, suffix, (char *) NULL);
+ }
+}
- xfree (file_name);
+/* Return sibling of die, NULL if no sibling. */
- return current_file;
+static struct die_info *
+sibling_die (struct die_info *die)
+{
+ return die->sibling;
}
+/* Get name of a die, return NULL if not found. */
+
static const char *
-consume_improper_spaces (const char *p, const char *body)
+dwarf2_canonicalize_name (const char *name, struct dwarf2_cu *cu,
+ struct obstack *obstack)
{
- if (*p == ' ')
+ if (name && cu->language == language_cplus)
{
- complaint (&symfile_complaints,
- _("macro definition contains spaces "
- "in formal argument list:\n`%s'"),
- body);
+ std::string canon_name = cp_canonicalize_string (name);
- while (*p == ' ')
- p++;
+ if (!canon_name.empty ())
+ {
+ if (canon_name != name)
+ name = (const char *) obstack_copy0 (obstack,
+ canon_name.c_str (),
+ canon_name.length ());
+ }
}
- return p;
+ return name;
}
+/* Get name of a die, return NULL if not found.
+ Anonymous namespaces are converted to their magic string. */
-static void
-parse_macro_definition (struct macro_source_file *file, int line,
- const char *body)
+static const char *
+dwarf2_name (struct die_info *die, struct dwarf2_cu *cu)
{
- const char *p;
-
- /* The body string takes one of two forms. For object-like macro
- definitions, it should be:
-
- <macro name> " " <definition>
+ struct attribute *attr;
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
- For function-like macro definitions, it should be:
+ attr = dwarf2_attr (die, DW_AT_name, cu);
+ if ((!attr || !DW_STRING (attr))
+ && die->tag != DW_TAG_namespace
+ && die->tag != DW_TAG_class_type
+ && die->tag != DW_TAG_interface_type
+ && die->tag != DW_TAG_structure_type
+ && die->tag != DW_TAG_union_type)
+ return NULL;
- <macro name> "() " <definition>
- or
- <macro name> "(" <arg name> ( "," <arg name> ) * ") " <definition>
+ switch (die->tag)
+ {
+ case DW_TAG_compile_unit:
+ case DW_TAG_partial_unit:
+ /* Compilation units have a DW_AT_name that is a filename, not
+ a source language identifier. */
+ case DW_TAG_enumeration_type:
+ case DW_TAG_enumerator:
+ /* These tags always have simple identifiers already; no need
+ to canonicalize them. */
+ return DW_STRING (attr);
- Spaces may appear only where explicitly indicated, and in the
- <definition>.
+ case DW_TAG_namespace:
+ if (attr != NULL && DW_STRING (attr) != NULL)
+ return DW_STRING (attr);
+ return CP_ANONYMOUS_NAMESPACE_STR;
- 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.
+ case DW_TAG_class_type:
+ case DW_TAG_interface_type:
+ case DW_TAG_structure_type:
+ case DW_TAG_union_type:
+ /* Some GCC versions emit spurious DW_AT_name attributes for unnamed
+ structures or unions. These were of the form "._%d" in GCC 4.1,
+ or simply "<anonymous struct>" or "<anonymous union>" in GCC 4.3
+ and GCC 4.4. We work around this problem by ignoring these. */
+ if (attr && DW_STRING (attr)
+ && (startswith (DW_STRING (attr), "._")
+ || startswith (DW_STRING (attr), "<anonymous")))
+ return NULL;
- 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. */
+ /* GCC might emit a nameless typedef that has a linkage name. See
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47510. */
+ if (!attr || DW_STRING (attr) == NULL)
+ {
+ char *demangled = NULL;
+ attr = dw2_linkage_name_attr (die, cu);
+ if (attr == NULL || DW_STRING (attr) == NULL)
+ return NULL;
- /* 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;
+ /* Avoid demangling DW_STRING (attr) the second time on a second
+ call for the same DIE. */
+ if (!DW_STRING_IS_CANONICAL (attr))
+ demangled = gdb_demangle (DW_STRING (attr), DMGL_TYPES);
- if (*p == ' ' || *p == '\0')
- {
- /* It's an object-like macro. */
- int name_len = p - body;
- char *name = savestring (body, name_len);
- const char *replacement;
+ if (demangled)
+ {
+ const char *base;
- if (*p == ' ')
- replacement = body + name_len + 1;
- else
- {
- dwarf2_macro_malformed_definition_complaint (body);
- replacement = body + name_len;
- }
+ /* FIXME: we already did this for the partial symbol... */
+ DW_STRING (attr)
+ = ((const char *)
+ obstack_copy0 (&objfile->per_bfd->storage_obstack,
+ demangled, strlen (demangled)));
+ DW_STRING_IS_CANONICAL (attr) = 1;
+ xfree (demangled);
- macro_define_object (file, line, name, replacement);
+ /* Strip any leading namespaces/classes, keep only the base name.
+ DW_AT_name for named DIEs does not contain the prefixes. */
+ base = strrchr (DW_STRING (attr), ':');
+ if (base && base > DW_STRING (attr) && base[-1] == ':')
+ return &base[1];
+ else
+ return DW_STRING (attr);
+ }
+ }
+ break;
- xfree (name);
+ default:
+ break;
}
- else if (*p == '(')
+
+ if (!DW_STRING_IS_CANONICAL (attr))
{
- /* It's a function-like macro. */
- char *name = savestring (body, p - body);
- int argc = 0;
- int argv_size = 1;
- char **argv = XNEWVEC (char *, argv_size);
+ DW_STRING (attr)
+ = dwarf2_canonicalize_name (DW_STRING (attr), cu,
+ &objfile->per_bfd->storage_obstack);
+ DW_STRING_IS_CANONICAL (attr) = 1;
+ }
+ return DW_STRING (attr);
+}
- p++;
+/* Return the die that this die in an extension of, or NULL if there
+ is none. *EXT_CU is the CU containing DIE on input, and the CU
+ containing the return value on output. */
- p = consume_improper_spaces (p, body);
+static struct die_info *
+dwarf2_extension (struct die_info *die, struct dwarf2_cu **ext_cu)
+{
+ struct attribute *attr;
- /* Parse the formal argument list. */
- while (*p && *p != ')')
- {
- /* Find the extent of the current argument name. */
- const char *arg_start = p;
+ attr = dwarf2_attr (die, DW_AT_extension, *ext_cu);
+ if (attr == NULL)
+ return NULL;
- while (*p && *p != ',' && *p != ')' && *p != ' ')
- p++;
+ return follow_die_ref (die, attr, ext_cu);
+}
- if (! *p || p == arg_start)
- dwarf2_macro_malformed_definition_complaint (body);
- else
- {
- /* Make sure argv has room for the new argument. */
- if (argc >= argv_size)
- {
- argv_size *= 2;
- argv = XRESIZEVEC (char *, argv, argv_size);
- }
+/* Convert a DIE tag into its string name. */
- argv[argc++] = savestring (arg_start, p - arg_start);
- }
+static const char *
+dwarf_tag_name (unsigned tag)
+{
+ const char *name = get_DW_TAG_name (tag);
- p = consume_improper_spaces (p, body);
+ if (name == NULL)
+ return "DW_TAG_<unknown>";
- /* Consume the comma, if present. */
- if (*p == ',')
- {
- p++;
+ return name;
+}
- p = consume_improper_spaces (p, body);
- }
- }
+/* Convert a DWARF attribute code into its string name. */
- if (*p == ')')
- {
- p++;
+static const char *
+dwarf_attr_name (unsigned attr)
+{
+ const char *name;
- 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. */
- dwarf2_macro_malformed_definition_complaint (body);
- macro_define_function (file, line, name,
- argc, (const char **) argv,
- p);
- }
- else
- /* Just complain. */
- dwarf2_macro_malformed_definition_complaint (body);
- }
- else
- /* Just complain. */
- dwarf2_macro_malformed_definition_complaint (body);
+#ifdef MIPS /* collides with DW_AT_HP_block_index */
+ if (attr == DW_AT_MIPS_fde)
+ return "DW_AT_MIPS_fde";
+#else
+ if (attr == DW_AT_HP_block_index)
+ return "DW_AT_HP_block_index";
+#endif
- xfree (name);
- {
- int i;
+ name = get_DW_AT_name (attr);
- for (i = 0; i < argc; i++)
- xfree (argv[i]);
- }
- xfree (argv);
- }
+ if (name == NULL)
+ return "DW_AT_<unknown>";
+
+ return name;
+}
+
+/* Convert a DWARF value form code into its string name. */
+
+static const char *
+dwarf_form_name (unsigned form)
+{
+ const char *name = get_DW_FORM_name (form);
+
+ if (name == NULL)
+ return "DW_FORM_<unknown>";
+
+ return name;
+}
+
+static const char *
+dwarf_bool_name (unsigned mybool)
+{
+ if (mybool)
+ return "TRUE";
else
- dwarf2_macro_malformed_definition_complaint (body);
+ return "FALSE";
}
-/* Skip some bytes from BYTES according to the form given in FORM.
- Returns the new pointer. */
+/* Convert a DWARF type code into its string name. */
-static const gdb_byte *
-skip_form_bytes (bfd *abfd, const gdb_byte *bytes, const gdb_byte *buffer_end,
- enum dwarf_form form,
- unsigned int offset_size,
- struct dwarf2_section_info *section)
+static const char *
+dwarf_type_encoding_name (unsigned enc)
{
- unsigned int bytes_read;
+ const char *name = get_DW_ATE_name (enc);
- switch (form)
+ if (name == NULL)
+ return "DW_ATE_<unknown>";
+
+ return name;
+}
+
+static void
+dump_die_shallow (struct ui_file *f, int indent, struct die_info *die)
+{
+ unsigned int i;
+
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, "Die: %s (abbrev %d, offset %s)\n",
+ dwarf_tag_name (die->tag), die->abbrev,
+ sect_offset_str (die->sect_off));
+
+ if (die->parent != NULL)
{
- case DW_FORM_data1:
- case DW_FORM_flag:
- ++bytes;
- break;
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, " parent at offset: %s\n",
+ sect_offset_str (die->parent->sect_off));
+ }
- case DW_FORM_data2:
- bytes += 2;
- break;
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, " has children: %s\n",
+ dwarf_bool_name (die->child != NULL));
- case DW_FORM_data4:
- bytes += 4;
- break;
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, " attributes:\n");
- case DW_FORM_data8:
- bytes += 8;
- break;
+ for (i = 0; i < die->num_attrs; ++i)
+ {
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, " %s (%s) ",
+ dwarf_attr_name (die->attrs[i].name),
+ dwarf_form_name (die->attrs[i].form));
- case DW_FORM_data16:
- bytes += 16;
- break;
+ switch (die->attrs[i].form)
+ {
+ case DW_FORM_addr:
+ case DW_FORM_GNU_addr_index:
+ fprintf_unfiltered (f, "address: ");
+ fputs_filtered (hex_string (DW_ADDR (&die->attrs[i])), f);
+ break;
+ case DW_FORM_block2:
+ case DW_FORM_block4:
+ case DW_FORM_block:
+ case DW_FORM_block1:
+ fprintf_unfiltered (f, "block: size %s",
+ pulongest (DW_BLOCK (&die->attrs[i])->size));
+ break;
+ case DW_FORM_exprloc:
+ fprintf_unfiltered (f, "expression: size %s",
+ pulongest (DW_BLOCK (&die->attrs[i])->size));
+ break;
+ case DW_FORM_data16:
+ fprintf_unfiltered (f, "constant of 16 bytes");
+ break;
+ case DW_FORM_ref_addr:
+ fprintf_unfiltered (f, "ref address: ");
+ fputs_filtered (hex_string (DW_UNSND (&die->attrs[i])), f);
+ break;
+ case DW_FORM_GNU_ref_alt:
+ fprintf_unfiltered (f, "alt ref address: ");
+ fputs_filtered (hex_string (DW_UNSND (&die->attrs[i])), f);
+ break;
+ case DW_FORM_ref1:
+ case DW_FORM_ref2:
+ case DW_FORM_ref4:
+ case DW_FORM_ref8:
+ case DW_FORM_ref_udata:
+ fprintf_unfiltered (f, "constant ref: 0x%lx (adjusted)",
+ (long) (DW_UNSND (&die->attrs[i])));
+ break;
+ case DW_FORM_data1:
+ case DW_FORM_data2:
+ case DW_FORM_data4:
+ case DW_FORM_data8:
+ case DW_FORM_udata:
+ case DW_FORM_sdata:
+ fprintf_unfiltered (f, "constant: %s",
+ pulongest (DW_UNSND (&die->attrs[i])));
+ break;
+ case DW_FORM_sec_offset:
+ fprintf_unfiltered (f, "section offset: %s",
+ pulongest (DW_UNSND (&die->attrs[i])));
+ break;
+ case DW_FORM_ref_sig8:
+ fprintf_unfiltered (f, "signature: %s",
+ hex_string (DW_SIGNATURE (&die->attrs[i])));
+ break;
+ case DW_FORM_string:
+ case DW_FORM_strp:
+ case DW_FORM_line_strp:
+ case DW_FORM_GNU_str_index:
+ case DW_FORM_GNU_strp_alt:
+ fprintf_unfiltered (f, "string: \"%s\" (%s canonicalized)",
+ DW_STRING (&die->attrs[i])
+ ? DW_STRING (&die->attrs[i]) : "",
+ DW_STRING_IS_CANONICAL (&die->attrs[i]) ? "is" : "not");
+ break;
+ case DW_FORM_flag:
+ if (DW_UNSND (&die->attrs[i]))
+ fprintf_unfiltered (f, "flag: TRUE");
+ else
+ fprintf_unfiltered (f, "flag: FALSE");
+ break;
+ case DW_FORM_flag_present:
+ fprintf_unfiltered (f, "flag: TRUE");
+ break;
+ case DW_FORM_indirect:
+ /* The reader will have reduced the indirect form to
+ the "base form" so this form should not occur. */
+ fprintf_unfiltered (f,
+ "unexpected attribute form: DW_FORM_indirect");
+ break;
+ case DW_FORM_implicit_const:
+ fprintf_unfiltered (f, "constant: %s",
+ plongest (DW_SND (&die->attrs[i])));
+ break;
+ default:
+ fprintf_unfiltered (f, "unsupported attribute form: %d.",
+ die->attrs[i].form);
+ break;
+ }
+ fprintf_unfiltered (f, "\n");
+ }
+}
- case DW_FORM_string:
- read_direct_string (abfd, bytes, &bytes_read);
- bytes += bytes_read;
- break;
+static void
+dump_die_for_error (struct die_info *die)
+{
+ dump_die_shallow (gdb_stderr, 0, die);
+}
- case DW_FORM_sec_offset:
- case DW_FORM_strp:
- case DW_FORM_GNU_strp_alt:
- bytes += offset_size;
- break;
+static void
+dump_die_1 (struct ui_file *f, int level, int max_level, struct die_info *die)
+{
+ int indent = level * 4;
- case DW_FORM_block:
- bytes += read_unsigned_leb128 (abfd, bytes, &bytes_read);
- bytes += bytes_read;
- break;
+ gdb_assert (die != NULL);
- case DW_FORM_block1:
- bytes += 1 + read_1_byte (abfd, bytes);
- break;
- case DW_FORM_block2:
- bytes += 2 + read_2_bytes (abfd, bytes);
- break;
- case DW_FORM_block4:
- bytes += 4 + read_4_bytes (abfd, bytes);
- break;
+ if (level >= max_level)
+ return;
- case DW_FORM_sdata:
- case DW_FORM_udata:
- case DW_FORM_GNU_addr_index:
- case DW_FORM_GNU_str_index:
- bytes = gdb_skip_leb128 (bytes, buffer_end);
- if (bytes == NULL)
+ dump_die_shallow (f, indent, die);
+
+ if (die->child != NULL)
+ {
+ print_spaces (indent, f);
+ fprintf_unfiltered (f, " Children:");
+ if (level + 1 < max_level)
{
- dwarf2_section_buffer_overflow_complaint (section);
- return NULL;
+ fprintf_unfiltered (f, "\n");
+ dump_die_1 (f, level + 1, max_level, die->child);
}
- break;
+ else
+ {
+ fprintf_unfiltered (f,
+ " [not printed, max nesting level reached]\n");
+ }
+ }
+
+ if (die->sibling != NULL && level > 0)
+ {
+ dump_die_1 (f, level, max_level, die->sibling);
+ }
+}
+
+/* This is called from the pdie macro in gdbinit.in.
+ It's not static so gcc will keep a copy callable from gdb. */
+
+void
+dump_die (struct die_info *die, int max_level)
+{
+ dump_die_1 (gdb_stdlog, 0, max_level, die);
+}
- case DW_FORM_implicit_const:
- break;
+static void
+store_in_ref_table (struct die_info *die, struct dwarf2_cu *cu)
+{
+ void **slot;
- default:
- {
- complaint (&symfile_complaints,
- _("invalid form 0x%x in `%s'"),
- form, get_section_name (section));
- return NULL;
- }
- }
+ slot = htab_find_slot_with_hash (cu->die_hash, die,
+ to_underlying (die->sect_off),
+ INSERT);
- return bytes;
+ *slot = die;
}
-/* A helper for dwarf_decode_macros that handles skipping an unknown
- opcode. Returns an updated pointer to the macro data buffer; or,
- on error, issues a complaint and returns NULL. */
+/* Return DIE offset of ATTR. Return 0 with complaint if ATTR is not of the
+ required kind. */
-static const gdb_byte *
-skip_unknown_opcode (unsigned int opcode,
- const gdb_byte **opcode_definitions,
- const gdb_byte *mac_ptr, const gdb_byte *mac_end,
- bfd *abfd,
- unsigned int offset_size,
- struct dwarf2_section_info *section)
+static sect_offset
+dwarf2_get_ref_die_offset (const struct attribute *attr)
{
- unsigned int bytes_read, i;
- unsigned long arg;
- const gdb_byte *defn;
+ if (attr_form_is_ref (attr))
+ return (sect_offset) DW_UNSND (attr);
- if (opcode_definitions[opcode] == NULL)
+ complaint (_("unsupported die ref attribute form: '%s'"),
+ dwarf_form_name (attr->form));
+ return {};
+}
+
+/* Return the constant value held by ATTR. Return DEFAULT_VALUE if
+ * the value held by the attribute is not constant. */
+
+static LONGEST
+dwarf2_get_attr_constant_value (const struct attribute *attr, int default_value)
+{
+ if (attr->form == DW_FORM_sdata || attr->form == DW_FORM_implicit_const)
+ 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,
- _("unrecognized DW_MACFINO opcode 0x%x"),
- opcode);
- return NULL;
+ /* For DW_FORM_data16 see attr_form_is_constant. */
+ complaint (_("Attribute value is not a constant (%s)"),
+ dwarf_form_name (attr->form));
+ return default_value;
}
+}
- defn = opcode_definitions[opcode];
- arg = read_unsigned_leb128 (abfd, defn, &bytes_read);
- defn += bytes_read;
+/* Follow reference or signature attribute ATTR of SRC_DIE.
+ On entry *REF_CU is the CU of SRC_DIE.
+ On exit *REF_CU is the CU of the result. */
- for (i = 0; i < arg; ++i)
+static struct die_info *
+follow_die_ref_or_sig (struct die_info *src_die, const struct attribute *attr,
+ struct dwarf2_cu **ref_cu)
+{
+ struct die_info *die;
+
+ if (attr_form_is_ref (attr))
+ die = follow_die_ref (src_die, attr, ref_cu);
+ else if (attr->form == DW_FORM_ref_sig8)
+ die = follow_die_sig (src_die, attr, ref_cu);
+ else
{
- mac_ptr = skip_form_bytes (abfd, mac_ptr, mac_end,
- (enum dwarf_form) defn[i], offset_size,
- section);
- if (mac_ptr == NULL)
- {
- /* skip_form_bytes already issued the complaint. */
- return NULL;
- }
+ dump_die_for_error (src_die);
+ error (_("Dwarf Error: Expected reference attribute [in module %s]"),
+ objfile_name ((*ref_cu)->per_cu->dwarf2_per_objfile->objfile));
}
- return mac_ptr;
+ return die;
}
-/* A helper function which parses the header of a macro section.
- If the macro section is the extended (for now called "GNU") type,
- then this updates *OFFSET_SIZE. Returns a pointer to just after
- the header, or issues a complaint and returns NULL on error. */
+/* Follow reference OFFSET.
+ On entry *REF_CU is the CU of the source die referencing OFFSET.
+ On exit *REF_CU is the CU of the result.
+ Returns NULL if OFFSET is invalid. */
-static const gdb_byte *
-dwarf_parse_macro_header (const gdb_byte **opcode_definitions,
- bfd *abfd,
- const gdb_byte *mac_ptr,
- unsigned int *offset_size,
- int section_is_gnu)
+static struct die_info *
+follow_die_offset (sect_offset sect_off, int offset_in_dwz,
+ struct dwarf2_cu **ref_cu)
{
- memset (opcode_definitions, 0, 256 * sizeof (gdb_byte *));
+ struct die_info temp_die;
+ struct dwarf2_cu *target_cu, *cu = *ref_cu;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- if (section_is_gnu)
+ gdb_assert (cu->per_cu != NULL);
+
+ target_cu = cu;
+
+ if (cu->per_cu->is_debug_types)
{
- unsigned int version, flags;
+ /* .debug_types CUs cannot reference anything outside their CU.
+ If they need to, they have to reference a signatured type via
+ DW_FORM_ref_sig8. */
+ if (!offset_in_cu_p (&cu->header, sect_off))
+ return NULL;
+ }
+ else if (offset_in_dwz != cu->per_cu->is_dwz
+ || !offset_in_cu_p (&cu->header, sect_off))
+ {
+ struct dwarf2_per_cu_data *per_cu;
- version = read_2_bytes (abfd, mac_ptr);
- if (version != 4 && version != 5)
- {
- complaint (&symfile_complaints,
- _("unrecognized version `%d' in .debug_macro section"),
- version);
- return NULL;
- }
- mac_ptr += 2;
+ per_cu = dwarf2_find_containing_comp_unit (sect_off, offset_in_dwz,
+ dwarf2_per_objfile);
- flags = read_1_byte (abfd, mac_ptr);
- ++mac_ptr;
- *offset_size = (flags & 1) ? 8 : 4;
+ /* If necessary, add it to the queue and load its DIEs. */
+ if (maybe_queue_comp_unit (cu, per_cu, cu->language))
+ load_full_comp_unit (per_cu, false, cu->language);
- if ((flags & 2) != 0)
- /* We don't need the line table offset. */
- mac_ptr += *offset_size;
+ target_cu = per_cu->cu;
+ }
+ else if (cu->dies == NULL)
+ {
+ /* We're loading full DIEs during partial symbol reading. */
+ gdb_assert (dwarf2_per_objfile->reading_partial_symbols);
+ load_full_comp_unit (cu->per_cu, false, language_minimal);
+ }
- /* Vendor opcode descriptions. */
- if ((flags & 4) != 0)
- {
- unsigned int i, count;
+ *ref_cu = target_cu;
+ temp_die.sect_off = sect_off;
+ return (struct die_info *) htab_find_with_hash (target_cu->die_hash,
+ &temp_die,
+ to_underlying (sect_off));
+}
- count = read_1_byte (abfd, mac_ptr);
- ++mac_ptr;
- for (i = 0; i < count; ++i)
- {
- unsigned int opcode, bytes_read;
- unsigned long arg;
+/* Follow reference attribute ATTR of SRC_DIE.
+ On entry *REF_CU is the CU of SRC_DIE.
+ On exit *REF_CU is the CU of the result. */
- opcode = read_1_byte (abfd, mac_ptr);
- ++mac_ptr;
- opcode_definitions[opcode] = mac_ptr;
- arg = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- mac_ptr += arg;
- }
- }
- }
+static struct die_info *
+follow_die_ref (struct die_info *src_die, const struct attribute *attr,
+ struct dwarf2_cu **ref_cu)
+{
+ sect_offset sect_off = dwarf2_get_ref_die_offset (attr);
+ struct dwarf2_cu *cu = *ref_cu;
+ struct die_info *die;
- return mac_ptr;
+ die = follow_die_offset (sect_off,
+ (attr->form == DW_FORM_GNU_ref_alt
+ || cu->per_cu->is_dwz),
+ ref_cu);
+ if (!die)
+ error (_("Dwarf Error: Cannot find DIE at %s referenced from DIE "
+ "at %s [in module %s]"),
+ sect_offset_str (sect_off), sect_offset_str (src_die->sect_off),
+ objfile_name (cu->per_cu->dwarf2_per_objfile->objfile));
+
+ return die;
}
-/* A helper for dwarf_decode_macros that handles the GNU extensions,
- including DW_MACRO_import. */
+/* Return DWARF block referenced by DW_AT_location of DIE at SECT_OFF at PER_CU.
+ Returned value is intended for DW_OP_call*. Returned
+ dwarf2_locexpr_baton->data has lifetime of
+ PER_CU->DWARF2_PER_OBJFILE->OBJFILE. */
-static void
-dwarf_decode_macro_bytes (bfd *abfd,
- const gdb_byte *mac_ptr, const gdb_byte *mac_end,
- struct macro_source_file *current_file,
- struct line_header *lh,
- struct dwarf2_section_info *section,
- int section_is_gnu, int section_is_dwz,
- unsigned int offset_size,
- htab_t include_hash)
+struct dwarf2_locexpr_baton
+dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
+ struct dwarf2_per_cu_data *per_cu,
+ CORE_ADDR (*get_frame_pc) (void *baton),
+ void *baton)
{
+ struct dwarf2_cu *cu;
+ struct die_info *die;
+ struct attribute *attr;
+ struct dwarf2_locexpr_baton retval;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
struct objfile *objfile = dwarf2_per_objfile->objfile;
- enum dwarf_macro_record_type macinfo_type;
- int at_commandline;
- const gdb_byte *opcode_definitions[256];
- mac_ptr = dwarf_parse_macro_header (opcode_definitions, abfd, mac_ptr,
- &offset_size, section_is_gnu);
- if (mac_ptr == NULL)
+ if (per_cu->cu == NULL)
+ load_cu (per_cu, false);
+ cu = per_cu->cu;
+ if (cu == NULL)
{
- /* We already issued a complaint. */
- return;
+ /* We shouldn't get here for a dummy CU, but don't crash on the user.
+ Instead just throw an error, not much else we can do. */
+ error (_("Dwarf Error: Dummy CU at %s referenced in module %s"),
+ sect_offset_str (sect_off), objfile_name (objfile));
}
- /* Determines if GDB is still before first DW_MACINFO_start_file. If true
- GDB is still reading the definitions from command line. First
- DW_MACINFO_start_file will need to be ignored as it was already executed
- to create CURRENT_FILE for the main source holding also the command line
- definitions. On first met DW_MACINFO_start_file this flag is reset to
- normally execute all the remaining DW_MACINFO_start_file macinfos. */
-
- at_commandline = 1;
+ die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
+ if (!die)
+ error (_("Dwarf Error: Cannot find DIE at %s referenced in module %s"),
+ sect_offset_str (sect_off), objfile_name (objfile));
- do
+ attr = dwarf2_attr (die, DW_AT_location, cu);
+ if (!attr)
{
- /* Do we at least have room for a macinfo type byte? */
- if (mac_ptr >= mac_end)
- {
- dwarf2_section_buffer_overflow_complaint (section);
- break;
- }
-
- macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr);
- mac_ptr++;
+ /* DWARF: "If there is no such attribute, then there is no effect.".
+ DATA is ignored if SIZE is 0. */
- /* Note that we rely on the fact that the corresponding GNU and
- DWARF constants are the same. */
- switch (macinfo_type)
- {
- /* A zero macinfo type indicates the end of the macro
- information. */
- case 0:
- break;
+ retval.data = NULL;
+ retval.size = 0;
+ }
+ else if (attr_form_is_section_offset (attr))
+ {
+ struct dwarf2_loclist_baton loclist_baton;
+ CORE_ADDR pc = (*get_frame_pc) (baton);
+ size_t size;
- case DW_MACRO_define:
- case DW_MACRO_undef:
- case DW_MACRO_define_strp:
- case DW_MACRO_undef_strp:
- case DW_MACRO_define_sup:
- case DW_MACRO_undef_sup:
- {
- unsigned int bytes_read;
- int line;
- const char *body;
- int is_define;
+ fill_in_loclist_baton (cu, &loclist_baton, attr);
- line = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
+ retval.data = dwarf2_find_location_expression (&loclist_baton,
+ &size, pc);
+ retval.size = size;
+ }
+ else
+ {
+ if (!attr_form_is_block (attr))
+ error (_("Dwarf Error: DIE at %s referenced in module %s "
+ "is neither DW_FORM_block* nor DW_FORM_exprloc"),
+ sect_offset_str (sect_off), objfile_name (objfile));
- if (macinfo_type == DW_MACRO_define
- || macinfo_type == DW_MACRO_undef)
- {
- body = read_direct_string (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- }
- else
- {
- LONGEST str_offset;
+ retval.data = DW_BLOCK (attr)->data;
+ retval.size = DW_BLOCK (attr)->size;
+ }
+ retval.per_cu = cu->per_cu;
- str_offset = read_offset_1 (abfd, mac_ptr, offset_size);
- mac_ptr += offset_size;
+ age_cached_comp_units (dwarf2_per_objfile);
- if (macinfo_type == DW_MACRO_define_sup
- || macinfo_type == DW_MACRO_undef_sup
- || section_is_dwz)
- {
- struct dwz_file *dwz = dwarf2_get_dwz_file ();
+ return retval;
+}
- body = read_indirect_string_from_dwz (dwz, str_offset);
- }
- else
- body = read_indirect_string_at_offset (abfd, str_offset);
- }
+/* Like dwarf2_fetch_die_loc_sect_off, but take a CU
+ offset. */
- is_define = (macinfo_type == DW_MACRO_define
- || macinfo_type == DW_MACRO_define_strp
- || macinfo_type == DW_MACRO_define_sup);
- if (! current_file)
- {
- /* DWARF violation as no main source is present. */
- complaint (&symfile_complaints,
- _("debug info with no main source gives macro %s "
- "on line %d: %s"),
- is_define ? _("definition") : _("undefinition"),
- line, body);
- break;
- }
- if ((line == 0 && !at_commandline)
- || (line != 0 && at_commandline))
- complaint (&symfile_complaints,
- _("debug info gives %s macro %s with %s line %d: %s"),
- at_commandline ? _("command-line") : _("in-file"),
- is_define ? _("definition") : _("undefinition"),
- line == 0 ? _("zero") : _("non-zero"), line, body);
+struct dwarf2_locexpr_baton
+dwarf2_fetch_die_loc_cu_off (cu_offset offset_in_cu,
+ struct dwarf2_per_cu_data *per_cu,
+ CORE_ADDR (*get_frame_pc) (void *baton),
+ void *baton)
+{
+ sect_offset sect_off = per_cu->sect_off + to_underlying (offset_in_cu);
- if (is_define)
- parse_macro_definition (current_file, line, body);
- else
- {
- gdb_assert (macinfo_type == DW_MACRO_undef
- || macinfo_type == DW_MACRO_undef_strp
- || macinfo_type == DW_MACRO_undef_sup);
- macro_undef (current_file, line, body);
- }
- }
- break;
+ return dwarf2_fetch_die_loc_sect_off (sect_off, per_cu, get_frame_pc, baton);
+}
- case DW_MACRO_start_file:
- {
- unsigned int bytes_read;
- int line, file;
+/* Write a constant of a given type as target-ordered bytes into
+ OBSTACK. */
- 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;
+static const gdb_byte *
+write_constant_as_bytes (struct obstack *obstack,
+ enum bfd_endian byte_order,
+ struct type *type,
+ ULONGEST value,
+ LONGEST *len)
+{
+ gdb_byte *result;
- if ((line == 0 && !at_commandline)
- || (line != 0 && at_commandline))
- complaint (&symfile_complaints,
- _("debug info gives source %d included "
- "from %s at %s line %d"),
- file, at_commandline ? _("command-line") : _("file"),
- line == 0 ? _("zero") : _("non-zero"), line);
+ *len = TYPE_LENGTH (type);
+ result = (gdb_byte *) obstack_alloc (obstack, *len);
+ store_unsigned_integer (result, *len, byte_order, value);
- if (at_commandline)
- {
- /* This DW_MACRO_start_file was executed in the
- pass one. */
- at_commandline = 0;
- }
- else
- current_file = macro_start_file (file, line, current_file, lh);
- }
- break;
+ return result;
+}
- case DW_MACRO_end_file:
- if (! current_file)
- complaint (&symfile_complaints,
- _("macro debug info has an unmatched "
- "`close_file' directive"));
- else
- {
- current_file = current_file->included_by;
- if (! current_file)
- {
- enum dwarf_macro_record_type next_type;
+/* If the DIE at OFFSET in PER_CU has a DW_AT_const_value, return a
+ pointer to the constant bytes and set LEN to the length of the
+ data. If memory is needed, allocate it on OBSTACK. If the DIE
+ does not have a DW_AT_const_value, return NULL. */
- /* 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. */
+const gdb_byte *
+dwarf2_fetch_constant_bytes (sect_offset sect_off,
+ struct dwarf2_per_cu_data *per_cu,
+ struct obstack *obstack,
+ LONGEST *len)
+{
+ struct dwarf2_cu *cu;
+ struct die_info *die;
+ struct attribute *attr;
+ const gdb_byte *result = NULL;
+ struct type *type;
+ LONGEST value;
+ enum bfd_endian byte_order;
+ struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
- /* Do we at least have room for a macinfo type byte? */
- if (mac_ptr >= mac_end)
- {
- dwarf2_section_buffer_overflow_complaint (section);
- return;
- }
+ if (per_cu->cu == NULL)
+ load_cu (per_cu, false);
+ cu = per_cu->cu;
+ if (cu == NULL)
+ {
+ /* We shouldn't get here for a dummy CU, but don't crash on the user.
+ Instead just throw an error, not much else we can do. */
+ error (_("Dwarf Error: Dummy CU at %s referenced in module %s"),
+ sect_offset_str (sect_off), objfile_name (objfile));
+ }
- /* We don't increment mac_ptr here, so this is just
- a look-ahead. */
- next_type
- = (enum dwarf_macro_record_type) read_1_byte (abfd,
- mac_ptr);
- if (next_type != 0)
- complaint (&symfile_complaints,
- _("no terminating 0-type entry for "
- "macros in `.debug_macinfo' section"));
+ die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
+ if (!die)
+ error (_("Dwarf Error: Cannot find DIE at %s referenced in module %s"),
+ sect_offset_str (sect_off), objfile_name (objfile));
- return;
- }
- }
- break;
+ attr = dwarf2_attr (die, DW_AT_const_value, cu);
+ if (attr == NULL)
+ return NULL;
- case DW_MACRO_import:
- case DW_MACRO_import_sup:
- {
- LONGEST offset;
- void **slot;
- bfd *include_bfd = abfd;
- struct dwarf2_section_info *include_section = section;
- const gdb_byte *include_mac_end = mac_end;
- int is_dwz = section_is_dwz;
- const gdb_byte *new_mac_ptr;
+ byte_order = (bfd_big_endian (objfile->obfd)
+ ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE);
- offset = read_offset_1 (abfd, mac_ptr, offset_size);
- mac_ptr += offset_size;
+ switch (attr->form)
+ {
+ case DW_FORM_addr:
+ case DW_FORM_GNU_addr_index:
+ {
+ gdb_byte *tem;
- if (macinfo_type == DW_MACRO_import_sup)
- {
- struct dwz_file *dwz = dwarf2_get_dwz_file ();
+ *len = cu->header.addr_size;
+ tem = (gdb_byte *) obstack_alloc (obstack, *len);
+ store_unsigned_integer (tem, *len, byte_order, DW_ADDR (attr));
+ result = tem;
+ }
+ break;
+ case DW_FORM_string:
+ case DW_FORM_strp:
+ case DW_FORM_GNU_str_index:
+ case DW_FORM_GNU_strp_alt:
+ /* DW_STRING is already allocated on the objfile obstack, point
+ directly to it. */
+ result = (const gdb_byte *) DW_STRING (attr);
+ *len = strlen (DW_STRING (attr));
+ break;
+ case DW_FORM_block1:
+ case DW_FORM_block2:
+ case DW_FORM_block4:
+ case DW_FORM_block:
+ case DW_FORM_exprloc:
+ case DW_FORM_data16:
+ result = DW_BLOCK (attr)->data;
+ *len = DW_BLOCK (attr)->size;
+ break;
- dwarf2_read_section (objfile, &dwz->macro);
+ /* 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:
+ type = die_type (die, cu);
+ result = dwarf2_const_value_data (attr, obstack, cu, &value, 8);
+ if (result == NULL)
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, value, len);
+ break;
+ case DW_FORM_data2:
+ type = die_type (die, cu);
+ result = dwarf2_const_value_data (attr, obstack, cu, &value, 16);
+ if (result == NULL)
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, value, len);
+ break;
+ case DW_FORM_data4:
+ type = die_type (die, cu);
+ result = dwarf2_const_value_data (attr, obstack, cu, &value, 32);
+ if (result == NULL)
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, value, len);
+ break;
+ case DW_FORM_data8:
+ type = die_type (die, cu);
+ result = dwarf2_const_value_data (attr, obstack, cu, &value, 64);
+ if (result == NULL)
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, value, len);
+ break;
- include_section = &dwz->macro;
- include_bfd = get_section_bfd_owner (include_section);
- include_mac_end = dwz->macro.buffer + dwz->macro.size;
- is_dwz = 1;
- }
+ case DW_FORM_sdata:
+ case DW_FORM_implicit_const:
+ type = die_type (die, cu);
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, DW_SND (attr), len);
+ break;
- new_mac_ptr = include_section->buffer + offset;
- slot = htab_find_slot (include_hash, new_mac_ptr, INSERT);
+ case DW_FORM_udata:
+ type = die_type (die, cu);
+ result = write_constant_as_bytes (obstack, byte_order,
+ type, DW_UNSND (attr), len);
+ break;
- if (*slot != NULL)
- {
- /* This has actually happened; see
- http://sourceware.org/bugzilla/show_bug.cgi?id=13568. */
- complaint (&symfile_complaints,
- _("recursive DW_MACRO_import in "
- ".debug_macro section"));
- }
- else
- {
- *slot = (void *) new_mac_ptr;
+ default:
+ complaint (_("unsupported const value attribute form: '%s'"),
+ dwarf_form_name (attr->form));
+ break;
+ }
- dwarf_decode_macro_bytes (include_bfd, new_mac_ptr,
- include_mac_end, current_file, lh,
- section, section_is_gnu, is_dwz,
- offset_size, include_hash);
+ return result;
+}
- htab_remove_elt (include_hash, (void *) new_mac_ptr);
- }
- }
- break;
+/* Return the type of the die at OFFSET in PER_CU. Return NULL if no
+ valid type for this die is found. */
- case DW_MACINFO_vendor_ext:
- if (!section_is_gnu)
- {
- unsigned int bytes_read;
+struct type *
+dwarf2_fetch_die_type_sect_off (sect_offset sect_off,
+ struct dwarf2_per_cu_data *per_cu)
+{
+ struct dwarf2_cu *cu;
+ struct die_info *die;
- /* This reads the constant, but since we don't recognize
- any vendor extensions, we ignore it. */
- read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- read_direct_string (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
+ if (per_cu->cu == NULL)
+ load_cu (per_cu, false);
+ cu = per_cu->cu;
+ if (!cu)
+ return NULL;
- /* We don't recognize any vendor extensions. */
- break;
- }
- /* FALLTHROUGH */
+ die = follow_die_offset (sect_off, per_cu->is_dwz, &cu);
+ if (!die)
+ return NULL;
- default:
- mac_ptr = skip_unknown_opcode (macinfo_type, opcode_definitions,
- mac_ptr, mac_end, abfd, offset_size,
- section);
- if (mac_ptr == NULL)
- return;
- break;
- }
- } while (macinfo_type != 0);
+ return die_type (die, cu);
}
-static void
-dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset,
- int section_is_gnu)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct line_header *lh = cu->line_header;
- bfd *abfd;
- const gdb_byte *mac_ptr, *mac_end;
- struct macro_source_file *current_file = 0;
- enum dwarf_macro_record_type macinfo_type;
- unsigned int offset_size = cu->header.offset_size;
- const gdb_byte *opcode_definitions[256];
- void **slot;
- struct dwarf2_section_info *section;
- const char *section_name;
+/* Return the type of the DIE at DIE_OFFSET in the CU named by
+ PER_CU. */
- if (cu->dwo_unit != NULL)
- {
- if (section_is_gnu)
- {
- section = &cu->dwo_unit->dwo_file->sections.macro;
- section_name = ".debug_macro.dwo";
- }
- else
- {
- section = &cu->dwo_unit->dwo_file->sections.macinfo;
- section_name = ".debug_macinfo.dwo";
- }
- }
- else
- {
- if (section_is_gnu)
- {
- section = &dwarf2_per_objfile->macro;
- section_name = ".debug_macro";
- }
- else
- {
- section = &dwarf2_per_objfile->macinfo;
- section_name = ".debug_macinfo";
- }
- }
+struct type *
+dwarf2_get_die_type (cu_offset die_offset,
+ struct dwarf2_per_cu_data *per_cu)
+{
+ sect_offset die_offset_sect = per_cu->sect_off + to_underlying (die_offset);
+ return get_die_type_at_offset (die_offset_sect, per_cu);
+}
- dwarf2_read_section (objfile, section);
- if (section->buffer == NULL)
- {
- complaint (&symfile_complaints, _("missing %s section"), section_name);
- return;
- }
- abfd = get_section_bfd_owner (section);
+/* Follow type unit SIG_TYPE referenced by SRC_DIE.
+ On entry *REF_CU is the CU of SRC_DIE.
+ On exit *REF_CU is the CU of the result.
+ Returns NULL if the referenced DIE isn't found. */
- /* First pass: Find the name of the base filename.
- This filename is needed in order to process all macros whose definition
- (or undefinition) comes from the command line. These macros are defined
- before the first DW_MACINFO_start_file entry, and yet still need to be
- associated to the base file.
+static struct die_info *
+follow_die_sig_1 (struct die_info *src_die, struct signatured_type *sig_type,
+ struct dwarf2_cu **ref_cu)
+{
+ struct die_info temp_die;
+ struct dwarf2_cu *sig_cu;
+ struct die_info *die;
- To determine the base file name, we scan the macro definitions until we
- reach the first DW_MACINFO_start_file entry. We then initialize
- CURRENT_FILE accordingly so that any macro definition found before the
- first DW_MACINFO_start_file can still be associated to the base file. */
+ /* While it might be nice to assert sig_type->type == NULL here,
+ we can get here for DW_AT_imported_declaration where we need
+ the DIE not the type. */
- mac_ptr = section->buffer + offset;
- mac_end = section->buffer + section->size;
+ /* If necessary, add it to the queue and load its DIEs. */
- mac_ptr = dwarf_parse_macro_header (opcode_definitions, abfd, mac_ptr,
- &offset_size, section_is_gnu);
- if (mac_ptr == NULL)
- {
- /* We already issued a complaint. */
- return;
- }
+ if (maybe_queue_comp_unit (*ref_cu, &sig_type->per_cu, language_minimal))
+ read_signatured_type (sig_type);
- do
+ sig_cu = sig_type->per_cu.cu;
+ gdb_assert (sig_cu != NULL);
+ gdb_assert (to_underlying (sig_type->type_offset_in_section) != 0);
+ temp_die.sect_off = sig_type->type_offset_in_section;
+ die = (struct die_info *) htab_find_with_hash (sig_cu->die_hash, &temp_die,
+ to_underlying (temp_die.sect_off));
+ if (die)
{
- /* Do we at least have room for a macinfo type byte? */
- if (mac_ptr >= mac_end)
- {
- /* Complaint is printed during the second pass as GDB will probably
- stop the first pass earlier upon finding
- DW_MACINFO_start_file. */
- break;
- }
-
- macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr);
- mac_ptr++;
-
- /* Note that we rely on the fact that the corresponding GNU and
- DWARF constants are the same. */
- switch (macinfo_type)
- {
- /* A zero macinfo type indicates the end of the macro
- information. */
- case 0:
- break;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = (*ref_cu)->per_cu->dwarf2_per_objfile;
- case DW_MACRO_define:
- case DW_MACRO_undef:
- /* Only skip the data by MAC_PTR. */
- {
- unsigned int bytes_read;
+ /* For .gdb_index version 7 keep track of included TUs.
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15021. */
+ if (dwarf2_per_objfile->index_table != NULL
+ && dwarf2_per_objfile->index_table->version <= 7)
+ {
+ VEC_safe_push (dwarf2_per_cu_ptr,
+ (*ref_cu)->per_cu->imported_symtabs,
+ sig_cu->per_cu);
+ }
- read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- read_direct_string (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- }
- break;
+ *ref_cu = sig_cu;
+ return die;
+ }
- case DW_MACRO_start_file:
- {
- unsigned int bytes_read;
- int line, file;
+ return NULL;
+}
- 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;
+/* Follow signatured type referenced by ATTR in SRC_DIE.
+ On entry *REF_CU is the CU of SRC_DIE.
+ On exit *REF_CU is the CU of the result.
+ The result is the DIE of the type.
+ If the referenced type cannot be found an error is thrown. */
- current_file = macro_start_file (file, line, current_file, lh);
- }
- break;
+static struct die_info *
+follow_die_sig (struct die_info *src_die, const struct attribute *attr,
+ struct dwarf2_cu **ref_cu)
+{
+ ULONGEST signature = DW_SIGNATURE (attr);
+ struct signatured_type *sig_type;
+ struct die_info *die;
- case DW_MACRO_end_file:
- /* No data to skip by MAC_PTR. */
- break;
+ gdb_assert (attr->form == DW_FORM_ref_sig8);
- case DW_MACRO_define_strp:
- case DW_MACRO_undef_strp:
- case DW_MACRO_define_sup:
- case DW_MACRO_undef_sup:
- {
- unsigned int bytes_read;
+ sig_type = lookup_signatured_type (*ref_cu, signature);
+ /* sig_type will be NULL if the signatured type is missing from
+ the debug info. */
+ if (sig_type == NULL)
+ {
+ error (_("Dwarf Error: Cannot find signatured DIE %s referenced"
+ " from DIE at %s [in module %s]"),
+ hex_string (signature), sect_offset_str (src_die->sect_off),
+ objfile_name ((*ref_cu)->per_cu->dwarf2_per_objfile->objfile));
+ }
- read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- mac_ptr += offset_size;
- }
- break;
+ die = follow_die_sig_1 (src_die, sig_type, ref_cu);
+ if (die == NULL)
+ {
+ dump_die_for_error (src_die);
+ error (_("Dwarf Error: Problem reading signatured DIE %s referenced"
+ " from DIE at %s [in module %s]"),
+ hex_string (signature), sect_offset_str (src_die->sect_off),
+ objfile_name ((*ref_cu)->per_cu->dwarf2_per_objfile->objfile));
+ }
- case DW_MACRO_import:
- case DW_MACRO_import_sup:
- /* Note that, according to the spec, a transparent include
- chain cannot call DW_MACRO_start_file. So, we can just
- skip this opcode. */
- mac_ptr += offset_size;
- break;
+ return die;
+}
- case DW_MACINFO_vendor_ext:
- /* Only skip the data by MAC_PTR. */
- if (!section_is_gnu)
- {
- unsigned int bytes_read;
+/* Get the type specified by SIGNATURE referenced in DIE/CU,
+ reading in and processing the type unit if necessary. */
- read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- read_direct_string (abfd, mac_ptr, &bytes_read);
- mac_ptr += bytes_read;
- }
- /* FALLTHROUGH */
+static struct type *
+get_signatured_type (struct die_info *die, ULONGEST signature,
+ struct dwarf2_cu *cu)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct signatured_type *sig_type;
+ struct dwarf2_cu *type_cu;
+ struct die_info *type_die;
+ struct type *type;
- default:
- mac_ptr = skip_unknown_opcode (macinfo_type, opcode_definitions,
- mac_ptr, mac_end, abfd, offset_size,
- section);
- if (mac_ptr == NULL)
- return;
- break;
- }
- } while (macinfo_type != 0 && current_file == NULL);
+ sig_type = lookup_signatured_type (cu, signature);
+ /* sig_type will be NULL if the signatured type is missing from
+ the debug info. */
+ if (sig_type == NULL)
+ {
+ complaint (_("Dwarf Error: Cannot find signatured DIE %s referenced"
+ " from DIE at %s [in module %s]"),
+ hex_string (signature), sect_offset_str (die->sect_off),
+ objfile_name (dwarf2_per_objfile->objfile));
+ return build_error_marker_type (cu, die);
+ }
- /* Second pass: Process all entries.
+ /* If we already know the type we're done. */
+ if (sig_type->type != NULL)
+ return sig_type->type;
- Use the AT_COMMAND_LINE flag to determine whether we are still processing
- command-line macro definitions/undefinitions. This flag is unset when we
- reach the first DW_MACINFO_start_file entry. */
+ type_cu = cu;
+ type_die = follow_die_sig_1 (die, sig_type, &type_cu);
+ if (type_die != NULL)
+ {
+ /* N.B. We need to call get_die_type to ensure only one type for this DIE
+ is created. This is important, for example, because for c++ classes
+ we need TYPE_NAME set which is only done by new_symbol. Blech. */
+ type = read_type_die (type_die, type_cu);
+ if (type == NULL)
+ {
+ complaint (_("Dwarf Error: Cannot build signatured type %s"
+ " referenced from DIE at %s [in module %s]"),
+ hex_string (signature), sect_offset_str (die->sect_off),
+ objfile_name (dwarf2_per_objfile->objfile));
+ type = build_error_marker_type (cu, die);
+ }
+ }
+ else
+ {
+ complaint (_("Dwarf Error: Problem reading signatured DIE %s referenced"
+ " from DIE at %s [in module %s]"),
+ hex_string (signature), sect_offset_str (die->sect_off),
+ objfile_name (dwarf2_per_objfile->objfile));
+ type = build_error_marker_type (cu, die);
+ }
+ sig_type->type = type;
- htab_up include_hash (htab_create_alloc (1, htab_hash_pointer,
- htab_eq_pointer,
- NULL, xcalloc, xfree));
- mac_ptr = section->buffer + offset;
- slot = htab_find_slot (include_hash.get (), mac_ptr, INSERT);
- *slot = (void *) mac_ptr;
- dwarf_decode_macro_bytes (abfd, mac_ptr, mac_end,
- current_file, lh, section,
- section_is_gnu, 0, offset_size,
- include_hash.get ());
+ return type;
}
-/* Check if the attribute's form is a DW_FORM_block*
- if so return true else false. */
+/* Get the type specified by the DW_AT_signature ATTR in DIE/CU,
+ reading in and processing the type unit if necessary. */
-static int
-attr_form_is_block (const struct attribute *attr)
+static struct type *
+get_DW_AT_signature_type (struct die_info *die, const struct attribute *attr,
+ struct dwarf2_cu *cu) /* ARI: editCase function */
{
- return (attr == NULL ? 0 :
- attr->form == DW_FORM_block1
- || attr->form == DW_FORM_block2
- || attr->form == DW_FORM_block4
- || attr->form == DW_FORM_block
- || attr->form == DW_FORM_exprloc);
-}
+ /* Yes, DW_AT_signature can use a non-ref_sig8 reference. */
+ if (attr_form_is_ref (attr))
+ {
+ struct dwarf2_cu *type_cu = cu;
+ struct die_info *type_die = follow_die_ref (die, attr, &type_cu);
-/* Return non-zero if ATTR's value is a section offset --- classes
- lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise.
- You may use DW_UNSND (attr) to retrieve such offsets.
+ return read_type_die (type_die, type_cu);
+ }
+ else if (attr->form == DW_FORM_ref_sig8)
+ {
+ return get_signatured_type (die, DW_SIGNATURE (attr), cu);
+ }
+ else
+ {
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- Section 7.5.4, "Attribute Encodings", explains that no attribute
- may have a value that belongs to more than one of these classes; it
- would be ambiguous if we did, because we use the same forms for all
- of them. */
+ complaint (_("Dwarf Error: DW_AT_signature has bad form %s in DIE"
+ " at %s [in module %s]"),
+ dwarf_form_name (attr->form), sect_offset_str (die->sect_off),
+ objfile_name (dwarf2_per_objfile->objfile));
+ return build_error_marker_type (cu, die);
+ }
+}
-static int
-attr_form_is_section_offset (const struct attribute *attr)
+/* Load the DIEs associated with type unit PER_CU into memory. */
+
+static void
+load_full_type_unit (struct dwarf2_per_cu_data *per_cu)
{
- return (attr->form == DW_FORM_data4
- || attr->form == DW_FORM_data8
- || attr->form == DW_FORM_sec_offset);
-}
+ struct signatured_type *sig_type;
-/* Return non-zero if ATTR's value falls in the 'constant' class, or
- zero otherwise. When this function returns true, you can apply
- dwarf2_get_attr_constant_value to it.
+ /* Caller is responsible for ensuring type_unit_groups don't get here. */
+ gdb_assert (! IS_TYPE_UNIT_GROUP (per_cu));
- However, note that for some attributes you must check
- attr_form_is_section_offset before using this test. DW_FORM_data4
- and DW_FORM_data8 are members of both the constant class, and of
- the classes that contain offsets into other debug sections
- (lineptr, loclistptr, macptr or rangelistptr). The DWARF spec says
- that, if an attribute's can be either a constant or one of the
- section offset classes, DW_FORM_data4 and DW_FORM_data8 should be
- taken as section offsets, not constants.
+ /* We have the per_cu, but we need the signatured_type.
+ Fortunately this is an easy translation. */
+ gdb_assert (per_cu->is_debug_types);
+ sig_type = (struct signatured_type *) per_cu;
- DW_FORM_data16 is not considered as dwarf2_get_attr_constant_value
- cannot handle that. */
+ gdb_assert (per_cu->cu == NULL);
-static int
-attr_form_is_constant (const struct attribute *attr)
-{
- switch (attr->form)
- {
- case DW_FORM_sdata:
- case DW_FORM_udata:
- case DW_FORM_data1:
- case DW_FORM_data2:
- case DW_FORM_data4:
- case DW_FORM_data8:
- case DW_FORM_implicit_const:
- return 1;
- default:
- return 0;
- }
-}
+ read_signatured_type (sig_type);
+ gdb_assert (per_cu->cu != NULL);
+}
-/* DW_ADDR is always stored already as sect_offset; despite for the forms
- besides DW_FORM_ref_addr it is stored as cu_offset in the DWARF file. */
+/* die_reader_func for read_signatured_type.
+ This is identical to load_full_comp_unit_reader,
+ but is kept separate for now. */
-static int
-attr_form_is_ref (const struct attribute *attr)
+static void
+read_signatured_type_reader (const struct die_reader_specs *reader,
+ const gdb_byte *info_ptr,
+ struct die_info *comp_unit_die,
+ int has_children,
+ void *data)
{
- switch (attr->form)
- {
- case DW_FORM_ref_addr:
- case DW_FORM_ref1:
- case DW_FORM_ref2:
- case DW_FORM_ref4:
- case DW_FORM_ref8:
- case DW_FORM_ref_udata:
- case DW_FORM_GNU_ref_alt:
- return 1;
- default:
- return 0;
- }
-}
+ struct dwarf2_cu *cu = reader->cu;
-/* Return the .debug_loc section to use for CU.
- For DWO files use .debug_loc.dwo. */
+ gdb_assert (cu->die_hash == NULL);
+ cu->die_hash =
+ htab_create_alloc_ex (cu->header.length / 12,
+ die_hash,
+ die_eq,
+ NULL,
+ &cu->comp_unit_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+
+ if (has_children)
+ comp_unit_die->child = read_die_and_siblings (reader, info_ptr,
+ &info_ptr, comp_unit_die);
+ cu->dies = comp_unit_die;
+ /* comp_unit_die is not stored in die_hash, no need. */
-static struct dwarf2_section_info *
-cu_debug_loc_section (struct dwarf2_cu *cu)
-{
- if (cu->dwo_unit)
- {
- struct dwo_sections *sections = &cu->dwo_unit->dwo_file->sections;
-
- return cu->header.version >= 5 ? §ions->loclists : §ions->loc;
- }
- return (cu->header.version >= 5 ? &dwarf2_per_objfile->loclists
- : &dwarf2_per_objfile->loc);
+ /* We try not to read any attributes in this function, because not
+ all CUs needed for references have been loaded yet, and symbol
+ table processing isn't initialized. But we have to set the CU language,
+ or we won't be able to build types correctly.
+ Similarly, if we do not read the producer, we can not apply
+ producer-specific interpretation. */
+ prepare_one_comp_unit (cu, cu->dies, language_minimal);
}
-/* A helper function that fills in a dwarf2_loclist_baton. */
+/* Read in a signatured type and build its CU and DIEs.
+ If the type is a stub for the real type in a DWO file,
+ read in the real type from the DWO file as well. */
static void
-fill_in_loclist_baton (struct dwarf2_cu *cu,
- struct dwarf2_loclist_baton *baton,
- const struct attribute *attr)
+read_signatured_type (struct signatured_type *sig_type)
{
- struct dwarf2_section_info *section = cu_debug_loc_section (cu);
+ struct dwarf2_per_cu_data *per_cu = &sig_type->per_cu;
- dwarf2_read_section (dwarf2_per_objfile->objfile, section);
+ gdb_assert (per_cu->is_debug_types);
+ gdb_assert (per_cu->cu == NULL);
- baton->per_cu = cu->per_cu;
- gdb_assert (baton->per_cu);
- /* We don't know how long the location list is, but make sure we
- don't run off the edge of the section. */
- baton->size = section->size - DW_UNSND (attr);
- baton->data = section->buffer + DW_UNSND (attr);
- baton->base_address = cu->base_address;
- baton->from_dwo = cu->dwo_unit != NULL;
+ init_cutu_and_read_dies (per_cu, NULL, 0, 1, false,
+ read_signatured_type_reader, NULL);
+ sig_type->per_cu.tu_read = 1;
}
-static void
-dwarf2_symbol_mark_computed (const struct attribute *attr, struct symbol *sym,
- struct dwarf2_cu *cu, int is_block)
-{
- struct objfile *objfile = dwarf2_per_objfile->objfile;
- struct dwarf2_section_info *section = cu_debug_loc_section (cu);
+/* Decode simple location descriptions.
+ Given a pointer to a dwarf block that defines a location, compute
+ the location and return the value.
- if (attr_form_is_section_offset (attr)
- /* .debug_loc{,.dwo} may not exist at all, or the offset may be outside
- the section. If so, fall through to the complaint in the
- other branch. */
- && DW_UNSND (attr) < dwarf2_section_size (objfile, section))
- {
- struct dwarf2_loclist_baton *baton;
+ 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).
- baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_loclist_baton);
+ A location description containing no operations indicates that the
+ object is optimized out. The return value is 0 for that case.
+ 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.
- fill_in_loclist_baton (cu, baton, attr);
+ Note that stack[0] is unused except as a default error return. */
- if (cu->base_known == 0)
- complaint (&symfile_complaints,
- _("Location list used without "
- "specifying the CU base address."));
+static CORE_ADDR
+decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
+{
+ struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile;
+ size_t i;
+ size_t size = blk->size;
+ const gdb_byte *data = blk->data;
+ CORE_ADDR stack[64];
+ int stacki;
+ unsigned int bytes_read, unsnd;
+ gdb_byte op;
- SYMBOL_ACLASS_INDEX (sym) = (is_block
- ? dwarf2_loclist_block_index
- : dwarf2_loclist_index);
- SYMBOL_LOCATION_BATON (sym) = baton;
- }
- else
+ i = 0;
+ stacki = 0;
+ stack[stacki] = 0;
+ stack[++stacki] = 0;
+
+ while (i < size)
{
- struct dwarf2_locexpr_baton *baton;
+ op = data[i++];
+ switch (op)
+ {
+ 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;
- baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
- baton->per_cu = cu->per_cu;
- gdb_assert (baton->per_cu);
+ 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:
+ stack[++stacki] = op - DW_OP_reg0;
+ if (i < size)
+ dwarf2_complex_location_expr_complaint ();
+ break;
- 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
- 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. */
- 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;
- }
+ case DW_OP_regx:
+ unsnd = read_unsigned_leb128 (NULL, (data + i), &bytes_read);
+ i += bytes_read;
+ stack[++stacki] = unsnd;
+ if (i < size)
+ dwarf2_complex_location_expr_complaint ();
+ break;
- SYMBOL_ACLASS_INDEX (sym) = (is_block
- ? dwarf2_locexpr_block_index
- : dwarf2_locexpr_index);
- SYMBOL_LOCATION_BATON (sym) = baton;
- }
-}
+ case DW_OP_addr:
+ stack[++stacki] = read_address (objfile->obfd, &data[i],
+ cu, &bytes_read);
+ i += bytes_read;
+ break;
-/* Return the OBJFILE associated with the compilation unit CU. If CU
- came from a separate debuginfo file, then the master objfile is
- returned. */
+ case DW_OP_const1u:
+ stack[++stacki] = read_1_byte (objfile->obfd, &data[i]);
+ i += 1;
+ break;
-struct objfile *
-dwarf2_per_cu_objfile (struct dwarf2_per_cu_data *per_cu)
-{
- struct objfile *objfile = per_cu->objfile;
+ case DW_OP_const1s:
+ stack[++stacki] = read_1_signed_byte (objfile->obfd, &data[i]);
+ i += 1;
+ break;
- /* Return the master objfile, so that we can report and look up the
- correct file containing this variable. */
- if (objfile->separate_debug_objfile_backlink)
- objfile = objfile->separate_debug_objfile_backlink;
+ case DW_OP_const2u:
+ stack[++stacki] = read_2_bytes (objfile->obfd, &data[i]);
+ i += 2;
+ break;
- return objfile;
-}
+ case DW_OP_const2s:
+ stack[++stacki] = read_2_signed_bytes (objfile->obfd, &data[i]);
+ i += 2;
+ break;
-/* Return comp_unit_head for PER_CU, either already available in PER_CU->CU
- (CU_HEADERP is unused in such case) or prepare a temporary copy at
- CU_HEADERP first. */
+ case DW_OP_const4u:
+ stack[++stacki] = read_4_bytes (objfile->obfd, &data[i]);
+ i += 4;
+ break;
-static const struct comp_unit_head *
-per_cu_header_read_in (struct comp_unit_head *cu_headerp,
- struct dwarf2_per_cu_data *per_cu)
-{
- const gdb_byte *info_ptr;
+ case DW_OP_const4s:
+ stack[++stacki] = read_4_signed_bytes (objfile->obfd, &data[i]);
+ i += 4;
+ break;
- if (per_cu->cu)
- return &per_cu->cu->header;
+ case DW_OP_const8u:
+ stack[++stacki] = read_8_bytes (objfile->obfd, &data[i]);
+ i += 8;
+ break;
- info_ptr = per_cu->section->buffer + to_underlying (per_cu->sect_off);
+ case DW_OP_constu:
+ stack[++stacki] = read_unsigned_leb128 (NULL, (data + i),
+ &bytes_read);
+ i += bytes_read;
+ break;
- memset (cu_headerp, 0, sizeof (*cu_headerp));
- read_comp_unit_head (cu_headerp, info_ptr, per_cu->section,
- rcuh_kind::COMPILE);
+ case DW_OP_consts:
+ stack[++stacki] = read_signed_leb128 (NULL, (data + i), &bytes_read);
+ i += bytes_read;
+ break;
- return cu_headerp;
-}
+ case DW_OP_dup:
+ stack[stacki + 1] = stack[stacki];
+ stacki++;
+ break;
-/* Return the address size given in the compilation unit header for CU. */
+ case DW_OP_plus:
+ stack[stacki - 1] += stack[stacki];
+ stacki--;
+ break;
-int
-dwarf2_per_cu_addr_size (struct dwarf2_per_cu_data *per_cu)
-{
- struct comp_unit_head cu_header_local;
- const struct comp_unit_head *cu_headerp;
+ case DW_OP_plus_uconst:
+ stack[stacki] += read_unsigned_leb128 (NULL, (data + i),
+ &bytes_read);
+ i += bytes_read;
+ break;
- cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
+ case DW_OP_minus:
+ stack[stacki - 1] -= stack[stacki];
+ stacki--;
+ break;
- return cu_headerp->addr_size;
-}
+ case DW_OP_deref:
+ /* If we're not the last op, then we definitely can't encode
+ 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. */
+ if (i < size)
+ dwarf2_complex_location_expr_complaint ();
+ break;
-/* Return the offset size given in the compilation unit header for CU. */
+ case DW_OP_GNU_push_tls_address:
+ case DW_OP_form_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. */
+ /* This is valid for partial global symbols, but the variable's
+ address will be bogus in the psymtab. Make it always at least
+ non-zero to not look as a variable garbage collected by linker
+ which have DW_OP_addr 0. */
+ if (i < size)
+ dwarf2_complex_location_expr_complaint ();
+ stack[stacki]++;
+ break;
-int
-dwarf2_per_cu_offset_size (struct dwarf2_per_cu_data *per_cu)
-{
- struct comp_unit_head cu_header_local;
- const struct comp_unit_head *cu_headerp;
+ case DW_OP_GNU_uninit:
+ break;
- cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
+ case DW_OP_GNU_addr_index:
+ case DW_OP_GNU_const_index:
+ stack[++stacki] = read_addr_index_from_leb128 (cu, &data[i],
+ &bytes_read);
+ i += bytes_read;
+ break;
- return cu_headerp->offset_size;
-}
+ default:
+ {
+ const char *name = get_DW_OP_name (op);
-/* See its dwarf2loc.h declaration. */
+ if (name)
+ complaint (_("unsupported stack op: '%s'"),
+ name);
+ else
+ complaint (_("unsupported stack op: '%02x'"),
+ op);
+ }
-int
-dwarf2_per_cu_ref_addr_size (struct dwarf2_per_cu_data *per_cu)
-{
- struct comp_unit_head cu_header_local;
- const struct comp_unit_head *cu_headerp;
+ return (stack[stacki]);
+ }
- cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
+ /* Enforce maximum stack depth of SIZE-1 to avoid writing
+ outside of the allocated space. Also enforce minimum>0. */
+ if (stacki >= ARRAY_SIZE (stack) - 1)
+ {
+ complaint (_("location description stack overflow"));
+ return 0;
+ }
- if (cu_headerp->version == 2)
- return cu_headerp->addr_size;
- else
- return cu_headerp->offset_size;
+ if (stacki <= 0)
+ {
+ complaint (_("location description stack underflow"));
+ return 0;
+ }
+ }
+ return (stack[stacki]);
}
-/* Return the text offset of the CU. The returned offset comes from
- this CU's objfile. If this objfile came from a separate debuginfo
- file, then the offset may be different from the corresponding
- offset in the parent objfile. */
+/* memory allocation interface */
-CORE_ADDR
-dwarf2_per_cu_text_offset (struct dwarf2_per_cu_data *per_cu)
+static struct dwarf_block *
+dwarf_alloc_block (struct dwarf2_cu *cu)
{
- struct objfile *objfile = per_cu->objfile;
-
- return ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ return XOBNEW (&cu->comp_unit_obstack, struct dwarf_block);
}
-/* Return DWARF version number of PER_CU. */
-
-short
-dwarf2_version (struct dwarf2_per_cu_data *per_cu)
+static struct die_info *
+dwarf_alloc_die (struct dwarf2_cu *cu, int num_attrs)
{
- return per_cu->dwarf_version;
-}
+ struct die_info *die;
+ size_t size = sizeof (struct die_info);
-/* Locate the .debug_info compilation unit from CU's objfile which contains
- the DIE at OFFSET. Raises an error on failure. */
+ if (num_attrs > 1)
+ size += (num_attrs - 1) * sizeof (struct attribute);
-static struct dwarf2_per_cu_data *
-dwarf2_find_containing_comp_unit (sect_offset sect_off,
- unsigned int offset_in_dwz,
- struct objfile *objfile)
-{
- struct dwarf2_per_cu_data *this_cu;
- int low, high;
- const sect_offset *cu_off;
+ die = (struct die_info *) obstack_alloc (&cu->comp_unit_obstack, size);
+ memset (die, 0, sizeof (struct die_info));
+ return (die);
+}
- low = 0;
- high = dwarf2_per_objfile->n_comp_units - 1;
- while (high > low)
- {
- struct dwarf2_per_cu_data *mid_cu;
- int mid = low + (high - low) / 2;
+\f
+/* Macro support. */
- mid_cu = dwarf2_per_objfile->all_comp_units[mid];
- cu_off = &mid_cu->sect_off;
- if (mid_cu->is_dwz > offset_in_dwz
- || (mid_cu->is_dwz == offset_in_dwz && *cu_off >= sect_off))
- high = mid;
- else
- low = mid + 1;
- }
- gdb_assert (low == high);
- this_cu = dwarf2_per_objfile->all_comp_units[low];
- cu_off = &this_cu->sect_off;
- if (this_cu->is_dwz != offset_in_dwz || *cu_off > sect_off)
+/* Return file name relative to the compilation directory of file number I in
+ *LH's file name table. The result is allocated using xmalloc; the caller is
+ responsible for freeing it. */
+
+static char *
+file_file_name (int file, struct line_header *lh)
+{
+ /* Is the file number a valid index into the line header's file name
+ table? Remember that file numbers start with one, not zero. */
+ if (1 <= file && file <= lh->file_names.size ())
{
- if (low == 0 || this_cu->is_dwz != offset_in_dwz)
- error (_("Dwarf Error: could not find partial DIE containing "
- "offset 0x%x [in module %s]"),
- to_underlying (sect_off), bfd_get_filename (objfile->obfd));
+ const file_entry &fe = lh->file_names[file - 1];
- gdb_assert (dwarf2_per_objfile->all_comp_units[low-1]->sect_off
- <= sect_off);
- return dwarf2_per_objfile->all_comp_units[low-1];
+ if (!IS_ABSOLUTE_PATH (fe.name))
+ {
+ const char *dir = fe.include_dir (lh);
+ if (dir != NULL)
+ return concat (dir, SLASH_STRING, fe.name, (char *) NULL);
+ }
+ return xstrdup (fe.name);
}
else
{
- this_cu = dwarf2_per_objfile->all_comp_units[low];
- if (low == dwarf2_per_objfile->n_comp_units - 1
- && sect_off >= this_cu->sect_off + this_cu->length)
- error (_("invalid dwarf2 offset %u"), to_underlying (sect_off));
- gdb_assert (sect_off < this_cu->sect_off + this_cu->length);
- return this_cu;
- }
-}
+ /* The compiler produced a bogus file number. We can at least
+ record the macro definitions made in the file, even if we
+ won't be able to find the file by name. */
+ char fake_name[80];
-/* Initialize dwarf2_cu CU, owned by PER_CU. */
+ xsnprintf (fake_name, sizeof (fake_name),
+ "<bad macro file number %d>", file);
-static void
-init_one_comp_unit (struct dwarf2_cu *cu, struct dwarf2_per_cu_data *per_cu)
-{
- memset (cu, 0, sizeof (*cu));
- per_cu->cu = cu;
- cu->per_cu = per_cu;
- cu->objfile = per_cu->objfile;
- obstack_init (&cu->comp_unit_obstack);
-}
+ complaint (_("bad file number in macro information (%d)"),
+ file);
-/* Initialize basic fields of dwarf_cu CU according to DIE COMP_UNIT_DIE. */
+ return xstrdup (fake_name);
+ }
+}
-static void
-prepare_one_comp_unit (struct dwarf2_cu *cu, struct die_info *comp_unit_die,
- enum language pretend_language)
+/* 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 attribute *attr;
-
- /* Set the language we're debugging. */
- attr = dwarf2_attr (comp_unit_die, DW_AT_language, cu);
- if (attr)
- set_cu_language (DW_UNSND (attr), cu);
- else
+ /* Is the file number a valid index into the line header's file name
+ table? Remember that file numbers start with one, not zero. */
+ if (1 <= file && file <= lh->file_names.size ())
{
- cu->language = pretend_language;
- cu->language_defn = language_def (cu->language);
- }
+ char *relative = file_file_name (file, lh);
- cu->producer = dwarf2_string_attr (comp_unit_die, DW_AT_producer, cu);
+ if (IS_ABSOLUTE_PATH (relative) || comp_dir == NULL)
+ return relative;
+ return reconcat (relative, comp_dir, SLASH_STRING,
+ relative, (char *) NULL);
+ }
+ else
+ return file_file_name (file, lh);
}
-/* Release one cached compilation unit, CU. We unlink it from the tree
- of compilation units, but we don't remove it from the read_in_chain;
- the caller is responsible for that.
- NOTE: DATA is a void * because this function is also used as a
- cleanup routine. */
-static void
-free_heap_comp_unit (void *data)
-{
- struct dwarf2_cu *cu = (struct dwarf2_cu *) data;
+static struct macro_source_file *
+macro_start_file (int file, int line,
+ struct macro_source_file *current_file,
+ struct line_header *lh)
+{
+ /* File name relative to the compilation directory of this source file. */
+ char *file_name = file_file_name (file, lh);
+
+ if (! current_file)
+ {
+ /* Note: We don't create a macro table for this compilation unit
+ at all until we actually get a filename. */
+ struct macro_table *macro_table = get_macro_table ();
- gdb_assert (cu->per_cu != NULL);
- cu->per_cu->cu = NULL;
- cu->per_cu = NULL;
+ /* 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 (macro_table, file_name);
+ macro_define_special (macro_table);
+ }
+ else
+ current_file = macro_include (current_file, line, file_name);
- obstack_free (&cu->comp_unit_obstack, NULL);
+ xfree (file_name);
- xfree (cu);
+ return current_file;
}
-/* 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 be
- sure to unlink it from the cache. Also release any associated storage. */
-
-static void
-free_stack_comp_unit (void *data)
+static const char *
+consume_improper_spaces (const char *p, const char *body)
{
- struct dwarf2_cu *cu = (struct dwarf2_cu *) data;
+ if (*p == ' ')
+ {
+ complaint (_("macro definition contains spaces "
+ "in formal argument list:\n`%s'"),
+ body);
- gdb_assert (cu->per_cu != NULL);
- cu->per_cu->cu = NULL;
- cu->per_cu = NULL;
+ while (*p == ' ')
+ p++;
+ }
- obstack_free (&cu->comp_unit_obstack, NULL);
- cu->partial_dies = NULL;
+ return p;
}
-/* Free all cached compilation units. */
static void
-free_cached_comp_units (void *data)
+parse_macro_definition (struct macro_source_file *file, int line,
+ const char *body)
{
- dwarf2_per_objfile->free_cached_comp_units ();
-}
+ const char *p;
-/* Increase the age counter on each cached compilation unit, and free
- any that are too old. */
+ /* The body string takes one of two forms. For object-like macro
+ definitions, it should be:
-static void
-age_cached_comp_units (void)
-{
- struct dwarf2_per_cu_data *per_cu, **last_chain;
+ <macro name> " " <definition>
- dwarf2_clear_marks (dwarf2_per_objfile->read_in_chain);
- per_cu = dwarf2_per_objfile->read_in_chain;
- while (per_cu != NULL)
- {
- per_cu->cu->last_used ++;
- if (per_cu->cu->last_used <= dwarf_max_cache_age)
- dwarf2_mark (per_cu->cu);
- per_cu = per_cu->cu->read_in_chain;
- }
+ For function-like macro definitions, it should be:
- per_cu = dwarf2_per_objfile->read_in_chain;
- last_chain = &dwarf2_per_objfile->read_in_chain;
- while (per_cu != NULL)
- {
- struct dwarf2_per_cu_data *next_cu;
+ <macro name> "() " <definition>
+ or
+ <macro name> "(" <arg name> ( "," <arg name> ) * ") " <definition>
- next_cu = per_cu->cu->read_in_chain;
+ Spaces may appear only where explicitly indicated, and in the
+ <definition>.
- if (!per_cu->cu->mark)
- {
- free_heap_comp_unit (per_cu->cu);
- *last_chain = next_cu;
- }
- else
- last_chain = &per_cu->cu->read_in_chain;
+ 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.
- per_cu = next_cu;
- }
-}
+ 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. */
-/* Remove a single compilation unit from the cache. */
-static void
-free_one_cached_comp_unit (struct dwarf2_per_cu_data *target_per_cu)
-{
- struct dwarf2_per_cu_data *per_cu, **last_chain;
+ /* 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;
- per_cu = dwarf2_per_objfile->read_in_chain;
- last_chain = &dwarf2_per_objfile->read_in_chain;
- while (per_cu != NULL)
+ if (*p == ' ' || *p == '\0')
{
- struct dwarf2_per_cu_data *next_cu;
-
- next_cu = per_cu->cu->read_in_chain;
+ /* It's an object-like macro. */
+ int name_len = p - body;
+ char *name = savestring (body, name_len);
+ const char *replacement;
- if (per_cu == target_per_cu)
- {
- free_heap_comp_unit (per_cu->cu);
- per_cu->cu = NULL;
- *last_chain = next_cu;
- break;
- }
+ if (*p == ' ')
+ replacement = body + name_len + 1;
else
- last_chain = &per_cu->cu->read_in_chain;
-
- per_cu = next_cu;
- }
-}
-
-/* Release all extra memory associated with OBJFILE. */
-
-void
-dwarf2_free_objfile (struct objfile *objfile)
-{
- dwarf2_per_objfile
- = (struct dwarf2_per_objfile *) objfile_data (objfile,
- dwarf2_objfile_data_key);
-
- if (dwarf2_per_objfile == NULL)
- return;
-
- dwarf2_per_objfile->~dwarf2_per_objfile ();
-}
-
-/* A set of CU "per_cu" pointer, DIE offset, and GDB type pointer.
- We store these in a hash table separate from the DIEs, and preserve them
- when the DIEs are flushed out of cache.
+ {
+ dwarf2_macro_malformed_definition_complaint (body);
+ replacement = body + name_len;
+ }
- The CU "per_cu" pointer is needed because offset alone is not enough to
- uniquely identify the type. A file may have multiple .debug_types sections,
- or the type may come from a DWO file. Furthermore, while it's more logical
- to use per_cu->section+offset, with Fission the section with the data is in
- the DWO file but we don't know that section at the point we need it.
- We have to use something in dwarf2_per_cu_data (or the pointer to it)
- because we can enter the lookup routine, get_die_type_at_offset, from
- outside this file, and thus won't necessarily have PER_CU->cu.
- Fortunately, PER_CU is stable for the life of the objfile. */
+ macro_define_object (file, line, name, replacement);
-struct dwarf2_per_cu_offset_and_type
-{
- const struct dwarf2_per_cu_data *per_cu;
- sect_offset sect_off;
- struct type *type;
-};
+ xfree (name);
+ }
+ else if (*p == '(')
+ {
+ /* It's a function-like macro. */
+ char *name = savestring (body, p - body);
+ int argc = 0;
+ int argv_size = 1;
+ char **argv = XNEWVEC (char *, argv_size);
-/* Hash function for a dwarf2_per_cu_offset_and_type. */
+ p++;
-static hashval_t
-per_cu_offset_and_type_hash (const void *item)
-{
- const struct dwarf2_per_cu_offset_and_type *ofs
- = (const struct dwarf2_per_cu_offset_and_type *) item;
+ p = consume_improper_spaces (p, body);
- return (uintptr_t) ofs->per_cu + to_underlying (ofs->sect_off);
-}
+ /* Parse the formal argument list. */
+ while (*p && *p != ')')
+ {
+ /* Find the extent of the current argument name. */
+ const char *arg_start = p;
-/* Equality function for a dwarf2_per_cu_offset_and_type. */
+ while (*p && *p != ',' && *p != ')' && *p != ' ')
+ p++;
-static int
-per_cu_offset_and_type_eq (const void *item_lhs, const void *item_rhs)
-{
- const struct dwarf2_per_cu_offset_and_type *ofs_lhs
- = (const struct dwarf2_per_cu_offset_and_type *) item_lhs;
- const struct dwarf2_per_cu_offset_and_type *ofs_rhs
- = (const struct dwarf2_per_cu_offset_and_type *) item_rhs;
+ if (! *p || p == arg_start)
+ dwarf2_macro_malformed_definition_complaint (body);
+ else
+ {
+ /* Make sure argv has room for the new argument. */
+ if (argc >= argv_size)
+ {
+ argv_size *= 2;
+ argv = XRESIZEVEC (char *, argv, argv_size);
+ }
- return (ofs_lhs->per_cu == ofs_rhs->per_cu
- && ofs_lhs->sect_off == ofs_rhs->sect_off);
-}
+ argv[argc++] = savestring (arg_start, p - arg_start);
+ }
-/* Set the type associated with DIE to TYPE. Save it in CU's hash
- table if necessary. For convenience, return TYPE.
+ p = consume_improper_spaces (p, body);
- The DIEs reading must have careful ordering to:
- * Not cause infite loops trying to read in DIEs as a prerequisite for
- reading current DIE.
- * Not trying to dereference contents of still incompletely read in types
- while reading in other DIEs.
- * Enable referencing still incompletely read in types just by a pointer to
- the type without accessing its fields.
+ /* Consume the comma, if present. */
+ if (*p == ',')
+ {
+ p++;
- Therefore caller should follow these rules:
- * Try to fetch any prerequisite types we may need to build this DIE type
- before building the type and calling set_die_type.
- * After building type call set_die_type for current DIE as soon as
- possible before fetching more types to complete the current type.
- * Make the type as complete as possible before fetching more types. */
+ p = consume_improper_spaces (p, body);
+ }
+ }
-static struct type *
-set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
-{
- struct dwarf2_per_cu_offset_and_type **slot, ofs;
- struct objfile *objfile = cu->objfile;
- struct attribute *attr;
- struct dynamic_prop prop;
+ if (*p == ')')
+ {
+ p++;
- /* For Ada types, make sure that the gnat-specific data is always
- initialized (if not already set). There are a few types where
- we should not be doing so, because the type-specific area is
- already used to hold some other piece of info (eg: TYPE_CODE_FLT
- where the type-specific area is used to store the floatformat).
- But this is not a problem, because the gnat-specific information
- is actually not needed for these types. */
- if (need_gnat_info (cu)
- && TYPE_CODE (type) != TYPE_CODE_FUNC
- && TYPE_CODE (type) != TYPE_CODE_FLT
- && TYPE_CODE (type) != TYPE_CODE_METHODPTR
- && TYPE_CODE (type) != TYPE_CODE_MEMBERPTR
- && TYPE_CODE (type) != TYPE_CODE_METHOD
- && !HAVE_GNAT_AUX_INFO (type))
- INIT_GNAT_SPECIFIC (type);
+ 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. */
+ dwarf2_macro_malformed_definition_complaint (body);
+ macro_define_function (file, line, name,
+ argc, (const char **) argv,
+ p);
+ }
+ else
+ /* Just complain. */
+ dwarf2_macro_malformed_definition_complaint (body);
+ }
+ else
+ /* Just complain. */
+ dwarf2_macro_malformed_definition_complaint (body);
- /* Read DW_AT_allocated and set in type. */
- attr = dwarf2_attr (die, DW_AT_allocated, cu);
- if (attr_form_is_block (attr))
- {
- if (attr_to_dynamic_prop (attr, die, cu, &prop))
- add_dyn_prop (DYN_PROP_ALLOCATED, prop, type, objfile);
- }
- else if (attr != NULL)
- {
- complaint (&symfile_complaints,
- _("DW_AT_allocated has the wrong form (%s) at DIE 0x%x"),
- (attr != NULL ? dwarf_form_name (attr->form) : "n/a"),
- to_underlying (die->sect_off));
- }
+ xfree (name);
+ {
+ int i;
- /* Read DW_AT_associated and set in type. */
- attr = dwarf2_attr (die, DW_AT_associated, cu);
- if (attr_form_is_block (attr))
- {
- if (attr_to_dynamic_prop (attr, die, cu, &prop))
- add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type, objfile);
- }
- else if (attr != NULL)
- {
- complaint (&symfile_complaints,
- _("DW_AT_associated has the wrong form (%s) at DIE 0x%x"),
- (attr != NULL ? dwarf_form_name (attr->form) : "n/a"),
- to_underlying (die->sect_off));
+ for (i = 0; i < argc; i++)
+ xfree (argv[i]);
+ }
+ xfree (argv);
}
+ else
+ dwarf2_macro_malformed_definition_complaint (body);
+}
- /* Read DW_AT_data_location and set in type. */
- attr = dwarf2_attr (die, DW_AT_data_location, cu);
- if (attr_to_dynamic_prop (attr, die, cu, &prop))
- add_dyn_prop (DYN_PROP_DATA_LOCATION, prop, type, objfile);
+/* Skip some bytes from BYTES according to the form given in FORM.
+ Returns the new pointer. */
- if (dwarf2_per_objfile->die_type_hash == NULL)
+static const gdb_byte *
+skip_form_bytes (bfd *abfd, const gdb_byte *bytes, const gdb_byte *buffer_end,
+ enum dwarf_form form,
+ unsigned int offset_size,
+ struct dwarf2_section_info *section)
+{
+ unsigned int bytes_read;
+
+ switch (form)
{
- dwarf2_per_objfile->die_type_hash =
- htab_create_alloc_ex (127,
- per_cu_offset_and_type_hash,
- per_cu_offset_and_type_eq,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
- }
+ case DW_FORM_data1:
+ case DW_FORM_flag:
+ ++bytes;
+ break;
- ofs.per_cu = cu->per_cu;
- ofs.sect_off = die->sect_off;
- ofs.type = type;
- slot = (struct dwarf2_per_cu_offset_and_type **)
- htab_find_slot (dwarf2_per_objfile->die_type_hash, &ofs, INSERT);
- if (*slot)
- complaint (&symfile_complaints,
- _("A problem internal to GDB: DIE 0x%x has type already set"),
- to_underlying (die->sect_off));
- *slot = XOBNEW (&objfile->objfile_obstack,
- struct dwarf2_per_cu_offset_and_type);
- **slot = ofs;
- return type;
-}
+ case DW_FORM_data2:
+ bytes += 2;
+ break;
-/* Look up the type for the die at SECT_OFF in PER_CU in die_type_hash,
- or return NULL if the die does not have a saved type. */
+ case DW_FORM_data4:
+ bytes += 4;
+ break;
-static struct type *
-get_die_type_at_offset (sect_offset sect_off,
- struct dwarf2_per_cu_data *per_cu)
-{
- struct dwarf2_per_cu_offset_and_type *slot, ofs;
+ case DW_FORM_data8:
+ bytes += 8;
+ break;
- if (dwarf2_per_objfile->die_type_hash == NULL)
- return NULL;
+ case DW_FORM_data16:
+ bytes += 16;
+ break;
- ofs.per_cu = per_cu;
- ofs.sect_off = sect_off;
- slot = ((struct dwarf2_per_cu_offset_and_type *)
- htab_find (dwarf2_per_objfile->die_type_hash, &ofs));
- if (slot)
- return slot->type;
- else
- return NULL;
-}
+ case DW_FORM_string:
+ read_direct_string (abfd, bytes, &bytes_read);
+ bytes += bytes_read;
+ break;
-/* Look up the type for DIE in CU in die_type_hash,
- or return NULL if DIE does not have a saved type. */
+ case DW_FORM_sec_offset:
+ case DW_FORM_strp:
+ case DW_FORM_GNU_strp_alt:
+ bytes += offset_size;
+ break;
-static struct type *
-get_die_type (struct die_info *die, struct dwarf2_cu *cu)
-{
- return get_die_type_at_offset (die->sect_off, cu->per_cu);
-}
+ case DW_FORM_block:
+ bytes += read_unsigned_leb128 (abfd, bytes, &bytes_read);
+ bytes += bytes_read;
+ break;
-/* Add a dependence relationship from CU to REF_PER_CU. */
+ case DW_FORM_block1:
+ bytes += 1 + read_1_byte (abfd, bytes);
+ break;
+ case DW_FORM_block2:
+ bytes += 2 + read_2_bytes (abfd, bytes);
+ break;
+ case DW_FORM_block4:
+ bytes += 4 + read_4_bytes (abfd, bytes);
+ break;
-static void
-dwarf2_add_dependence (struct dwarf2_cu *cu,
- struct dwarf2_per_cu_data *ref_per_cu)
-{
- void **slot;
+ case DW_FORM_sdata:
+ case DW_FORM_udata:
+ case DW_FORM_GNU_addr_index:
+ case DW_FORM_GNU_str_index:
+ bytes = gdb_skip_leb128 (bytes, buffer_end);
+ if (bytes == NULL)
+ {
+ dwarf2_section_buffer_overflow_complaint (section);
+ return NULL;
+ }
+ break;
- if (cu->dependencies == NULL)
- cu->dependencies
- = htab_create_alloc_ex (5, htab_hash_pointer, htab_eq_pointer,
- NULL, &cu->comp_unit_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ case DW_FORM_implicit_const:
+ break;
- slot = htab_find_slot (cu->dependencies, ref_per_cu, INSERT);
- if (*slot == NULL)
- *slot = ref_per_cu;
+ default:
+ {
+ complaint (_("invalid form 0x%x in `%s'"),
+ form, get_section_name (section));
+ return NULL;
+ }
+ }
+
+ return bytes;
}
-/* Subroutine of dwarf2_mark to pass to htab_traverse.
- Set the mark field in every compilation unit in the
- cache that we must keep because we are keeping CU. */
+/* A helper for dwarf_decode_macros that handles skipping an unknown
+ opcode. Returns an updated pointer to the macro data buffer; or,
+ on error, issues a complaint and returns NULL. */
-static int
-dwarf2_mark_helper (void **slot, void *data)
+static const gdb_byte *
+skip_unknown_opcode (unsigned int opcode,
+ const gdb_byte **opcode_definitions,
+ const gdb_byte *mac_ptr, const gdb_byte *mac_end,
+ bfd *abfd,
+ unsigned int offset_size,
+ struct dwarf2_section_info *section)
{
- struct dwarf2_per_cu_data *per_cu;
-
- per_cu = (struct dwarf2_per_cu_data *) *slot;
+ unsigned int bytes_read, i;
+ unsigned long arg;
+ const gdb_byte *defn;
- /* cu->dependencies references may not yet have been ever read if QUIT aborts
- reading of the chain. As such dependencies remain valid it is not much
- useful to track and undo them during QUIT cleanups. */
- if (per_cu->cu == NULL)
- return 1;
+ if (opcode_definitions[opcode] == NULL)
+ {
+ complaint (_("unrecognized DW_MACFINO opcode 0x%x"),
+ opcode);
+ return NULL;
+ }
- if (per_cu->cu->mark)
- return 1;
- per_cu->cu->mark = 1;
+ defn = opcode_definitions[opcode];
+ arg = read_unsigned_leb128 (abfd, defn, &bytes_read);
+ defn += bytes_read;
- if (per_cu->cu->dependencies != NULL)
- htab_traverse (per_cu->cu->dependencies, dwarf2_mark_helper, NULL);
+ for (i = 0; i < arg; ++i)
+ {
+ mac_ptr = skip_form_bytes (abfd, mac_ptr, mac_end,
+ (enum dwarf_form) defn[i], offset_size,
+ section);
+ if (mac_ptr == NULL)
+ {
+ /* skip_form_bytes already issued the complaint. */
+ return NULL;
+ }
+ }
- return 1;
+ return mac_ptr;
}
-/* Set the mark field in CU and in every other compilation unit in the
- cache that we must keep because we are keeping CU. */
+/* A helper function which parses the header of a macro section.
+ If the macro section is the extended (for now called "GNU") type,
+ then this updates *OFFSET_SIZE. Returns a pointer to just after
+ the header, or issues a complaint and returns NULL on error. */
-static void
-dwarf2_mark (struct dwarf2_cu *cu)
+static const gdb_byte *
+dwarf_parse_macro_header (const gdb_byte **opcode_definitions,
+ bfd *abfd,
+ const gdb_byte *mac_ptr,
+ unsigned int *offset_size,
+ int section_is_gnu)
{
- if (cu->mark)
- return;
- cu->mark = 1;
- if (cu->dependencies != NULL)
- htab_traverse (cu->dependencies, dwarf2_mark_helper, NULL);
-}
+ memset (opcode_definitions, 0, 256 * sizeof (gdb_byte *));
-static void
-dwarf2_clear_marks (struct dwarf2_per_cu_data *per_cu)
-{
- while (per_cu)
+ if (section_is_gnu)
{
- per_cu->cu->mark = 0;
- per_cu = per_cu->cu->read_in_chain;
- }
-}
+ unsigned int version, flags;
-/* Trivial hash function for partial_die_info: the hash value of a DIE
- is its offset in .debug_info for this objfile. */
+ version = read_2_bytes (abfd, mac_ptr);
+ if (version != 4 && version != 5)
+ {
+ complaint (_("unrecognized version `%d' in .debug_macro section"),
+ version);
+ return NULL;
+ }
+ mac_ptr += 2;
-static hashval_t
-partial_die_hash (const void *item)
-{
- const struct partial_die_info *part_die
- = (const struct partial_die_info *) item;
+ flags = read_1_byte (abfd, mac_ptr);
+ ++mac_ptr;
+ *offset_size = (flags & 1) ? 8 : 4;
- return to_underlying (part_die->sect_off);
-}
+ if ((flags & 2) != 0)
+ /* We don't need the line table offset. */
+ mac_ptr += *offset_size;
-/* Trivial comparison function for partial_die_info structures: two DIEs
- are equal if they have the same offset. */
+ /* Vendor opcode descriptions. */
+ if ((flags & 4) != 0)
+ {
+ unsigned int i, count;
-static int
-partial_die_eq (const void *item_lhs, const void *item_rhs)
-{
- const struct partial_die_info *part_die_lhs
- = (const struct partial_die_info *) item_lhs;
- const struct partial_die_info *part_die_rhs
- = (const struct partial_die_info *) item_rhs;
+ count = read_1_byte (abfd, mac_ptr);
+ ++mac_ptr;
+ for (i = 0; i < count; ++i)
+ {
+ unsigned int opcode, bytes_read;
+ unsigned long arg;
- return part_die_lhs->sect_off == part_die_rhs->sect_off;
+ opcode = read_1_byte (abfd, mac_ptr);
+ ++mac_ptr;
+ opcode_definitions[opcode] = mac_ptr;
+ arg = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ mac_ptr += arg;
+ }
+ }
+ }
+
+ return mac_ptr;
}
-static struct cmd_list_element *set_dwarf_cmdlist;
-static struct cmd_list_element *show_dwarf_cmdlist;
+/* A helper for dwarf_decode_macros that handles the GNU extensions,
+ including DW_MACRO_import. */
static void
-set_dwarf_cmd (const char *args, int from_tty)
+dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ bfd *abfd,
+ const gdb_byte *mac_ptr, const gdb_byte *mac_end,
+ struct macro_source_file *current_file,
+ struct line_header *lh,
+ struct dwarf2_section_info *section,
+ int section_is_gnu, int section_is_dwz,
+ unsigned int offset_size,
+ htab_t include_hash)
{
- help_list (set_dwarf_cmdlist, "maintenance set dwarf ", all_commands,
- gdb_stdout);
-}
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ enum dwarf_macro_record_type macinfo_type;
+ int at_commandline;
+ const gdb_byte *opcode_definitions[256];
-static void
-show_dwarf_cmd (const char *args, int from_tty)
-{
- cmd_show_list (show_dwarf_cmdlist, from_tty, "");
-}
+ mac_ptr = dwarf_parse_macro_header (opcode_definitions, abfd, mac_ptr,
+ &offset_size, section_is_gnu);
+ if (mac_ptr == NULL)
+ {
+ /* We already issued a complaint. */
+ return;
+ }
-/* Free data associated with OBJFILE, if necessary. */
+ /* Determines if GDB is still before first DW_MACINFO_start_file. If true
+ GDB is still reading the definitions from command line. First
+ DW_MACINFO_start_file will need to be ignored as it was already executed
+ to create CURRENT_FILE for the main source holding also the command line
+ definitions. On first met DW_MACINFO_start_file this flag is reset to
+ normally execute all the remaining DW_MACINFO_start_file macinfos. */
-static void
-dwarf2_per_objfile_free (struct objfile *objfile, void *d)
-{
- struct dwarf2_per_objfile *data = (struct dwarf2_per_objfile *) d;
- int ix;
+ at_commandline = 1;
- /* Make sure we don't accidentally use dwarf2_per_objfile while
- cleaning up. */
- dwarf2_per_objfile = NULL;
+ do
+ {
+ /* Do we at least have room for a macinfo type byte? */
+ if (mac_ptr >= mac_end)
+ {
+ dwarf2_section_buffer_overflow_complaint (section);
+ break;
+ }
- for (ix = 0; ix < data->n_comp_units; ++ix)
- VEC_free (dwarf2_per_cu_ptr, data->all_comp_units[ix]->imported_symtabs);
+ macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr);
+ mac_ptr++;
+
+ /* Note that we rely on the fact that the corresponding GNU and
+ DWARF constants are the same. */
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES
+ switch (macinfo_type)
+ {
+ /* A zero macinfo type indicates the end of the macro
+ information. */
+ case 0:
+ break;
- for (ix = 0; ix < data->n_type_units; ++ix)
- VEC_free (dwarf2_per_cu_ptr,
- data->all_type_units[ix]->per_cu.imported_symtabs);
- xfree (data->all_type_units);
+ case DW_MACRO_define:
+ case DW_MACRO_undef:
+ case DW_MACRO_define_strp:
+ case DW_MACRO_undef_strp:
+ case DW_MACRO_define_sup:
+ case DW_MACRO_undef_sup:
+ {
+ unsigned int bytes_read;
+ int line;
+ const char *body;
+ int is_define;
- VEC_free (dwarf2_section_info_def, data->types);
+ line = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
- if (data->dwo_files)
- free_dwo_files (data->dwo_files, objfile);
- if (data->dwp_file)
- gdb_bfd_unref (data->dwp_file->dbfd);
+ if (macinfo_type == DW_MACRO_define
+ || macinfo_type == DW_MACRO_undef)
+ {
+ body = read_direct_string (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ }
+ else
+ {
+ LONGEST str_offset;
- if (data->dwz_file && data->dwz_file->dwz_bfd)
- gdb_bfd_unref (data->dwz_file->dwz_bfd);
+ str_offset = read_offset_1 (abfd, mac_ptr, offset_size);
+ mac_ptr += offset_size;
- if (data->index_table != NULL)
- data->index_table->~mapped_index ();
-}
+ if (macinfo_type == DW_MACRO_define_sup
+ || macinfo_type == DW_MACRO_undef_sup
+ || section_is_dwz)
+ {
+ struct dwz_file *dwz
+ = dwarf2_get_dwz_file (dwarf2_per_objfile);
-\f
-/* The "save gdb-index" command. */
+ body = read_indirect_string_from_dwz (objfile,
+ dwz, str_offset);
+ }
+ else
+ body = read_indirect_string_at_offset (dwarf2_per_objfile,
+ abfd, str_offset);
+ }
-/* Write SIZE bytes from the buffer pointed to by DATA to FILE, with
- error checking. */
+ is_define = (macinfo_type == DW_MACRO_define
+ || macinfo_type == DW_MACRO_define_strp
+ || macinfo_type == DW_MACRO_define_sup);
+ if (! current_file)
+ {
+ /* DWARF violation as no main source is present. */
+ complaint (_("debug info with no main source gives macro %s "
+ "on line %d: %s"),
+ is_define ? _("definition") : _("undefinition"),
+ line, body);
+ break;
+ }
+ if ((line == 0 && !at_commandline)
+ || (line != 0 && at_commandline))
+ complaint (_("debug info gives %s macro %s with %s line %d: %s"),
+ at_commandline ? _("command-line") : _("in-file"),
+ is_define ? _("definition") : _("undefinition"),
+ line == 0 ? _("zero") : _("non-zero"), line, body);
-static void
-file_write (FILE *file, const void *data, size_t size)
-{
- if (fwrite (data, 1, size, file) != size)
- error (_("couldn't data write to file"));
-}
+ if (is_define)
+ parse_macro_definition (current_file, line, body);
+ else
+ {
+ gdb_assert (macinfo_type == DW_MACRO_undef
+ || macinfo_type == DW_MACRO_undef_strp
+ || macinfo_type == DW_MACRO_undef_sup);
+ macro_undef (current_file, line, body);
+ }
+ }
+ break;
-/* Write the contents of VEC to FILE, with error checking. */
+ case DW_MACRO_start_file:
+ {
+ unsigned int bytes_read;
+ int line, file;
-template<typename Elem, typename Alloc>
-static void
-file_write (FILE *file, const std::vector<Elem, Alloc> &vec)
-{
- file_write (file, vec.data (), vec.size () * sizeof (vec[0]));
-}
+ 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;
-/* In-memory buffer to prepare data to be written later to a file. */
-class data_buf
-{
-public:
- /* Copy DATA to the end of the buffer. */
- template<typename T>
- void append_data (const T &data)
- {
- std::copy (reinterpret_cast<const gdb_byte *> (&data),
- reinterpret_cast<const gdb_byte *> (&data + 1),
- grow (sizeof (data)));
- }
+ if ((line == 0 && !at_commandline)
+ || (line != 0 && at_commandline))
+ complaint (_("debug info gives source %d included "
+ "from %s at %s line %d"),
+ file, at_commandline ? _("command-line") : _("file"),
+ line == 0 ? _("zero") : _("non-zero"), line);
- /* Copy CSTR (a zero-terminated string) to the end of buffer. The
- terminating zero is appended too. */
- void append_cstr0 (const char *cstr)
- {
- const size_t size = strlen (cstr) + 1;
- std::copy (cstr, cstr + size, grow (size));
- }
+ if (at_commandline)
+ {
+ /* This DW_MACRO_start_file was executed in the
+ pass one. */
+ at_commandline = 0;
+ }
+ else
+ current_file = macro_start_file (file, line, current_file, lh);
+ }
+ break;
- /* Store INPUT as ULEB128 to the end of buffer. */
- void append_unsigned_leb128 (ULONGEST input)
- {
- for (;;)
- {
- gdb_byte output = input & 0x7f;
- input >>= 7;
- if (input)
- output |= 0x80;
- append_data (output);
- if (input == 0)
- break;
- }
- }
+ case DW_MACRO_end_file:
+ if (! current_file)
+ complaint (_("macro debug info has an unmatched "
+ "`close_file' directive"));
+ else
+ {
+ current_file = current_file->included_by;
+ if (! current_file)
+ {
+ enum dwarf_macro_record_type next_type;
- /* Accept a host-format integer in VAL and append it to the buffer
- as a target-format integer which is LEN bytes long. */
- void append_uint (size_t len, bfd_endian byte_order, ULONGEST val)
- {
- ::store_unsigned_integer (grow (len), len, byte_order, val);
- }
+ /* 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. */
- /* Return the size of the buffer. */
- size_t size () const
- {
- return m_vec.size ();
- }
+ /* Do we at least have room for a macinfo type byte? */
+ if (mac_ptr >= mac_end)
+ {
+ dwarf2_section_buffer_overflow_complaint (section);
+ return;
+ }
- /* Return true iff the buffer is empty. */
- bool empty () const
- {
- return m_vec.empty ();
- }
+ /* We don't increment mac_ptr here, so this is just
+ a look-ahead. */
+ next_type
+ = (enum dwarf_macro_record_type) read_1_byte (abfd,
+ mac_ptr);
+ if (next_type != 0)
+ complaint (_("no terminating 0-type entry for "
+ "macros in `.debug_macinfo' section"));
- /* Write the buffer to FILE. */
- void file_write (FILE *file) const
- {
- ::file_write (file, m_vec);
- }
+ return;
+ }
+ }
+ break;
-private:
- /* Grow SIZE bytes at the end of the buffer. Returns a pointer to
- the start of the new block. */
- gdb_byte *grow (size_t size)
- {
- m_vec.resize (m_vec.size () + size);
- return &*m_vec.end () - size;
- }
+ case DW_MACRO_import:
+ case DW_MACRO_import_sup:
+ {
+ LONGEST offset;
+ void **slot;
+ bfd *include_bfd = abfd;
+ struct dwarf2_section_info *include_section = section;
+ const gdb_byte *include_mac_end = mac_end;
+ int is_dwz = section_is_dwz;
+ const gdb_byte *new_mac_ptr;
- gdb::byte_vector m_vec;
-};
+ offset = read_offset_1 (abfd, mac_ptr, offset_size);
+ mac_ptr += offset_size;
-/* An entry in the symbol table. */
-struct symtab_index_entry
-{
- /* The name of the symbol. */
- const char *name;
- /* The offset of the name in the constant pool. */
- offset_type index_offset;
- /* A sorted vector of the indices of all the CUs that hold an object
- of this name. */
- std::vector<offset_type> cu_indices;
-};
+ if (macinfo_type == DW_MACRO_import_sup)
+ {
+ struct dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
-/* The symbol table. This is a power-of-2-sized hash table. */
-struct mapped_symtab
-{
- mapped_symtab ()
- {
- data.resize (1024);
- }
+ dwarf2_read_section (objfile, &dwz->macro);
- offset_type n_elements = 0;
- std::vector<symtab_index_entry> data;
-};
+ include_section = &dwz->macro;
+ include_bfd = get_section_bfd_owner (include_section);
+ include_mac_end = dwz->macro.buffer + dwz->macro.size;
+ is_dwz = 1;
+ }
-/* Find a slot in SYMTAB for the symbol NAME. Returns a reference to
- the slot.
-
- Function is used only during write_hash_table so no index format backward
- compatibility is needed. */
+ new_mac_ptr = include_section->buffer + offset;
+ slot = htab_find_slot (include_hash, new_mac_ptr, INSERT);
-static symtab_index_entry &
-find_slot (struct mapped_symtab *symtab, const char *name)
-{
- offset_type index, step, hash = mapped_index_string_hash (INT_MAX, name);
+ if (*slot != NULL)
+ {
+ /* This has actually happened; see
+ http://sourceware.org/bugzilla/show_bug.cgi?id=13568. */
+ complaint (_("recursive DW_MACRO_import in "
+ ".debug_macro section"));
+ }
+ else
+ {
+ *slot = (void *) new_mac_ptr;
- index = hash & (symtab->data.size () - 1);
- step = ((hash * 17) & (symtab->data.size () - 1)) | 1;
+ dwarf_decode_macro_bytes (dwarf2_per_objfile,
+ include_bfd, new_mac_ptr,
+ include_mac_end, current_file, lh,
+ section, section_is_gnu, is_dwz,
+ offset_size, include_hash);
- for (;;)
- {
- if (symtab->data[index].name == NULL
- || strcmp (name, symtab->data[index].name) == 0)
- return symtab->data[index];
- index = (index + step) & (symtab->data.size () - 1);
- }
-}
+ htab_remove_elt (include_hash, (void *) new_mac_ptr);
+ }
+ }
+ break;
-/* Expand SYMTAB's hash table. */
+ case DW_MACINFO_vendor_ext:
+ if (!section_is_gnu)
+ {
+ unsigned int bytes_read;
-static void
-hash_expand (struct mapped_symtab *symtab)
-{
- auto old_entries = std::move (symtab->data);
+ /* This reads the constant, but since we don't recognize
+ any vendor extensions, we ignore it. */
+ read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ read_direct_string (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
- symtab->data.clear ();
- symtab->data.resize (old_entries.size () * 2);
+ /* We don't recognize any vendor extensions. */
+ break;
+ }
+ /* FALLTHROUGH */
- for (auto &it : old_entries)
- if (it.name != NULL)
- {
- auto &ref = find_slot (symtab, it.name);
- ref = std::move (it);
- }
+ default:
+ mac_ptr = skip_unknown_opcode (macinfo_type, opcode_definitions,
+ mac_ptr, mac_end, abfd, offset_size,
+ section);
+ if (mac_ptr == NULL)
+ return;
+ break;
+ }
+ DIAGNOSTIC_POP
+ } while (macinfo_type != 0);
}
-/* Add an entry to SYMTAB. NAME is the name of the symbol.
- CU_INDEX is the index of the CU in which the symbol appears.
- IS_STATIC is one if the symbol is static, otherwise zero (global). */
-
static void
-add_index_entry (struct mapped_symtab *symtab, const char *name,
- int is_static, gdb_index_symbol_kind kind,
- offset_type cu_index)
+dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset,
+ int section_is_gnu)
{
- offset_type cu_index_and_attrs;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct line_header *lh = cu->line_header;
+ bfd *abfd;
+ const gdb_byte *mac_ptr, *mac_end;
+ struct macro_source_file *current_file = 0;
+ enum dwarf_macro_record_type macinfo_type;
+ unsigned int offset_size = cu->header.offset_size;
+ const gdb_byte *opcode_definitions[256];
+ void **slot;
+ struct dwarf2_section_info *section;
+ const char *section_name;
- ++symtab->n_elements;
- if (4 * symtab->n_elements / 3 >= symtab->data.size ())
- hash_expand (symtab);
+ if (cu->dwo_unit != NULL)
+ {
+ if (section_is_gnu)
+ {
+ section = &cu->dwo_unit->dwo_file->sections.macro;
+ section_name = ".debug_macro.dwo";
+ }
+ else
+ {
+ section = &cu->dwo_unit->dwo_file->sections.macinfo;
+ section_name = ".debug_macinfo.dwo";
+ }
+ }
+ else
+ {
+ if (section_is_gnu)
+ {
+ section = &dwarf2_per_objfile->macro;
+ section_name = ".debug_macro";
+ }
+ else
+ {
+ section = &dwarf2_per_objfile->macinfo;
+ section_name = ".debug_macinfo";
+ }
+ }
- symtab_index_entry &slot = find_slot (symtab, name);
- if (slot.name == NULL)
+ dwarf2_read_section (objfile, section);
+ if (section->buffer == NULL)
{
- slot.name = name;
- /* index_offset is set later. */
+ complaint (_("missing %s section"), section_name);
+ return;
}
+ abfd = get_section_bfd_owner (section);
- cu_index_and_attrs = 0;
- DW2_GDB_INDEX_CU_SET_VALUE (cu_index_and_attrs, cu_index);
- DW2_GDB_INDEX_SYMBOL_STATIC_SET_VALUE (cu_index_and_attrs, is_static);
- DW2_GDB_INDEX_SYMBOL_KIND_SET_VALUE (cu_index_and_attrs, kind);
+ /* First pass: Find the name of the base filename.
+ This filename is needed in order to process all macros whose definition
+ (or undefinition) comes from the command line. These macros are defined
+ before the first DW_MACINFO_start_file entry, and yet still need to be
+ associated to the base file.
- /* We don't want to record an index value twice as we want to avoid the
- duplication.
- We process all global symbols and then all static symbols
- (which would allow us to avoid the duplication by only having to check
- the last entry pushed), but a symbol could have multiple kinds in one CU.
- To keep things simple we don't worry about the duplication here and
- sort and uniqufy the list after we've processed all symbols. */
- slot.cu_indices.push_back (cu_index_and_attrs);
-}
+ To determine the base file name, we scan the macro definitions until we
+ reach the first DW_MACINFO_start_file entry. We then initialize
+ CURRENT_FILE accordingly so that any macro definition found before the
+ first DW_MACINFO_start_file can still be associated to the base file. */
-/* Sort and remove duplicates of all symbols' cu_indices lists. */
+ mac_ptr = section->buffer + offset;
+ mac_end = section->buffer + section->size;
-static void
-uniquify_cu_indices (struct mapped_symtab *symtab)
-{
- for (auto &entry : symtab->data)
+ mac_ptr = dwarf_parse_macro_header (opcode_definitions, abfd, mac_ptr,
+ &offset_size, section_is_gnu);
+ if (mac_ptr == NULL)
{
- if (entry.name != NULL && !entry.cu_indices.empty ())
- {
- auto &cu_indices = entry.cu_indices;
- std::sort (cu_indices.begin (), cu_indices.end ());
- auto from = std::unique (cu_indices.begin (), cu_indices.end ());
- cu_indices.erase (from, cu_indices.end ());
- }
+ /* We already issued a complaint. */
+ return;
}
-}
-/* A form of 'const char *' suitable for container keys. Only the
- pointer is stored. The strings themselves are compared, not the
- pointers. */
-class c_str_view
-{
-public:
- c_str_view (const char *cstr)
- : m_cstr (cstr)
- {}
+ do
+ {
+ /* Do we at least have room for a macinfo type byte? */
+ if (mac_ptr >= mac_end)
+ {
+ /* Complaint is printed during the second pass as GDB will probably
+ stop the first pass earlier upon finding
+ DW_MACINFO_start_file. */
+ break;
+ }
- bool operator== (const c_str_view &other) const
- {
- return strcmp (m_cstr, other.m_cstr) == 0;
- }
+ macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr);
+ mac_ptr++;
- /* Return the underlying C string. Note, the returned string is
- only a reference with lifetime of this object. */
- const char *c_str () const
- {
- return m_cstr;
- }
+ /* Note that we rely on the fact that the corresponding GNU and
+ DWARF constants are the same. */
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES
+ switch (macinfo_type)
+ {
+ /* A zero macinfo type indicates the end of the macro
+ information. */
+ case 0:
+ break;
-private:
- friend class c_str_view_hasher;
- const char *const m_cstr;
-};
+ case DW_MACRO_define:
+ case DW_MACRO_undef:
+ /* Only skip the data by MAC_PTR. */
+ {
+ unsigned int bytes_read;
-/* A std::unordered_map::hasher for c_str_view that uses the right
- hash function for strings in a mapped index. */
-class c_str_view_hasher
-{
-public:
- size_t operator () (const c_str_view &x) const
- {
- return mapped_index_string_hash (INT_MAX, x.m_cstr);
- }
-};
+ read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ read_direct_string (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ }
+ break;
-/* A std::unordered_map::hasher for std::vector<>. */
-template<typename T>
-class vector_hasher
-{
-public:
- size_t operator () (const std::vector<T> &key) const
- {
- return iterative_hash (key.data (),
- sizeof (key.front ()) * key.size (), 0);
- }
-};
+ case DW_MACRO_start_file:
+ {
+ unsigned int bytes_read;
+ int line, file;
-/* Write the mapped hash table SYMTAB to the data buffer OUTPUT, with
- constant pool entries going into the data buffer CPOOL. */
+ 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;
-static void
-write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool)
-{
- {
- /* Elements are sorted vectors of the indices of all the CUs that
- hold an object of this name. */
- std::unordered_map<std::vector<offset_type>, offset_type,
- vector_hasher<offset_type>>
- symbol_hash_table;
-
- /* We add all the index vectors to the constant pool first, to
- ensure alignment is ok. */
- for (symtab_index_entry &entry : symtab->data)
- {
- if (entry.name == NULL)
- continue;
- gdb_assert (entry.index_offset == 0);
-
- /* Finding before inserting is faster than always trying to
- insert, because inserting always allocates a node, does the
- lookup, and then destroys the new node if another node
- already had the same key. C++17 try_emplace will avoid
- this. */
- const auto found
- = symbol_hash_table.find (entry.cu_indices);
- if (found != symbol_hash_table.end ())
+ current_file = macro_start_file (file, line, current_file, lh);
+ }
+ break;
+
+ case DW_MACRO_end_file:
+ /* No data to skip by MAC_PTR. */
+ break;
+
+ case DW_MACRO_define_strp:
+ case DW_MACRO_undef_strp:
+ case DW_MACRO_define_sup:
+ case DW_MACRO_undef_sup:
{
- entry.index_offset = found->second;
- continue;
+ unsigned int bytes_read;
+
+ read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ mac_ptr += offset_size;
}
+ break;
- symbol_hash_table.emplace (entry.cu_indices, cpool.size ());
- entry.index_offset = cpool.size ();
- cpool.append_data (MAYBE_SWAP (entry.cu_indices.size ()));
- for (const auto index : entry.cu_indices)
- cpool.append_data (MAYBE_SWAP (index));
- }
- }
+ case DW_MACRO_import:
+ case DW_MACRO_import_sup:
+ /* Note that, according to the spec, a transparent include
+ chain cannot call DW_MACRO_start_file. So, we can just
+ skip this opcode. */
+ mac_ptr += offset_size;
+ break;
+
+ case DW_MACINFO_vendor_ext:
+ /* Only skip the data by MAC_PTR. */
+ if (!section_is_gnu)
+ {
+ unsigned int bytes_read;
+
+ read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ read_direct_string (abfd, mac_ptr, &bytes_read);
+ mac_ptr += bytes_read;
+ }
+ /* FALLTHROUGH */
+
+ default:
+ mac_ptr = skip_unknown_opcode (macinfo_type, opcode_definitions,
+ mac_ptr, mac_end, abfd, offset_size,
+ section);
+ if (mac_ptr == NULL)
+ return;
+ break;
+ }
+ DIAGNOSTIC_POP
+ } while (macinfo_type != 0 && current_file == NULL);
- /* Now write out the hash table. */
- std::unordered_map<c_str_view, offset_type, c_str_view_hasher> str_table;
- for (const auto &entry : symtab->data)
- {
- offset_type str_off, vec_off;
+ /* Second pass: Process all entries.
- if (entry.name != NULL)
- {
- const auto insertpair = str_table.emplace (entry.name, cpool.size ());
- if (insertpair.second)
- cpool.append_cstr0 (entry.name);
- str_off = insertpair.first->second;
- vec_off = entry.index_offset;
- }
- else
- {
- /* While 0 is a valid constant pool index, it is not valid
- to have 0 for both offsets. */
- str_off = 0;
- vec_off = 0;
- }
+ Use the AT_COMMAND_LINE flag to determine whether we are still processing
+ command-line macro definitions/undefinitions. This flag is unset when we
+ reach the first DW_MACINFO_start_file entry. */
- output.append_data (MAYBE_SWAP (str_off));
- output.append_data (MAYBE_SWAP (vec_off));
- }
+ htab_up include_hash (htab_create_alloc (1, htab_hash_pointer,
+ htab_eq_pointer,
+ NULL, xcalloc, xfree));
+ mac_ptr = section->buffer + offset;
+ slot = htab_find_slot (include_hash.get (), mac_ptr, INSERT);
+ *slot = (void *) mac_ptr;
+ dwarf_decode_macro_bytes (dwarf2_per_objfile,
+ abfd, mac_ptr, mac_end,
+ current_file, lh, section,
+ section_is_gnu, 0, offset_size,
+ include_hash.get ());
}
-typedef std::unordered_map<partial_symtab *, unsigned int> psym_index_map;
+/* Check if the attribute's form is a DW_FORM_block*
+ if so return true else false. */
-/* Helper struct for building the address table. */
-struct addrmap_index_data
+static int
+attr_form_is_block (const struct attribute *attr)
{
- addrmap_index_data (data_buf &addr_vec_, psym_index_map &cu_index_htab_)
- : addr_vec (addr_vec_), cu_index_htab (cu_index_htab_)
- {}
+ return (attr == NULL ? 0 :
+ attr->form == DW_FORM_block1
+ || attr->form == DW_FORM_block2
+ || attr->form == DW_FORM_block4
+ || attr->form == DW_FORM_block
+ || attr->form == DW_FORM_exprloc);
+}
- struct objfile *objfile;
- data_buf &addr_vec;
- psym_index_map &cu_index_htab;
-
- /* Non-zero if the previous_* fields are valid.
- We can't write an entry until we see the next entry (since it is only then
- that we know the end of the entry). */
- int previous_valid;
- /* Index of the CU in the table of all CUs in the index file. */
- unsigned int previous_cu_index;
- /* Start address of the CU. */
- CORE_ADDR previous_cu_start;
-};
+/* Return non-zero if ATTR's value is a section offset --- classes
+ lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise.
+ You may use DW_UNSND (attr) to retrieve such offsets.
-/* Write an address entry to ADDR_VEC. */
+ Section 7.5.4, "Attribute Encodings", explains that no attribute
+ may have a value that belongs to more than one of these classes; it
+ would be ambiguous if we did, because we use the same forms for all
+ of them. */
-static void
-add_address_entry (struct objfile *objfile, data_buf &addr_vec,
- CORE_ADDR start, CORE_ADDR end, unsigned int cu_index)
+static int
+attr_form_is_section_offset (const struct attribute *attr)
{
- CORE_ADDR baseaddr;
+ return (attr->form == DW_FORM_data4
+ || attr->form == DW_FORM_data8
+ || attr->form == DW_FORM_sec_offset);
+}
- baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+/* Return non-zero if ATTR's value falls in the 'constant' class, or
+ zero otherwise. When this function returns true, you can apply
+ dwarf2_get_attr_constant_value to it.
- addr_vec.append_uint (8, BFD_ENDIAN_LITTLE, start - baseaddr);
- addr_vec.append_uint (8, BFD_ENDIAN_LITTLE, end - baseaddr);
- addr_vec.append_data (MAYBE_SWAP (cu_index));
-}
+ However, note that for some attributes you must check
+ attr_form_is_section_offset before using this test. DW_FORM_data4
+ and DW_FORM_data8 are members of both the constant class, and of
+ the classes that contain offsets into other debug sections
+ (lineptr, loclistptr, macptr or rangelistptr). The DWARF spec says
+ that, if an attribute's can be either a constant or one of the
+ section offset classes, DW_FORM_data4 and DW_FORM_data8 should be
+ taken as section offsets, not constants.
-/* Worker function for traversing an addrmap to build the address table. */
+ DW_FORM_data16 is not considered as dwarf2_get_attr_constant_value
+ cannot handle that. */
static int
-add_address_entry_worker (void *datap, CORE_ADDR start_addr, void *obj)
+attr_form_is_constant (const struct attribute *attr)
{
- struct addrmap_index_data *data = (struct addrmap_index_data *) datap;
- struct partial_symtab *pst = (struct partial_symtab *) obj;
-
- if (data->previous_valid)
- add_address_entry (data->objfile, data->addr_vec,
- data->previous_cu_start, start_addr,
- data->previous_cu_index);
-
- data->previous_cu_start = start_addr;
- if (pst != NULL)
+ switch (attr->form)
{
- const auto it = data->cu_index_htab.find (pst);
- gdb_assert (it != data->cu_index_htab.cend ());
- data->previous_cu_index = it->second;
- data->previous_valid = 1;
+ case DW_FORM_sdata:
+ case DW_FORM_udata:
+ case DW_FORM_data1:
+ case DW_FORM_data2:
+ case DW_FORM_data4:
+ case DW_FORM_data8:
+ case DW_FORM_implicit_const:
+ return 1;
+ default:
+ return 0;
}
- else
- data->previous_valid = 0;
-
- return 0;
}
-/* Write OBJFILE's address map to ADDR_VEC.
- CU_INDEX_HTAB is used to map addrmap entries to their CU indices
- in the index file. */
-
-static void
-write_address_map (struct objfile *objfile, data_buf &addr_vec,
- psym_index_map &cu_index_htab)
-{
- struct addrmap_index_data addrmap_index_data (addr_vec, cu_index_htab);
-
- /* When writing the address table, we have to cope with the fact that
- the addrmap iterator only provides the start of a region; we have to
- wait until the next invocation to get the start of the next region. */
-
- addrmap_index_data.objfile = objfile;
- addrmap_index_data.previous_valid = 0;
-
- addrmap_foreach (objfile->psymtabs_addrmap, add_address_entry_worker,
- &addrmap_index_data);
- /* It's highly unlikely the last entry (end address = 0xff...ff)
- is valid, but we should still handle it.
- The end address is recorded as the start of the next region, but that
- doesn't work here. To cope we pass 0xff...ff, this is a rare situation
- anyway. */
- if (addrmap_index_data.previous_valid)
- add_address_entry (objfile, addr_vec,
- addrmap_index_data.previous_cu_start, (CORE_ADDR) -1,
- addrmap_index_data.previous_cu_index);
-}
-
-/* Return the symbol kind of PSYM. */
+/* DW_ADDR is always stored already as sect_offset; despite for the forms
+ besides DW_FORM_ref_addr it is stored as cu_offset in the DWARF file. */
-static gdb_index_symbol_kind
-symbol_kind (struct partial_symbol *psym)
+static int
+attr_form_is_ref (const struct attribute *attr)
{
- domain_enum domain = PSYMBOL_DOMAIN (psym);
- enum address_class aclass = PSYMBOL_CLASS (psym);
-
- switch (domain)
+ switch (attr->form)
{
- case VAR_DOMAIN:
- switch (aclass)
- {
- case LOC_BLOCK:
- return GDB_INDEX_SYMBOL_KIND_FUNCTION;
- case LOC_TYPEDEF:
- return GDB_INDEX_SYMBOL_KIND_TYPE;
- case LOC_COMPUTED:
- case LOC_CONST_BYTES:
- case LOC_OPTIMIZED_OUT:
- case LOC_STATIC:
- return GDB_INDEX_SYMBOL_KIND_VARIABLE;
- case LOC_CONST:
- /* Note: It's currently impossible to recognize psyms as enum values
- short of reading the type info. For now punt. */
- return GDB_INDEX_SYMBOL_KIND_VARIABLE;
- default:
- /* There are other LOC_FOO values that one might want to classify
- as variables, but dwarf2read.c doesn't currently use them. */
- return GDB_INDEX_SYMBOL_KIND_OTHER;
- }
- case STRUCT_DOMAIN:
- return GDB_INDEX_SYMBOL_KIND_TYPE;
+ case DW_FORM_ref_addr:
+ case DW_FORM_ref1:
+ case DW_FORM_ref2:
+ case DW_FORM_ref4:
+ case DW_FORM_ref8:
+ case DW_FORM_ref_udata:
+ case DW_FORM_GNU_ref_alt:
+ return 1;
default:
- return GDB_INDEX_SYMBOL_KIND_OTHER;
+ return 0;
}
}
-/* Add a list of partial symbols to SYMTAB. */
+/* Return the .debug_loc section to use for CU.
+ For DWO files use .debug_loc.dwo. */
-static void
-write_psymbols (struct mapped_symtab *symtab,
- std::unordered_set<partial_symbol *> &psyms_seen,
- struct partial_symbol **psymp,
- int count,
- offset_type cu_index,
- int is_static)
+static struct dwarf2_section_info *
+cu_debug_loc_section (struct dwarf2_cu *cu)
{
- for (; count-- > 0; ++psymp)
- {
- struct partial_symbol *psym = *psymp;
-
- if (SYMBOL_LANGUAGE (psym) == language_ada)
- error (_("Ada is not currently supported by the index"));
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
- /* Only add a given psymbol once. */
- if (psyms_seen.insert (psym).second)
- {
- gdb_index_symbol_kind kind = symbol_kind (psym);
-
- add_index_entry (symtab, SYMBOL_SEARCH_NAME (psym),
- is_static, kind, cu_index);
- }
+ if (cu->dwo_unit)
+ {
+ struct dwo_sections *sections = &cu->dwo_unit->dwo_file->sections;
+
+ return cu->header.version >= 5 ? §ions->loclists : §ions->loc;
}
+ return (cu->header.version >= 5 ? &dwarf2_per_objfile->loclists
+ : &dwarf2_per_objfile->loc);
}
-/* A helper struct used when iterating over debug_types. */
-struct signatured_type_index_data
-{
- signatured_type_index_data (data_buf &types_list_,
- std::unordered_set<partial_symbol *> &psyms_seen_)
- : types_list (types_list_), psyms_seen (psyms_seen_)
- {}
-
- struct objfile *objfile;
- struct mapped_symtab *symtab;
- data_buf &types_list;
- std::unordered_set<partial_symbol *> &psyms_seen;
- int cu_index;
-};
-
-/* A helper function that writes a single signatured_type to an
- obstack. */
-
-static int
-write_one_signatured_type (void **slot, void *d)
-{
- struct signatured_type_index_data *info
- = (struct signatured_type_index_data *) d;
- struct signatured_type *entry = (struct signatured_type *) *slot;
- struct partial_symtab *psymtab = entry->per_cu.v.psymtab;
-
- write_psymbols (info->symtab,
- info->psyms_seen,
- &info->objfile->global_psymbols[psymtab->globals_offset],
- psymtab->n_global_syms, info->cu_index,
- 0);
- write_psymbols (info->symtab,
- info->psyms_seen,
- &info->objfile->static_psymbols[psymtab->statics_offset],
- psymtab->n_static_syms, info->cu_index,
- 1);
-
- info->types_list.append_uint (8, BFD_ENDIAN_LITTLE,
- to_underlying (entry->per_cu.sect_off));
- info->types_list.append_uint (8, BFD_ENDIAN_LITTLE,
- to_underlying (entry->type_offset_in_tu));
- info->types_list.append_uint (8, BFD_ENDIAN_LITTLE, entry->signature);
-
- ++info->cu_index;
-
- return 1;
-}
-
-/* Recurse into all "included" dependencies and count their symbols as
- if they appeared in this psymtab. */
+/* A helper function that fills in a dwarf2_loclist_baton. */
static void
-recursively_count_psymbols (struct partial_symtab *psymtab,
- size_t &psyms_seen)
+fill_in_loclist_baton (struct dwarf2_cu *cu,
+ struct dwarf2_loclist_baton *baton,
+ const struct attribute *attr)
{
- for (int i = 0; i < psymtab->number_of_dependencies; ++i)
- if (psymtab->dependencies[i]->user != NULL)
- recursively_count_psymbols (psymtab->dependencies[i],
- psyms_seen);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct dwarf2_section_info *section = cu_debug_loc_section (cu);
- psyms_seen += psymtab->n_global_syms;
- psyms_seen += psymtab->n_static_syms;
-}
+ dwarf2_read_section (dwarf2_per_objfile->objfile, section);
-/* Recurse into all "included" dependencies and write their symbols as
- if they appeared in this psymtab. */
+ baton->per_cu = cu->per_cu;
+ gdb_assert (baton->per_cu);
+ /* We don't know how long the location list is, but make sure we
+ don't run off the edge of the section. */
+ baton->size = section->size - DW_UNSND (attr);
+ baton->data = section->buffer + DW_UNSND (attr);
+ baton->base_address = cu->base_address;
+ baton->from_dwo = cu->dwo_unit != NULL;
+}
static void
-recursively_write_psymbols (struct objfile *objfile,
- struct partial_symtab *psymtab,
- struct mapped_symtab *symtab,
- std::unordered_set<partial_symbol *> &psyms_seen,
- offset_type cu_index)
+dwarf2_symbol_mark_computed (const struct attribute *attr, struct symbol *sym,
+ struct dwarf2_cu *cu, int is_block)
{
- int i;
-
- for (i = 0; i < psymtab->number_of_dependencies; ++i)
- if (psymtab->dependencies[i]->user != NULL)
- recursively_write_psymbols (objfile, psymtab->dependencies[i],
- symtab, psyms_seen, cu_index);
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct dwarf2_section_info *section = cu_debug_loc_section (cu);
- write_psymbols (symtab,
- psyms_seen,
- &objfile->global_psymbols[psymtab->globals_offset],
- psymtab->n_global_syms, cu_index,
- 0);
- write_psymbols (symtab,
- psyms_seen,
- &objfile->static_psymbols[psymtab->statics_offset],
- psymtab->n_static_syms, cu_index,
- 1);
-}
+ if (attr_form_is_section_offset (attr)
+ /* .debug_loc{,.dwo} may not exist at all, or the offset may be outside
+ the section. If so, fall through to the complaint in the
+ other branch. */
+ && DW_UNSND (attr) < dwarf2_section_size (objfile, section))
+ {
+ struct dwarf2_loclist_baton *baton;
-/* Symbol name hashing function as specified by DWARF-5. */
+ baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_loclist_baton);
-static uint32_t
-dwarf5_djb_hash (const char *str_)
-{
- const unsigned char *str = (const unsigned char *) str_;
+ fill_in_loclist_baton (cu, baton, attr);
- /* Note: tolower here ignores UTF-8, which isn't fully compliant.
- See http://dwarfstd.org/ShowIssue.php?issue=161027.1. */
+ if (cu->base_known == 0)
+ complaint (_("Location list used without "
+ "specifying the CU base address."));
- uint32_t hash = 5381;
- while (int c = *str++)
- hash = hash * 33 + tolower (c);
- return hash;
-}
+ SYMBOL_ACLASS_INDEX (sym) = (is_block
+ ? dwarf2_loclist_block_index
+ : dwarf2_loclist_index);
+ SYMBOL_LOCATION_BATON (sym) = baton;
+ }
+ else
+ {
+ struct dwarf2_locexpr_baton *baton;
-/* DWARF-5 .debug_names builder. */
-class debug_names
-{
-public:
- debug_names (bool is_dwarf64, bfd_endian dwarf5_byte_order)
- : m_dwarf5_byte_order (dwarf5_byte_order),
- m_dwarf32 (dwarf5_byte_order),
- m_dwarf64 (dwarf5_byte_order),
- m_dwarf (is_dwarf64
- ? static_cast<dwarf &> (m_dwarf64)
- : static_cast<dwarf &> (m_dwarf32)),
- m_name_table_string_offs (m_dwarf.name_table_string_offs),
- m_name_table_entry_offs (m_dwarf.name_table_entry_offs)
- {}
+ baton = XOBNEW (&objfile->objfile_obstack, struct dwarf2_locexpr_baton);
+ baton->per_cu = cu->per_cu;
+ gdb_assert (baton->per_cu);
- /* Insert one symbol. */
- void insert (const partial_symbol *psym, int cu_index, bool is_static)
- {
- const int dwarf_tag = psymbol_tag (psym);
- if (dwarf_tag == 0)
- return;
- const char *const name = SYMBOL_SEARCH_NAME (psym);
- const auto insertpair
- = m_name_to_value_set.emplace (c_str_view (name),
- std::set<symbol_value> ());
- std::set<symbol_value> &value_set = insertpair.first->second;
- value_set.emplace (symbol_value (dwarf_tag, cu_index, is_static));
- }
+ 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
+ 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. */
+ 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;
+ }
- /* Build all the tables. All symbols must be already inserted.
- This function does not call file_write, caller has to do it
- afterwards. */
- void build ()
- {
- /* Verify the build method has not be called twice. */
- gdb_assert (m_abbrev_table.empty ());
- const size_t name_count = m_name_to_value_set.size ();
- m_bucket_table.resize
- (std::pow (2, std::ceil (std::log2 (name_count * 4 / 3))));
- m_hash_table.reserve (name_count);
- m_name_table_string_offs.reserve (name_count);
- m_name_table_entry_offs.reserve (name_count);
-
- /* Map each hash of symbol to its name and value. */
- struct hash_it_pair
- {
- uint32_t hash;
- decltype (m_name_to_value_set)::const_iterator it;
- };
- std::vector<std::forward_list<hash_it_pair>> bucket_hash;
- bucket_hash.resize (m_bucket_table.size ());
- for (decltype (m_name_to_value_set)::const_iterator it
- = m_name_to_value_set.cbegin ();
- it != m_name_to_value_set.cend ();
- ++it)
- {
- const char *const name = it->first.c_str ();
- const uint32_t hash = dwarf5_djb_hash (name);
- hash_it_pair hashitpair;
- hashitpair.hash = hash;
- hashitpair.it = it;
- auto &slot = bucket_hash[hash % bucket_hash.size()];
- slot.push_front (std::move (hashitpair));
- }
- for (size_t bucket_ix = 0; bucket_ix < bucket_hash.size (); ++bucket_ix)
- {
- const std::forward_list<hash_it_pair> &hashitlist
- = bucket_hash[bucket_ix];
- if (hashitlist.empty ())
- continue;
- uint32_t &bucket_slot = m_bucket_table[bucket_ix];
- /* The hashes array is indexed starting at 1. */
- store_unsigned_integer (reinterpret_cast<gdb_byte *> (&bucket_slot),
- sizeof (bucket_slot), m_dwarf5_byte_order,
- m_hash_table.size () + 1);
- for (const hash_it_pair &hashitpair : hashitlist)
- {
- m_hash_table.push_back (0);
- store_unsigned_integer (reinterpret_cast<gdb_byte *>
- (&m_hash_table.back ()),
- sizeof (m_hash_table.back ()),
- m_dwarf5_byte_order, hashitpair.hash);
- const c_str_view &name = hashitpair.it->first;
- const std::set<symbol_value> &value_set = hashitpair.it->second;
- m_name_table_string_offs.push_back_reorder
- (m_debugstrlookup.lookup (name.c_str ()));
- m_name_table_entry_offs.push_back_reorder (m_entry_pool.size ());
- gdb_assert (!value_set.empty ());
- for (const symbol_value &value : value_set)
- {
- int &idx = m_indexkey_to_idx[index_key (value.dwarf_tag,
- value.is_static)];
- if (idx == 0)
- {
- idx = m_idx_next++;
- m_abbrev_table.append_unsigned_leb128 (idx);
- m_abbrev_table.append_unsigned_leb128 (value.dwarf_tag);
- m_abbrev_table.append_unsigned_leb128 (DW_IDX_compile_unit);
- m_abbrev_table.append_unsigned_leb128 (DW_FORM_udata);
- m_abbrev_table.append_unsigned_leb128 (value.is_static
- ? DW_IDX_GNU_internal
- : DW_IDX_GNU_external);
- m_abbrev_table.append_unsigned_leb128 (DW_FORM_flag_present);
-
- /* Terminate attributes list. */
- m_abbrev_table.append_unsigned_leb128 (0);
- m_abbrev_table.append_unsigned_leb128 (0);
- }
+ SYMBOL_ACLASS_INDEX (sym) = (is_block
+ ? dwarf2_locexpr_block_index
+ : dwarf2_locexpr_index);
+ SYMBOL_LOCATION_BATON (sym) = baton;
+ }
+}
- m_entry_pool.append_unsigned_leb128 (idx);
- m_entry_pool.append_unsigned_leb128 (value.cu_index);
- }
+/* Return the OBJFILE associated with the compilation unit CU. If CU
+ came from a separate debuginfo file, then the master objfile is
+ returned. */
- /* Terminate the list of CUs. */
- m_entry_pool.append_unsigned_leb128 (0);
- }
- }
- gdb_assert (m_hash_table.size () == name_count);
+struct objfile *
+dwarf2_per_cu_objfile (struct dwarf2_per_cu_data *per_cu)
+{
+ struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
- /* Terminate tags list. */
- m_abbrev_table.append_unsigned_leb128 (0);
- }
+ /* Return the master objfile, so that we can report and look up the
+ correct file containing this variable. */
+ if (objfile->separate_debug_objfile_backlink)
+ objfile = objfile->separate_debug_objfile_backlink;
- /* Return .debug_names bucket count. This must be called only after
- calling the build method. */
- uint32_t bucket_count () const
- {
- /* Verify the build method has been already called. */
- gdb_assert (!m_abbrev_table.empty ());
- const uint32_t retval = m_bucket_table.size ();
+ return objfile;
+}
- /* Check for overflow. */
- gdb_assert (retval == m_bucket_table.size ());
- return retval;
- }
+/* Return comp_unit_head for PER_CU, either already available in PER_CU->CU
+ (CU_HEADERP is unused in such case) or prepare a temporary copy at
+ CU_HEADERP first. */
- /* Return .debug_names names count. This must be called only after
- calling the build method. */
- uint32_t name_count () const
- {
- /* Verify the build method has been already called. */
- gdb_assert (!m_abbrev_table.empty ());
- const uint32_t retval = m_hash_table.size ();
+static const struct comp_unit_head *
+per_cu_header_read_in (struct comp_unit_head *cu_headerp,
+ struct dwarf2_per_cu_data *per_cu)
+{
+ const gdb_byte *info_ptr;
- /* Check for overflow. */
- gdb_assert (retval == m_hash_table.size ());
- return retval;
- }
+ if (per_cu->cu)
+ return &per_cu->cu->header;
- /* Return number of bytes of .debug_names abbreviation table. This
- must be called only after calling the build method. */
- uint32_t abbrev_table_bytes () const
- {
- gdb_assert (!m_abbrev_table.empty ());
- return m_abbrev_table.size ();
- }
+ info_ptr = per_cu->section->buffer + to_underlying (per_cu->sect_off);
- /* Recurse into all "included" dependencies and store their symbols
- as if they appeared in this psymtab. */
- void recursively_write_psymbols
- (struct objfile *objfile,
- struct partial_symtab *psymtab,
- std::unordered_set<partial_symbol *> &psyms_seen,
- int cu_index)
- {
- for (int i = 0; i < psymtab->number_of_dependencies; ++i)
- if (psymtab->dependencies[i]->user != NULL)
- recursively_write_psymbols (objfile, psymtab->dependencies[i],
- psyms_seen, cu_index);
-
- write_psymbols (psyms_seen,
- &objfile->global_psymbols[psymtab->globals_offset],
- psymtab->n_global_syms, cu_index, false);
- write_psymbols (psyms_seen,
- &objfile->static_psymbols[psymtab->statics_offset],
- psymtab->n_static_syms, cu_index, true);
- }
+ memset (cu_headerp, 0, sizeof (*cu_headerp));
+ read_comp_unit_head (cu_headerp, info_ptr, per_cu->section,
+ rcuh_kind::COMPILE);
- /* Return number of bytes the .debug_names section will have. This
- must be called only after calling the build method. */
- size_t bytes () const
- {
- /* Verify the build method has been already called. */
- gdb_assert (!m_abbrev_table.empty ());
- size_t expected_bytes = 0;
- expected_bytes += m_bucket_table.size () * sizeof (m_bucket_table[0]);
- expected_bytes += m_hash_table.size () * sizeof (m_hash_table[0]);
- expected_bytes += m_name_table_string_offs.bytes ();
- expected_bytes += m_name_table_entry_offs.bytes ();
- expected_bytes += m_abbrev_table.size ();
- expected_bytes += m_entry_pool.size ();
- return expected_bytes;
- }
+ return cu_headerp;
+}
- /* Write .debug_names to FILE_NAMES and .debug_str addition to
- FILE_STR. This must be called only after calling the build
- method. */
- void file_write (FILE *file_names, FILE *file_str) const
- {
- /* Verify the build method has been already called. */
- gdb_assert (!m_abbrev_table.empty ());
- ::file_write (file_names, m_bucket_table);
- ::file_write (file_names, m_hash_table);
- m_name_table_string_offs.file_write (file_names);
- m_name_table_entry_offs.file_write (file_names);
- m_abbrev_table.file_write (file_names);
- m_entry_pool.file_write (file_names);
- m_debugstrlookup.file_write (file_str);
- }
+/* Return the address size given in the compilation unit header for CU. */
-private:
+int
+dwarf2_per_cu_addr_size (struct dwarf2_per_cu_data *per_cu)
+{
+ struct comp_unit_head cu_header_local;
+ const struct comp_unit_head *cu_headerp;
- /* Storage for symbol names mapping them to their .debug_str section
- offsets. */
- class debug_str_lookup
- {
- public:
+ cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
- /* Object costructor to be called for current DWARF2_PER_OBJFILE.
- All .debug_str section strings are automatically stored. */
- debug_str_lookup ()
- : m_abfd (dwarf2_per_objfile->objfile->obfd)
- {
- dwarf2_read_section (dwarf2_per_objfile->objfile,
- &dwarf2_per_objfile->str);
- if (dwarf2_per_objfile->str.buffer == NULL)
- return;
- for (const gdb_byte *data = dwarf2_per_objfile->str.buffer;
- data < (dwarf2_per_objfile->str.buffer
- + dwarf2_per_objfile->str.size);)
- {
- const char *const s = reinterpret_cast<const char *> (data);
- const auto insertpair
- = m_str_table.emplace (c_str_view (s),
- data - dwarf2_per_objfile->str.buffer);
- if (!insertpair.second)
- complaint (&symfile_complaints,
- _("Duplicate string \"%s\" in "
- ".debug_str section [in module %s]"),
- s, bfd_get_filename (m_abfd));
- data += strlen (s) + 1;
- }
- }
+ return cu_headerp->addr_size;
+}
- /* Return offset of symbol name S in the .debug_str section. Add
- such symbol to the section's end if it does not exist there
- yet. */
- size_t lookup (const char *s)
- {
- const auto it = m_str_table.find (c_str_view (s));
- if (it != m_str_table.end ())
- return it->second;
- const size_t offset = (dwarf2_per_objfile->str.size
- + m_str_add_buf.size ());
- m_str_table.emplace (c_str_view (s), offset);
- m_str_add_buf.append_cstr0 (s);
- return offset;
- }
+/* Return the offset size given in the compilation unit header for CU. */
- /* Append the end of the .debug_str section to FILE. */
- void file_write (FILE *file) const
- {
- m_str_add_buf.file_write (file);
- }
+int
+dwarf2_per_cu_offset_size (struct dwarf2_per_cu_data *per_cu)
+{
+ struct comp_unit_head cu_header_local;
+ const struct comp_unit_head *cu_headerp;
- private:
- std::unordered_map<c_str_view, size_t, c_str_view_hasher> m_str_table;
- bfd *const m_abfd;
+ cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
- /* Data to add at the end of .debug_str for new needed symbol names. */
- data_buf m_str_add_buf;
- };
+ return cu_headerp->offset_size;
+}
- /* Container to map used DWARF tags to their .debug_names abbreviation
- tags. */
- class index_key
- {
- public:
- index_key (int dwarf_tag_, bool is_static_)
- : dwarf_tag (dwarf_tag_), is_static (is_static_)
- {
- }
+/* See its dwarf2loc.h declaration. */
- bool
- operator== (const index_key &other) const
- {
- return dwarf_tag == other.dwarf_tag && is_static == other.is_static;
- }
+int
+dwarf2_per_cu_ref_addr_size (struct dwarf2_per_cu_data *per_cu)
+{
+ struct comp_unit_head cu_header_local;
+ const struct comp_unit_head *cu_headerp;
- const int dwarf_tag;
- const bool is_static;
- };
+ cu_headerp = per_cu_header_read_in (&cu_header_local, per_cu);
- /* Provide std::unordered_map::hasher for index_key. */
- class index_key_hasher
- {
- public:
- size_t
- operator () (const index_key &key) const
- {
- return (std::hash<int>() (key.dwarf_tag) << 1) | key.is_static;
- }
- };
+ if (cu_headerp->version == 2)
+ return cu_headerp->addr_size;
+ else
+ return cu_headerp->offset_size;
+}
- /* Parameters of one symbol entry. */
- class symbol_value
- {
- public:
- const int dwarf_tag, cu_index;
- const bool is_static;
-
- symbol_value (int dwarf_tag_, int cu_index_, bool is_static_)
- : dwarf_tag (dwarf_tag_), cu_index (cu_index_), is_static (is_static_)
- {}
-
- bool
- operator< (const symbol_value &other) const
- {
-#define X(n) \
- do \
- { \
- if (n < other.n) \
- return true; \
- if (n > other.n) \
- return false; \
- } \
- while (0)
- X (dwarf_tag);
- X (is_static);
- X (cu_index);
-#undef X
- return false;
- }
- };
+/* Return the text offset of the CU. The returned offset comes from
+ this CU's objfile. If this objfile came from a separate debuginfo
+ file, then the offset may be different from the corresponding
+ offset in the parent objfile. */
- /* Abstract base class to unify DWARF-32 and DWARF-64 name table
- output. */
- class offset_vec
- {
- protected:
- const bfd_endian dwarf5_byte_order;
- public:
- explicit offset_vec (bfd_endian dwarf5_byte_order_)
- : dwarf5_byte_order (dwarf5_byte_order_)
- {}
+CORE_ADDR
+dwarf2_per_cu_text_offset (struct dwarf2_per_cu_data *per_cu)
+{
+ struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
- /* Call std::vector::reserve for NELEM elements. */
- virtual void reserve (size_t nelem) = 0;
+ return ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+}
- /* Call std::vector::push_back with store_unsigned_integer byte
- reordering for ELEM. */
- virtual void push_back_reorder (size_t elem) = 0;
+/* Return DWARF version number of PER_CU. */
- /* Return expected output size in bytes. */
- virtual size_t bytes () const = 0;
+short
+dwarf2_version (struct dwarf2_per_cu_data *per_cu)
+{
+ return per_cu->dwarf_version;
+}
- /* Write name table to FILE. */
- virtual void file_write (FILE *file) const = 0;
- };
+/* Locate the .debug_info compilation unit from CU's objfile which contains
+ the DIE at OFFSET. Raises an error on failure. */
- /* Template to unify DWARF-32 and DWARF-64 output. */
- template<typename OffsetSize>
- class offset_vec_tmpl : public offset_vec
- {
- public:
- explicit offset_vec_tmpl (bfd_endian dwarf5_byte_order_)
- : offset_vec (dwarf5_byte_order_)
- {}
+static struct dwarf2_per_cu_data *
+dwarf2_find_containing_comp_unit (sect_offset sect_off,
+ unsigned int offset_in_dwz,
+ struct dwarf2_per_objfile *dwarf2_per_objfile)
+{
+ struct dwarf2_per_cu_data *this_cu;
+ int low, high;
+ const sect_offset *cu_off;
- /* Implement offset_vec::reserve. */
- void reserve (size_t nelem) override
+ low = 0;
+ high = dwarf2_per_objfile->all_comp_units.size () - 1;
+ while (high > low)
{
- m_vec.reserve (nelem);
- }
+ struct dwarf2_per_cu_data *mid_cu;
+ int mid = low + (high - low) / 2;
- /* Implement offset_vec::push_back_reorder. */
- void push_back_reorder (size_t elem) override
- {
- m_vec.push_back (elem);
- /* Check for overflow. */
- gdb_assert (m_vec.back () == elem);
- store_unsigned_integer (reinterpret_cast<gdb_byte *> (&m_vec.back ()),
- sizeof (m_vec.back ()), dwarf5_byte_order, elem);
+ mid_cu = dwarf2_per_objfile->all_comp_units[mid];
+ cu_off = &mid_cu->sect_off;
+ if (mid_cu->is_dwz > offset_in_dwz
+ || (mid_cu->is_dwz == offset_in_dwz && *cu_off >= sect_off))
+ high = mid;
+ else
+ low = mid + 1;
}
-
- /* Implement offset_vec::bytes. */
- size_t bytes () const override
+ gdb_assert (low == high);
+ this_cu = dwarf2_per_objfile->all_comp_units[low];
+ cu_off = &this_cu->sect_off;
+ if (this_cu->is_dwz != offset_in_dwz || *cu_off > sect_off)
{
- return m_vec.size () * sizeof (m_vec[0]);
- }
+ if (low == 0 || this_cu->is_dwz != offset_in_dwz)
+ error (_("Dwarf Error: could not find partial DIE containing "
+ "offset %s [in module %s]"),
+ sect_offset_str (sect_off),
+ bfd_get_filename (dwarf2_per_objfile->objfile->obfd));
- /* Implement offset_vec::file_write. */
- void file_write (FILE *file) const override
- {
- ::file_write (file, m_vec);
+ gdb_assert (dwarf2_per_objfile->all_comp_units[low-1]->sect_off
+ <= sect_off);
+ return dwarf2_per_objfile->all_comp_units[low-1];
}
-
- private:
- std::vector<OffsetSize> m_vec;
- };
-
- /* Base class to unify DWARF-32 and DWARF-64 .debug_names output
- respecting name table width. */
- class dwarf
- {
- public:
- offset_vec &name_table_string_offs, &name_table_entry_offs;
-
- dwarf (offset_vec &name_table_string_offs_,
- offset_vec &name_table_entry_offs_)
- : name_table_string_offs (name_table_string_offs_),
- name_table_entry_offs (name_table_entry_offs_)
+ else
{
+ this_cu = dwarf2_per_objfile->all_comp_units[low];
+ if (low == dwarf2_per_objfile->all_comp_units.size () - 1
+ && sect_off >= this_cu->sect_off + this_cu->length)
+ error (_("invalid dwarf2 offset %s"), sect_offset_str (sect_off));
+ gdb_assert (sect_off < this_cu->sect_off + this_cu->length);
+ return this_cu;
}
- };
-
- /* Template to unify DWARF-32 and DWARF-64 .debug_names output
- respecting name table width. */
- template<typename OffsetSize>
- class dwarf_tmpl : public dwarf
- {
- public:
- explicit dwarf_tmpl (bfd_endian dwarf5_byte_order_)
- : dwarf (m_name_table_string_offs, m_name_table_entry_offs),
- m_name_table_string_offs (dwarf5_byte_order_),
- m_name_table_entry_offs (dwarf5_byte_order_)
- {}
-
- private:
- offset_vec_tmpl<OffsetSize> m_name_table_string_offs;
- offset_vec_tmpl<OffsetSize> m_name_table_entry_offs;
- };
-
- /* Try to reconstruct original DWARF tag for given partial_symbol.
- This function is not DWARF-5 compliant but it is sufficient for
- GDB as a DWARF-5 index consumer. */
- static int psymbol_tag (const struct partial_symbol *psym)
- {
- domain_enum domain = PSYMBOL_DOMAIN (psym);
- enum address_class aclass = PSYMBOL_CLASS (psym);
-
- switch (domain)
- {
- case VAR_DOMAIN:
- switch (aclass)
- {
- case LOC_BLOCK:
- return DW_TAG_subprogram;
- case LOC_TYPEDEF:
- return DW_TAG_typedef;
- case LOC_COMPUTED:
- case LOC_CONST_BYTES:
- case LOC_OPTIMIZED_OUT:
- case LOC_STATIC:
- return DW_TAG_variable;
- case LOC_CONST:
- /* Note: It's currently impossible to recognize psyms as enum values
- short of reading the type info. For now punt. */
- return DW_TAG_variable;
- default:
- /* There are other LOC_FOO values that one might want to classify
- as variables, but dwarf2read.c doesn't currently use them. */
- return DW_TAG_variable;
- }
- case STRUCT_DOMAIN:
- return DW_TAG_structure_type;
- default:
- return 0;
- }
- }
-
- /* Call insert for all partial symbols and mark them in PSYMS_SEEN. */
- void write_psymbols (std::unordered_set<partial_symbol *> &psyms_seen,
- struct partial_symbol **psymp, int count, int cu_index,
- bool is_static)
- {
- for (; count-- > 0; ++psymp)
- {
- struct partial_symbol *psym = *psymp;
-
- if (SYMBOL_LANGUAGE (psym) == language_ada)
- error (_("Ada is not currently supported by the index"));
+}
- /* Only add a given psymbol once. */
- if (psyms_seen.insert (psym).second)
- insert (psym, cu_index, is_static);
- }
- }
+/* Initialize dwarf2_cu CU, owned by PER_CU. */
- /* Store value of each symbol. */
- std::unordered_map<c_str_view, std::set<symbol_value>, c_str_view_hasher>
- m_name_to_value_set;
+dwarf2_cu::dwarf2_cu (struct dwarf2_per_cu_data *per_cu_)
+ : per_cu (per_cu_),
+ mark (0),
+ has_loclist (0),
+ checked_producer (0),
+ producer_is_gxx_lt_4_6 (0),
+ producer_is_gcc_lt_4_3 (0),
+ producer_is_icc_lt_14 (0),
+ processing_has_namespace_info (0)
+{
+ per_cu->cu = this;
+}
- /* Tables of DWARF-5 .debug_names. They are in object file byte
- order. */
- std::vector<uint32_t> m_bucket_table;
- std::vector<uint32_t> m_hash_table;
+/* Destroy a dwarf2_cu. */
- const bfd_endian m_dwarf5_byte_order;
- dwarf_tmpl<uint32_t> m_dwarf32;
- dwarf_tmpl<uint64_t> m_dwarf64;
- dwarf &m_dwarf;
- offset_vec &m_name_table_string_offs, &m_name_table_entry_offs;
- debug_str_lookup m_debugstrlookup;
+dwarf2_cu::~dwarf2_cu ()
+{
+ per_cu->cu = NULL;
+}
- /* Map each used .debug_names abbreviation tag parameter to its
- index value. */
- std::unordered_map<index_key, int, index_key_hasher> m_indexkey_to_idx;
+/* Initialize basic fields of dwarf_cu CU according to DIE COMP_UNIT_DIE. */
- /* Next unused .debug_names abbreviation tag for
- m_indexkey_to_idx. */
- int m_idx_next = 1;
+static void
+prepare_one_comp_unit (struct dwarf2_cu *cu, struct die_info *comp_unit_die,
+ enum language pretend_language)
+{
+ struct attribute *attr;
- /* .debug_names abbreviation table. */
- data_buf m_abbrev_table;
+ /* Set the language we're debugging. */
+ attr = dwarf2_attr (comp_unit_die, DW_AT_language, cu);
+ if (attr)
+ set_cu_language (DW_UNSND (attr), cu);
+ else
+ {
+ cu->language = pretend_language;
+ cu->language_defn = language_def (cu->language);
+ }
- /* .debug_names entry pool. */
- data_buf m_entry_pool;
-};
+ cu->producer = dwarf2_string_attr (comp_unit_die, DW_AT_producer, cu);
+}
-/* Return iff any of the needed offsets does not fit into 32-bit
- .debug_names section. */
+/* Increase the age counter on each cached compilation unit, and free
+ any that are too old. */
-static bool
-check_dwarf64_offsets ()
+static void
+age_cached_comp_units (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
- {
- const dwarf2_per_cu_data &per_cu = *dwarf2_per_objfile->all_comp_units[i];
+ struct dwarf2_per_cu_data *per_cu, **last_chain;
- if (to_underlying (per_cu.sect_off) >= (static_cast<uint64_t> (1) << 32))
- return true;
- }
- for (int i = 0; i < dwarf2_per_objfile->n_type_units; ++i)
+ dwarf2_clear_marks (dwarf2_per_objfile->read_in_chain);
+ per_cu = dwarf2_per_objfile->read_in_chain;
+ while (per_cu != NULL)
{
- const signatured_type &sigtype = *dwarf2_per_objfile->all_type_units[i];
- const dwarf2_per_cu_data &per_cu = sigtype.per_cu;
-
- if (to_underlying (per_cu.sect_off) >= (static_cast<uint64_t> (1) << 32))
- return true;
+ per_cu->cu->last_used ++;
+ if (per_cu->cu->last_used <= dwarf_max_cache_age)
+ dwarf2_mark (per_cu->cu);
+ per_cu = per_cu->cu->read_in_chain;
}
- return false;
-}
-/* The psyms_seen set is potentially going to be largish (~40k
- elements when indexing a -g3 build of GDB itself). Estimate the
- number of elements in order to avoid too many rehashes, which
- require rebuilding buckets and thus many trips to
- malloc/free. */
-
-static size_t
-psyms_seen_size ()
-{
- size_t psyms_count = 0;
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ per_cu = dwarf2_per_objfile->read_in_chain;
+ last_chain = &dwarf2_per_objfile->read_in_chain;
+ while (per_cu != NULL)
{
- struct dwarf2_per_cu_data *per_cu
- = dwarf2_per_objfile->all_comp_units[i];
- struct partial_symtab *psymtab = per_cu->v.psymtab;
+ struct dwarf2_per_cu_data *next_cu;
+
+ next_cu = per_cu->cu->read_in_chain;
+
+ if (!per_cu->cu->mark)
+ {
+ delete per_cu->cu;
+ *last_chain = next_cu;
+ }
+ else
+ last_chain = &per_cu->cu->read_in_chain;
- if (psymtab != NULL && psymtab->user == NULL)
- recursively_count_psymbols (psymtab, psyms_count);
+ per_cu = next_cu;
}
- /* Generating an index for gdb itself shows a ratio of
- TOTAL_SEEN_SYMS/UNIQUE_SYMS or ~5. 4 seems like a good bet. */
- return psyms_count / 4;
}
-/* Write new .gdb_index section for OBJFILE into OUT_FILE.
- Return how many bytes were expected to be written into OUT_FILE. */
+/* Remove a single compilation unit from the cache. */
-static size_t
-write_gdbindex (struct objfile *objfile, FILE *out_file)
+static void
+free_one_cached_comp_unit (struct dwarf2_per_cu_data *target_per_cu)
{
- mapped_symtab symtab;
- data_buf cu_list;
-
- /* While we're scanning CU's create a table that maps a psymtab pointer
- (which is what addrmap records) to its index (which is what is recorded
- in the index file). This will later be needed to write the address
- table. */
- psym_index_map cu_index_htab;
- cu_index_htab.reserve (dwarf2_per_objfile->n_comp_units);
-
- /* The CU list is already sorted, so we don't need to do additional
- work here. Also, the debug_types entries do not appear in
- all_comp_units, but only in their own hash table. */
+ struct dwarf2_per_cu_data *per_cu, **last_chain;
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = target_per_cu->dwarf2_per_objfile;
- std::unordered_set<partial_symbol *> psyms_seen (psyms_seen_size ());
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
+ per_cu = dwarf2_per_objfile->read_in_chain;
+ last_chain = &dwarf2_per_objfile->read_in_chain;
+ while (per_cu != NULL)
{
- struct dwarf2_per_cu_data *per_cu
- = dwarf2_per_objfile->all_comp_units[i];
- struct partial_symtab *psymtab = per_cu->v.psymtab;
-
- /* CU of a shared file from 'dwz -m' may be unused by this main file.
- It may be referenced from a local scope but in such case it does not
- need to be present in .gdb_index. */
- if (psymtab == NULL)
- continue;
+ struct dwarf2_per_cu_data *next_cu;
- if (psymtab->user == NULL)
- recursively_write_psymbols (objfile, psymtab, &symtab,
- psyms_seen, i);
+ next_cu = per_cu->cu->read_in_chain;
- const auto insertpair = cu_index_htab.emplace (psymtab, i);
- gdb_assert (insertpair.second);
+ if (per_cu == target_per_cu)
+ {
+ delete per_cu->cu;
+ per_cu->cu = NULL;
+ *last_chain = next_cu;
+ break;
+ }
+ else
+ last_chain = &per_cu->cu->read_in_chain;
- cu_list.append_uint (8, BFD_ENDIAN_LITTLE,
- to_underlying (per_cu->sect_off));
- cu_list.append_uint (8, BFD_ENDIAN_LITTLE, per_cu->length);
+ per_cu = next_cu;
}
+}
- /* Dump the address map. */
- data_buf addr_vec;
- write_address_map (objfile, addr_vec, cu_index_htab);
+/* Release all extra memory associated with OBJFILE. */
- /* Write out the .debug_type entries, if any. */
- data_buf types_cu_list;
- if (dwarf2_per_objfile->signatured_types)
- {
- signatured_type_index_data sig_data (types_cu_list,
- psyms_seen);
+void
+dwarf2_free_objfile (struct objfile *objfile)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = get_dwarf2_per_objfile (objfile);
- sig_data.objfile = objfile;
- sig_data.symtab = &symtab;
- sig_data.cu_index = dwarf2_per_objfile->n_comp_units;
- htab_traverse_noresize (dwarf2_per_objfile->signatured_types,
- write_one_signatured_type, &sig_data);
- }
+ delete dwarf2_per_objfile;
+}
- /* Now that we've processed all symbols we can shrink their cu_indices
- lists. */
- uniquify_cu_indices (&symtab);
+/* A set of CU "per_cu" pointer, DIE offset, and GDB type pointer.
+ We store these in a hash table separate from the DIEs, and preserve them
+ when the DIEs are flushed out of cache.
- data_buf symtab_vec, constant_pool;
- write_hash_table (&symtab, symtab_vec, constant_pool);
+ The CU "per_cu" pointer is needed because offset alone is not enough to
+ uniquely identify the type. A file may have multiple .debug_types sections,
+ or the type may come from a DWO file. Furthermore, while it's more logical
+ to use per_cu->section+offset, with Fission the section with the data is in
+ the DWO file but we don't know that section at the point we need it.
+ We have to use something in dwarf2_per_cu_data (or the pointer to it)
+ because we can enter the lookup routine, get_die_type_at_offset, from
+ outside this file, and thus won't necessarily have PER_CU->cu.
+ Fortunately, PER_CU is stable for the life of the objfile. */
- data_buf contents;
- const offset_type size_of_contents = 6 * sizeof (offset_type);
- offset_type total_len = size_of_contents;
+struct dwarf2_per_cu_offset_and_type
+{
+ const struct dwarf2_per_cu_data *per_cu;
+ sect_offset sect_off;
+ struct type *type;
+};
- /* The version number. */
- contents.append_data (MAYBE_SWAP (8));
+/* Hash function for a dwarf2_per_cu_offset_and_type. */
- /* The offset of the CU list from the start of the file. */
- contents.append_data (MAYBE_SWAP (total_len));
- total_len += cu_list.size ();
+static hashval_t
+per_cu_offset_and_type_hash (const void *item)
+{
+ const struct dwarf2_per_cu_offset_and_type *ofs
+ = (const struct dwarf2_per_cu_offset_and_type *) item;
- /* The offset of the types CU list from the start of the file. */
- contents.append_data (MAYBE_SWAP (total_len));
- total_len += types_cu_list.size ();
+ return (uintptr_t) ofs->per_cu + to_underlying (ofs->sect_off);
+}
- /* The offset of the address table from the start of the file. */
- contents.append_data (MAYBE_SWAP (total_len));
- total_len += addr_vec.size ();
+/* Equality function for a dwarf2_per_cu_offset_and_type. */
- /* The offset of the symbol table from the start of the file. */
- contents.append_data (MAYBE_SWAP (total_len));
- total_len += symtab_vec.size ();
+static int
+per_cu_offset_and_type_eq (const void *item_lhs, const void *item_rhs)
+{
+ const struct dwarf2_per_cu_offset_and_type *ofs_lhs
+ = (const struct dwarf2_per_cu_offset_and_type *) item_lhs;
+ const struct dwarf2_per_cu_offset_and_type *ofs_rhs
+ = (const struct dwarf2_per_cu_offset_and_type *) item_rhs;
- /* The offset of the constant pool from the start of the file. */
- contents.append_data (MAYBE_SWAP (total_len));
- total_len += constant_pool.size ();
+ return (ofs_lhs->per_cu == ofs_rhs->per_cu
+ && ofs_lhs->sect_off == ofs_rhs->sect_off);
+}
- gdb_assert (contents.size () == size_of_contents);
+/* Set the type associated with DIE to TYPE. Save it in CU's hash
+ table if necessary. For convenience, return TYPE.
- contents.file_write (out_file);
- cu_list.file_write (out_file);
- types_cu_list.file_write (out_file);
- addr_vec.file_write (out_file);
- symtab_vec.file_write (out_file);
- constant_pool.file_write (out_file);
+ The DIEs reading must have careful ordering to:
+ * Not cause infite loops trying to read in DIEs as a prerequisite for
+ reading current DIE.
+ * Not trying to dereference contents of still incompletely read in types
+ while reading in other DIEs.
+ * Enable referencing still incompletely read in types just by a pointer to
+ the type without accessing its fields.
- return total_len;
-}
+ Therefore caller should follow these rules:
+ * Try to fetch any prerequisite types we may need to build this DIE type
+ before building the type and calling set_die_type.
+ * After building type call set_die_type for current DIE as soon as
+ possible before fetching more types to complete the current type.
+ * Make the type as complete as possible before fetching more types. */
-/* DWARF-5 augmentation string for GDB's DW_IDX_GNU_* extension. */
-static const gdb_byte dwarf5_gdb_augmentation[] = { 'G', 'D', 'B', 0 };
-
-/* Write a new .debug_names section for OBJFILE into OUT_FILE, write
- needed addition to .debug_str section to OUT_FILE_STR. Return how
- many bytes were expected to be written into OUT_FILE. */
-
-static size_t
-write_debug_names (struct objfile *objfile, FILE *out_file, FILE *out_file_str)
-{
- const bool dwarf5_is_dwarf64 = check_dwarf64_offsets ();
- const int dwarf5_offset_size = dwarf5_is_dwarf64 ? 8 : 4;
- const enum bfd_endian dwarf5_byte_order
- = gdbarch_byte_order (get_objfile_arch (objfile));
-
- /* The CU list is already sorted, so we don't need to do additional
- work here. Also, the debug_types entries do not appear in
- all_comp_units, but only in their own hash table. */
- data_buf cu_list;
- debug_names nametable (dwarf5_is_dwarf64, dwarf5_byte_order);
- std::unordered_set<partial_symbol *> psyms_seen (psyms_seen_size ());
- for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i)
- {
- const dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->all_comp_units[i];
- partial_symtab *psymtab = per_cu->v.psymtab;
-
- /* CU of a shared file from 'dwz -m' may be unused by this main
- file. It may be referenced from a local scope but in such
- case it does not need to be present in .debug_names. */
- if (psymtab == NULL)
- continue;
+static struct type *
+set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+{
+ struct dwarf2_per_objfile *dwarf2_per_objfile
+ = cu->per_cu->dwarf2_per_objfile;
+ struct dwarf2_per_cu_offset_and_type **slot, ofs;
+ struct objfile *objfile = dwarf2_per_objfile->objfile;
+ struct attribute *attr;
+ struct dynamic_prop prop;
- if (psymtab->user == NULL)
- nametable.recursively_write_psymbols (objfile, psymtab, psyms_seen, i);
+ /* For Ada types, make sure that the gnat-specific data is always
+ initialized (if not already set). There are a few types where
+ we should not be doing so, because the type-specific area is
+ already used to hold some other piece of info (eg: TYPE_CODE_FLT
+ where the type-specific area is used to store the floatformat).
+ But this is not a problem, because the gnat-specific information
+ is actually not needed for these types. */
+ if (need_gnat_info (cu)
+ && TYPE_CODE (type) != TYPE_CODE_FUNC
+ && TYPE_CODE (type) != TYPE_CODE_FLT
+ && TYPE_CODE (type) != TYPE_CODE_METHODPTR
+ && TYPE_CODE (type) != TYPE_CODE_MEMBERPTR
+ && TYPE_CODE (type) != TYPE_CODE_METHOD
+ && !HAVE_GNAT_AUX_INFO (type))
+ INIT_GNAT_SPECIFIC (type);
- cu_list.append_uint (dwarf5_offset_size, dwarf5_byte_order,
- to_underlying (per_cu->sect_off));
+ /* Read DW_AT_allocated and set in type. */
+ attr = dwarf2_attr (die, DW_AT_allocated, cu);
+ if (attr_form_is_block (attr))
+ {
+ if (attr_to_dynamic_prop (attr, die, cu, &prop))
+ add_dyn_prop (DYN_PROP_ALLOCATED, prop, type);
}
- nametable.build ();
-
- /* No addr_vec - DWARF-5 uses .debug_aranges generated by GCC. */
-
- data_buf types_cu_list;
- for (int i = 0; i < dwarf2_per_objfile->n_type_units; ++i)
+ else if (attr != NULL)
{
- const signatured_type &sigtype = *dwarf2_per_objfile->all_type_units[i];
- const dwarf2_per_cu_data &per_cu = sigtype.per_cu;
-
- types_cu_list.append_uint (dwarf5_offset_size, dwarf5_byte_order,
- to_underlying (per_cu.sect_off));
+ complaint (_("DW_AT_allocated has the wrong form (%s) at DIE %s"),
+ (attr != NULL ? dwarf_form_name (attr->form) : "n/a"),
+ sect_offset_str (die->sect_off));
}
- const offset_type bytes_of_header
- = ((dwarf5_is_dwarf64 ? 12 : 4)
- + 2 + 2 + 7 * 4
- + sizeof (dwarf5_gdb_augmentation));
- size_t expected_bytes = 0;
- expected_bytes += bytes_of_header;
- expected_bytes += cu_list.size ();
- expected_bytes += types_cu_list.size ();
- expected_bytes += nametable.bytes ();
- data_buf header;
-
- if (!dwarf5_is_dwarf64)
+ /* Read DW_AT_associated and set in type. */
+ attr = dwarf2_attr (die, DW_AT_associated, cu);
+ if (attr_form_is_block (attr))
{
- const uint64_t size64 = expected_bytes - 4;
- gdb_assert (size64 < 0xfffffff0);
- header.append_uint (4, dwarf5_byte_order, size64);
+ if (attr_to_dynamic_prop (attr, die, cu, &prop))
+ add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type);
}
- else
+ else if (attr != NULL)
{
- header.append_uint (4, dwarf5_byte_order, 0xffffffff);
- header.append_uint (8, dwarf5_byte_order, expected_bytes - 12);
+ complaint (_("DW_AT_associated has the wrong form (%s) at DIE %s"),
+ (attr != NULL ? dwarf_form_name (attr->form) : "n/a"),
+ sect_offset_str (die->sect_off));
}
- /* The version number. */
- header.append_uint (2, dwarf5_byte_order, 5);
-
- /* Padding. */
- header.append_uint (2, dwarf5_byte_order, 0);
-
- /* comp_unit_count - The number of CUs in the CU list. */
- header.append_uint (4, dwarf5_byte_order, dwarf2_per_objfile->n_comp_units);
-
- /* local_type_unit_count - The number of TUs in the local TU
- list. */
- header.append_uint (4, dwarf5_byte_order, dwarf2_per_objfile->n_type_units);
+ /* Read DW_AT_data_location and set in type. */
+ attr = dwarf2_attr (die, DW_AT_data_location, cu);
+ if (attr_to_dynamic_prop (attr, die, cu, &prop))
+ add_dyn_prop (DYN_PROP_DATA_LOCATION, prop, type);
- /* foreign_type_unit_count - The number of TUs in the foreign TU
- list. */
- header.append_uint (4, dwarf5_byte_order, 0);
+ if (dwarf2_per_objfile->die_type_hash == NULL)
+ {
+ dwarf2_per_objfile->die_type_hash =
+ htab_create_alloc_ex (127,
+ per_cu_offset_and_type_hash,
+ per_cu_offset_and_type_eq,
+ NULL,
+ &objfile->objfile_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
+ }
- /* bucket_count - The number of hash buckets in the hash lookup
- table. */
- header.append_uint (4, dwarf5_byte_order, nametable.bucket_count ());
+ ofs.per_cu = cu->per_cu;
+ ofs.sect_off = die->sect_off;
+ ofs.type = type;
+ slot = (struct dwarf2_per_cu_offset_and_type **)
+ htab_find_slot (dwarf2_per_objfile->die_type_hash, &ofs, INSERT);
+ if (*slot)
+ complaint (_("A problem internal to GDB: DIE %s has type already set"),
+ sect_offset_str (die->sect_off));
+ *slot = XOBNEW (&objfile->objfile_obstack,
+ struct dwarf2_per_cu_offset_and_type);
+ **slot = ofs;
+ return type;
+}
- /* name_count - The number of unique names in the index. */
- header.append_uint (4, dwarf5_byte_order, nametable.name_count ());
+/* Look up the type for the die at SECT_OFF in PER_CU in die_type_hash,
+ or return NULL if the die does not have a saved type. */
- /* abbrev_table_size - The size in bytes of the abbreviations
- table. */
- header.append_uint (4, dwarf5_byte_order, nametable.abbrev_table_bytes ());
+static struct type *
+get_die_type_at_offset (sect_offset sect_off,
+ struct dwarf2_per_cu_data *per_cu)
+{
+ struct dwarf2_per_cu_offset_and_type *slot, ofs;
+ struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile;
- /* augmentation_string_size - The size in bytes of the augmentation
- string. This value is rounded up to a multiple of 4. */
- static_assert (sizeof (dwarf5_gdb_augmentation) % 4 == 0, "");
- header.append_uint (4, dwarf5_byte_order, sizeof (dwarf5_gdb_augmentation));
- header.append_data (dwarf5_gdb_augmentation);
+ if (dwarf2_per_objfile->die_type_hash == NULL)
+ return NULL;
- gdb_assert (header.size () == bytes_of_header);
+ ofs.per_cu = per_cu;
+ ofs.sect_off = sect_off;
+ slot = ((struct dwarf2_per_cu_offset_and_type *)
+ htab_find (dwarf2_per_objfile->die_type_hash, &ofs));
+ if (slot)
+ return slot->type;
+ else
+ return NULL;
+}
- header.file_write (out_file);
- cu_list.file_write (out_file);
- types_cu_list.file_write (out_file);
- nametable.file_write (out_file, out_file_str);
+/* Look up the type for DIE in CU in die_type_hash,
+ or return NULL if DIE does not have a saved type. */
- return expected_bytes;
+static struct type *
+get_die_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ return get_die_type_at_offset (die->sect_off, cu->per_cu);
}
-/* Assert that FILE's size is EXPECTED_SIZE. Assumes file's seek
- position is at the end of the file. */
+/* Add a dependence relationship from CU to REF_PER_CU. */
static void
-assert_file_size (FILE *file, const char *filename, size_t expected_size)
+dwarf2_add_dependence (struct dwarf2_cu *cu,
+ struct dwarf2_per_cu_data *ref_per_cu)
{
- const auto file_size = ftell (file);
- if (file_size == -1)
- error (_("Can't get `%s' size"), filename);
- gdb_assert (file_size == expected_size);
-}
+ void **slot;
-/* An index variant. */
-enum dw_index_kind
-{
- /* GDB's own .gdb_index format. */
- GDB_INDEX,
+ if (cu->dependencies == NULL)
+ cu->dependencies
+ = htab_create_alloc_ex (5, htab_hash_pointer, htab_eq_pointer,
+ NULL, &cu->comp_unit_obstack,
+ hashtab_obstack_allocate,
+ dummy_obstack_deallocate);
- /* DWARF5 .debug_names. */
- DEBUG_NAMES,
-};
+ slot = htab_find_slot (cu->dependencies, ref_per_cu, INSERT);
+ if (*slot == NULL)
+ *slot = ref_per_cu;
+}
-/* Create an index file for OBJFILE in the directory DIR. */
+/* Subroutine of dwarf2_mark to pass to htab_traverse.
+ Set the mark field in every compilation unit in the
+ cache that we must keep because we are keeping CU. */
-static void
-write_psymtabs_to_index (struct objfile *objfile, const char *dir,
- dw_index_kind index_kind)
+static int
+dwarf2_mark_helper (void **slot, void *data)
{
- if (dwarf2_per_objfile->using_index)
- error (_("Cannot use an index to create the index"));
+ struct dwarf2_per_cu_data *per_cu;
- if (VEC_length (dwarf2_section_info_def, dwarf2_per_objfile->types) > 1)
- error (_("Cannot make an index when the file has multiple .debug_types sections"));
+ per_cu = (struct dwarf2_per_cu_data *) *slot;
- if (!objfile->psymtabs || !objfile->psymtabs_addrmap)
- return;
+ /* cu->dependencies references may not yet have been ever read if QUIT aborts
+ reading of the chain. As such dependencies remain valid it is not much
+ useful to track and undo them during QUIT cleanups. */
+ if (per_cu->cu == NULL)
+ return 1;
- struct stat st;
- if (stat (objfile_name (objfile), &st) < 0)
- perror_with_name (objfile_name (objfile));
-
- std::string filename (std::string (dir) + SLASH_STRING
- + lbasename (objfile_name (objfile))
- + (index_kind == dw_index_kind::DEBUG_NAMES
- ? INDEX5_SUFFIX : INDEX4_SUFFIX));
-
- FILE *out_file = gdb_fopen_cloexec (filename.c_str (), "wb").release ();
- if (!out_file)
- error (_("Can't open `%s' for writing"), filename.c_str ());
-
- /* Order matters here; we want FILE to be closed before FILENAME is
- unlinked, because on MS-Windows one cannot delete a file that is
- still open. (Don't call anything here that might throw until
- file_closer is created.) */
- gdb::unlinker unlink_file (filename.c_str ());
- gdb_file_up close_out_file (out_file);
-
- if (index_kind == dw_index_kind::DEBUG_NAMES)
- {
- std::string filename_str (std::string (dir) + SLASH_STRING
- + lbasename (objfile_name (objfile))
- + DEBUG_STR_SUFFIX);
- FILE *out_file_str
- = gdb_fopen_cloexec (filename_str.c_str (), "wb").release ();
- if (!out_file_str)
- error (_("Can't open `%s' for writing"), filename_str.c_str ());
- gdb::unlinker unlink_file_str (filename_str.c_str ());
- gdb_file_up close_out_file_str (out_file_str);
-
- const size_t total_len
- = write_debug_names (objfile, out_file, out_file_str);
- assert_file_size (out_file, filename.c_str (), total_len);
-
- /* We want to keep the file .debug_str file too. */
- unlink_file_str.keep ();
- }
- else
- {
- const size_t total_len
- = write_gdbindex (objfile, out_file);
- assert_file_size (out_file, filename.c_str (), total_len);
- }
+ if (per_cu->cu->mark)
+ return 1;
+ per_cu->cu->mark = 1;
+
+ if (per_cu->cu->dependencies != NULL)
+ htab_traverse (per_cu->cu->dependencies, dwarf2_mark_helper, NULL);
- /* We want to keep the file. */
- unlink_file.keep ();
+ return 1;
}
-/* Implementation of the `save gdb-index' command.
-
- Note that the .gdb_index file format used by this command is
- documented in the GDB manual. Any changes here must be documented
- there. */
+/* Set the mark field in CU and in every other compilation unit in the
+ cache that we must keep because we are keeping CU. */
static void
-save_gdb_index_command (const char *arg, int from_tty)
+dwarf2_mark (struct dwarf2_cu *cu)
{
- struct objfile *objfile;
- const char dwarf5space[] = "-dwarf-5 ";
- dw_index_kind index_kind = dw_index_kind::GDB_INDEX;
-
- if (!arg)
- arg = "";
+ if (cu->mark)
+ return;
+ cu->mark = 1;
+ if (cu->dependencies != NULL)
+ htab_traverse (cu->dependencies, dwarf2_mark_helper, NULL);
+}
- arg = skip_spaces (arg);
- if (strncmp (arg, dwarf5space, strlen (dwarf5space)) == 0)
+static void
+dwarf2_clear_marks (struct dwarf2_per_cu_data *per_cu)
+{
+ while (per_cu)
{
- index_kind = dw_index_kind::DEBUG_NAMES;
- arg += strlen (dwarf5space);
- arg = skip_spaces (arg);
+ per_cu->cu->mark = 0;
+ per_cu = per_cu->cu->read_in_chain;
}
+}
- if (!*arg)
- error (_("usage: save gdb-index [-dwarf-5] DIRECTORY"));
+/* Trivial hash function for partial_die_info: the hash value of a DIE
+ is its offset in .debug_info for this objfile. */
- ALL_OBJFILES (objfile)
- {
- struct stat st;
+static hashval_t
+partial_die_hash (const void *item)
+{
+ const struct partial_die_info *part_die
+ = (const struct partial_die_info *) item;
- /* If the objfile does not correspond to an actual file, skip it. */
- if (stat (objfile_name (objfile), &st) < 0)
- continue;
+ return to_underlying (part_die->sect_off);
+}
- dwarf2_per_objfile
- = (struct dwarf2_per_objfile *) objfile_data (objfile,
- dwarf2_objfile_data_key);
- if (dwarf2_per_objfile)
- {
+/* Trivial comparison function for partial_die_info structures: two DIEs
+ are equal if they have the same offset. */
- TRY
- {
- write_psymtabs_to_index (objfile, arg, index_kind);
- }
- CATCH (except, RETURN_MASK_ERROR)
- {
- exception_fprintf (gdb_stderr, except,
- _("Error while writing index for `%s': "),
- objfile_name (objfile));
- }
- END_CATCH
- }
- }
+static int
+partial_die_eq (const void *item_lhs, const void *item_rhs)
+{
+ const struct partial_die_info *part_die_lhs
+ = (const struct partial_die_info *) item_lhs;
+ const struct partial_die_info *part_die_rhs
+ = (const struct partial_die_info *) item_rhs;
+
+ return part_die_lhs->sect_off == part_die_rhs->sect_off;
}
-\f
+static struct cmd_list_element *set_dwarf_cmdlist;
+static struct cmd_list_element *show_dwarf_cmdlist;
+
+static void
+set_dwarf_cmd (const char *args, int from_tty)
+{
+ help_list (set_dwarf_cmdlist, "maintenance set dwarf ", all_commands,
+ gdb_stdout);
+}
+
+static void
+show_dwarf_cmd (const char *args, int from_tty)
+{
+ cmd_show_list (show_dwarf_cmdlist, from_tty, "");
+}
int dwarf_always_disassemble;
void
_initialize_dwarf2_read (void)
{
- struct cmd_list_element *c;
- dwarf2_objfile_data_key
- = register_objfile_data_with_cleanup (NULL, dwarf2_per_objfile_free);
+ dwarf2_objfile_data_key = register_objfile_data ();
add_prefix_cmd ("dwarf", class_maintenance, set_dwarf_cmd, _("\
Set DWARF specific variables.\n\
NULL,
&setlist, &showlist);
- c = add_cmd ("gdb-index", class_files, save_gdb_index_command,
- _("\
-Save a gdb-index file.\n\
-Usage: save gdb-index [-dwarf-5] DIRECTORY\n\
-\n\
-No options create one file with .gdb-index extension for pre-DWARF-5\n\
-compatible .gdb_index section. With -dwarf-5 creates two files with\n\
-extension .debug_names and .debug_str for DWARF-5 .debug_names section."),
- &save_cmdlist);
- set_cmd_completer (c, filename_completer);
-
dwarf2_locexpr_index = register_symbol_computed_impl (LOC_COMPUTED,
&dwarf2_locexpr_funcs);
dwarf2_loclist_index = register_symbol_computed_impl (LOC_COMPUTED,
projects / deliverable / binutils-gdb.git / blobdiff