X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsymfile.h;h=5b349752d5091a05dd78dda0a53a70c777a474a4;hb=6a053cb1ff643cec3349d7f2f47ae5573f82d613;hp=c3e7a314c9cbcd930f17c6f88f12b7ec4b802aeb;hpb=14bc53a81471e0b550de1c24d4d5266f676aacc3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symfile.h b/gdb/symfile.h index c3e7a314c9..5b349752d5 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -1,6 +1,6 @@ /* Definitions for reading symbol files into GDB. - Copyright (C) 1990-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -26,7 +26,7 @@ #include "symfile-add-flags.h" #include "objfile-flags.h" #include "gdb_bfd.h" -#include "common/function-view.h" +#include "gdbsupport/function-view.h" /* Opaque declarations. */ struct target_section; @@ -34,54 +34,36 @@ struct objfile; struct obj_section; struct obstack; struct block; -struct probe; struct value; struct frame_info; struct agent_expr; struct axs_value; +class probe; /* Comparison function for symbol look ups. */ typedef int (symbol_compare_ftype) (const char *string1, const char *string2); -/* Partial symbols are stored in the psymbol_cache and pointers to - them are kept in a dynamically grown array that is obtained from - malloc and grown as necessary via realloc. Each objfile typically - has two of these, one for global symbols and one for static - symbols. Although this adds a level of indirection for storing or - accessing the partial symbols, it allows us to throw away duplicate - psymbols and set all pointers to the single saved instance. */ - -struct psymbol_allocation_list +struct other_sections { + other_sections (CORE_ADDR addr_, std::string &&name_, int sectindex_) + : addr (addr_), + name (std::move (name_)), + sectindex (sectindex_) + { + } - /* Pointer to beginning of dynamically allocated array of pointers - to partial symbols. The array is dynamically expanded as - necessary to accommodate more pointers. */ - - struct partial_symbol **list; - - /* Pointer to next available slot in which to store a pointer to a - partial symbol. */ - - struct partial_symbol **next; + other_sections (other_sections &&other) = default; - /* Number of allocated pointer slots in current dynamic array (not - the number of bytes of storage). The "next" pointer will always - point somewhere between list[0] and list[size], and when at - list[size] the array will be expanded on the next attempt to - store a pointer. */ + DISABLE_COPY_AND_ASSIGN (other_sections); - int size; -}; - -struct other_sections -{ CORE_ADDR addr; - char *name; + std::string name; - /* SECTINDEX must be valid for associated BFD or set to -1. */ + /* SECTINDEX must be valid for associated BFD or set to -1. + See syms_from_objfile_1 for an exception to this rule. + */ int sectindex; }; @@ -92,15 +74,7 @@ struct other_sections to communicate the section addresses in shared objects to symbol_file_add (). */ -struct section_addr_info -{ - /* The number of sections for which address information is - available. */ - size_t num_sections; - /* Sections whose names are file format dependent. */ - struct other_sections other[1]; -}; - +typedef std::vector section_addr_info; /* A table listing the load segments in a symfile, and which segment each BFD section belongs to. */ @@ -205,7 +179,8 @@ struct quick_symbol_functions contains !TYPE_OPAQUE symbol prefer its compunit. If it contains only TYPE_OPAQUE symbol(s), return at least that compunit. */ struct compunit_symtab *(*lookup_symbol) (struct objfile *objfile, - int block_index, const char *name, + block_enum block_index, + const char *name, domain_enum domain); /* Print statistics about any indices loaded for OBJFILE. The @@ -217,12 +192,6 @@ struct quick_symbol_functions gdb_stdout. This is used for "maint print objfiles". */ void (*dump) (struct objfile *objfile); - /* This is called by objfile_relocate to relocate any indices loaded - for OBJFILE. */ - void (*relocate) (struct objfile *objfile, - const struct section_offsets *new_offsets, - const struct section_offsets *delta); - /* Find all the symbols in OBJFILE named FUNC_NAME, and ensure that the corresponding symbol tables are loaded. */ void (*expand_symtabs_for_function) (struct objfile *objfile, @@ -243,7 +212,7 @@ struct quick_symbol_functions and for which MATCH (symbol name, NAME) == 0, passing each to CALLBACK, reading in partial symbol tables as needed. Look through global symbols if GLOBAL and otherwise static symbols. - Passes NAME, NAMESPACE, and DATA to CALLBACK with each symbol + Passes NAME and NAMESPACE to CALLBACK with each symbol found. After each block is processed, passes NULL to CALLBACK. MATCH must be weaker than strcmp_iw_ordered in the sense that strcmp_iw_ordered(x,y) == 0 --> MATCH(x,y) == 0. ORDERED_COMPARE, @@ -253,17 +222,16 @@ struct quick_symbol_functions and strcmp_iw_ordered(x,y) <= 0 --> ORDERED_COMPARE(x,y) <= 0 (allowing strcmp_iw_ordered(x,y) < 0 while ORDERED_COMPARE(x, y) == 0). - CALLBACK returns 0 to indicate that the scan should continue, or - non-zero to indicate that the scan should be terminated. */ - - void (*map_matching_symbols) (struct objfile *, - const char *name, domain_enum domain, - int global, - int (*callback) (struct block *, - struct symbol *, void *), - void *data, - symbol_compare_ftype *match, - symbol_compare_ftype *ordered_compare); + CALLBACK returns true to indicate that the scan should continue, or + false to indicate that the scan should be terminated. */ + + void (*map_matching_symbols) + (struct objfile *, + const lookup_name_info &lookup_name, + domain_enum domain, + int global, + gdb::function_view callback, + symbol_compare_ftype *ordered_compare); /* Expand all symbol tables in OBJFILE matching some criteria. @@ -286,6 +254,7 @@ struct quick_symbol_functions void (*expand_symtabs_matching) (struct objfile *objfile, gdb::function_view file_matcher, + const lookup_name_info &lookup_name, gdb::function_view symbol_matcher, gdb::function_view expansion_notify, enum search_domain kind); @@ -300,6 +269,14 @@ struct quick_symbol_functions (struct objfile *objfile, struct bound_minimal_symbol msymbol, CORE_ADDR pc, struct obj_section *section, int warn_if_readin); + /* Return the comp unit from OBJFILE that contains a symbol at + ADDRESS. Return NULL if there is no such comp unit. Unlike + find_pc_sect_compunit_symtab, any sort of symbol (not just text + symbols) can be considered, and only exact address matches are + considered. This pointer may be NULL. */ + struct compunit_symtab *(*find_compunit_symtab_by_address) + (struct objfile *objfile, CORE_ADDR address); + /* Call a callback for every file defined in OBJFILE whose symtab is not already read in. FUN is the callback. It is passed the file's FILENAME, the file's FULLNAME (if need_fullname is non-zero), and @@ -314,11 +291,9 @@ struct quick_symbol_functions struct sym_probe_fns { - /* If non-NULL, return an array of probe objects. - - The returned value does not have to be freed and it has lifetime of the - OBJFILE. */ - VEC (probe_p) *(*sym_get_probes) (struct objfile *); + /* If non-NULL, return a reference to vector of probe objects. */ + const std::vector> &(*sym_get_probes) + (struct objfile *); }; /* Structure to keep track of symbol reading functions for various @@ -365,7 +340,7 @@ struct sym_fns The section_addr_info structure contains the offset of loadable and allocated sections, relative to the absolute offsets found in the BFD. */ - void (*sym_offsets) (struct objfile *, const struct section_addr_info *); + void (*sym_offsets) (struct objfile *, const section_addr_info &); /* This function produces a format-independent description of the segments of ABFD. Each segment is a unit of the file @@ -394,21 +369,20 @@ struct sym_fns const struct quick_symbol_functions *qf; }; -extern struct section_addr_info * +extern section_addr_info build_section_addr_info_from_objfile (const struct objfile *objfile); extern void relative_addr_info_to_section_offsets - (struct section_offsets *section_offsets, int num_sections, - const struct section_addr_info *addrs); + (section_offsets §ion_offsets, const section_addr_info &addrs); -extern void addr_info_make_relative (struct section_addr_info *addrs, +extern void addr_info_make_relative (section_addr_info *addrs, bfd *abfd); /* The default version of sym_fns.sym_offsets for readers that don't do anything special. */ extern void default_symfile_offsets (struct objfile *objfile, - const struct section_addr_info *); + const section_addr_info &); /* The default version of sym_fns.sym_segments for readers that don't do anything special. */ @@ -442,40 +416,29 @@ extern enum language deduce_language_from_filename (const char *); extern void add_filename_language (const char *ext, enum language lang); extern struct objfile *symbol_file_add (const char *, symfile_add_flags, - struct section_addr_info *, objfile_flags); + section_addr_info *, objfile_flags); extern struct objfile *symbol_file_add_from_bfd (bfd *, const char *, symfile_add_flags, - struct section_addr_info *, + section_addr_info *, objfile_flags, struct objfile *parent); extern void symbol_file_add_separate (bfd *, const char *, symfile_add_flags, struct objfile *); -extern char *find_separate_debug_file_by_debuglink (struct objfile *); - -/* Create a new section_addr_info, with room for NUM_SECTIONS. */ - -extern struct section_addr_info *alloc_section_addr_info (size_t - num_sections); +extern std::string find_separate_debug_file_by_debuglink (struct objfile *); /* Build (allocate and populate) a section_addr_info struct from an existing section table. */ -extern struct section_addr_info - *build_section_addr_info_from_section_table (const struct target_section +extern section_addr_info + build_section_addr_info_from_section_table (const struct target_section *start, const struct target_section *end); -/* Free all memory allocated by - build_section_addr_info_from_section_table. */ - -extern void free_section_addr_info (struct section_addr_info *); - - /* Variables */ -/* If non-zero, shared library symbols will be added automatically +/* If true, shared library symbols will be added automatically when the inferior is created, new libraries are loaded, or when attaching to the inferior. This is almost always what users will want to have happen; but for very large programs, the startup time @@ -485,7 +448,7 @@ extern void free_section_addr_info (struct section_addr_info *); library symbols are not loaded, commands like "info fun" will *not* report all the functions that are actually present. */ -extern int auto_solib_add; +extern bool auto_solib_add; /* From symfile.c */ @@ -495,7 +458,7 @@ extern void find_lowest_section (bfd *, asection *, void *); extern gdb_bfd_ref_ptr symfile_bfd_open (const char *); -extern int get_section_index (struct objfile *, char *); +extern int get_section_index (struct objfile *, const char *); extern int print_symbol_loading_p (int from_tty, int mainline, int full); @@ -551,15 +514,16 @@ extern bfd_byte *symfile_relocate_debug_section (struct objfile *, asection *, extern int symfile_map_offsets_to_segments (bfd *, const struct symfile_segment_data *, - struct section_offsets *, + section_offsets &, int, const CORE_ADDR *); struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); -extern struct cleanup *increment_reading_symtab (void); +extern scoped_restore_tmpl increment_reading_symtab (void); void expand_symtabs_matching (gdb::function_view file_matcher, + const lookup_name_info &lookup_name, gdb::function_view symbol_matcher, gdb::function_view expansion_notify, enum search_domain kind); @@ -567,6 +531,12 @@ void expand_symtabs_matching void map_symbol_filenames (symbol_filename_ftype *fun, void *data, int need_fullname); +/* Target-agnostic function to load the sections of an executable into memory. + + ARGS should be in the form "EXECUTABLE [OFFSET]", where OFFSET is an + optional offset to apply to each section. */ +extern void generic_load (const char *args, int from_tty); + /* From dwarf2read.c */ /* Names for a dwarf2 debugging section. The field NORMAL is the normal @@ -606,13 +576,16 @@ struct dwarf2_debug_sections { struct dwarf2_section_names frame; struct dwarf2_section_names eh_frame; struct dwarf2_section_names gdb_index; + struct dwarf2_section_names debug_names; + struct dwarf2_section_names debug_aranges; /* This field has no meaning, but exists solely to catch changes to this structure which are not reflected in some instance. */ int sentinel; }; extern int dwarf2_has_info (struct objfile *, - const struct dwarf2_debug_sections *); + const struct dwarf2_debug_sections *, + bool = false); /* Dwarf2 sections that can be accessed by dwarf2_get_section_info. */ enum dwarf2_section_enum { @@ -625,25 +598,33 @@ extern void dwarf2_get_section_info (struct objfile *, asection **, const gdb_byte **, bfd_size_type *); -extern int dwarf2_initialize_objfile (struct objfile *); -extern void dwarf2_build_psymtabs (struct objfile *); -extern void dwarf2_build_frame_info (struct objfile *); +/* A DWARF names index variant. */ +enum class dw_index_kind +{ + /* GDB's own .gdb_index format. */ + GDB_INDEX, -void dwarf2_free_objfile (struct objfile *); + /* DWARF5 .debug_names. */ + DEBUG_NAMES, +}; -/* From mdebugread.c */ +/* Initialize for reading DWARF for OBJFILE. Return false if this + file will use psymtabs, or true if using an index, in which case + *INDEX_KIND is set to the index variant in use. */ +extern bool dwarf2_initialize_objfile (struct objfile *objfile, + dw_index_kind *index_kind); -extern void mdebug_build_psymtabs (minimal_symbol_reader &, - struct objfile *, - const struct ecoff_debug_swap *, - struct ecoff_debug_info *); +extern void dwarf2_build_psymtabs (struct objfile *); +extern void dwarf2_build_frame_info (struct objfile *); -extern void elfmdebug_build_psymtabs (struct objfile *, - const struct ecoff_debug_swap *, - asection *); +void dwarf2_free_objfile (struct objfile *); /* From minidebug.c. */ extern gdb_bfd_ref_ptr find_separate_debug_file_in_section (struct objfile *); +/* True if we are printing debug output about separate debug info files. */ + +extern bool separate_debug_file_debug; + #endif /* !defined(SYMFILE_H) */