#ifndef DWARF2_PUBLIC_H
#define DWARF2_PUBLIC_H
-extern bool dwarf2_has_info (struct objfile *,
- const struct dwarf2_debug_sections *,
- bool = false);
-
/* A DWARF names index variant. */
enum class dw_index_kind
{
DEBUG_NAMES,
};
-/* Initialize for reading DWARF for OBJFILE, and push the appropriate
- entry on the objfile's "qf" list. */
-extern void dwarf2_initialize_objfile (struct objfile *objfile);
+/* Try to locate the sections we need for DWARF 2 debugging
+ information. If these are found, begin reading the DWARF and
+ return true. Otherwise, return false. NAMES points to the dwarf2
+ section names, or is NULL if the standard ELF names are used.
+ CAN_COPY is true for formats where symbol interposition is possible
+ and so symbol values must follow copy relocation rules. */
+
+extern bool dwarf2_initialize_objfile
+ (struct objfile *,
+ const struct dwarf2_debug_sections * = nullptr,
+ bool = false);
extern void dwarf2_build_frame_info (struct objfile *);
this->m_symtabs[per_cu->index] = symtab;
}
-/* 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
- ELF names are used. CAN_COPY is true for formats where symbol
- interposition is possible and so symbol values must follow copy
- relocation rules. */
+/* Helper function for dwarf2_initialize_objfile that creates the
+ per-BFD object. */
-bool
+static bool
dwarf2_has_info (struct objfile *objfile,
const struct dwarf2_debug_sections *names,
bool can_copy)
/* See dwarf2/public.h. */
-void
-dwarf2_initialize_objfile (struct objfile *objfile)
+bool
+dwarf2_initialize_objfile (struct objfile *objfile,
+ const struct dwarf2_debug_sections *names,
+ bool can_copy)
{
+ if (!dwarf2_has_info (objfile, names, can_copy))
+ return false;
+
dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
= create_quick_file_names_table (per_bfd->all_units.size ());
objfile->qf.emplace_front (new readnow_functions);
- return;
}
-
/* Was a GDB index already read when we processed an objfile sharing
PER_BFD? */
- if (per_bfd->index_table != nullptr)
+ else if (per_bfd->index_table != nullptr)
{
dwarf_read_debug_printf ("re-using symbols");
objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
- return;
}
-
- if (dwarf2_read_debug_names (per_objfile))
+ else if (dwarf2_read_debug_names (per_objfile))
{
dwarf_read_debug_printf ("found debug names");
objfile->qf.push_front
(per_bfd->index_table->make_quick_functions ());
- return;
}
-
- if (dwarf2_read_gdb_index (per_objfile,
- get_gdb_index_contents_from_section<struct dwarf2_per_bfd>,
- get_gdb_index_contents_from_section<dwz_file>))
+ else if (dwarf2_read_gdb_index (per_objfile,
+ get_gdb_index_contents_from_section<struct dwarf2_per_bfd>,
+ get_gdb_index_contents_from_section<dwz_file>))
{
dwarf_read_debug_printf ("found gdb index from file");
objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
- return;
}
-
/* ... otherwise, try to find the index in the index cache. */
- if (dwarf2_read_gdb_index (per_objfile,
+ else if (dwarf2_read_gdb_index (per_objfile,
get_gdb_index_contents_from_cache,
get_gdb_index_contents_from_cache_dwz))
{
dwarf_read_debug_printf ("found gdb index from cache");
global_index_cache.hit ();
objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
- return;
}
-
- global_index_cache.miss ();
- objfile->qf.push_front (make_cooked_index_funcs (per_objfile));
+ else
+ {
+ global_index_cache.miss ();
+ objfile->qf.push_front (make_cooked_index_funcs (per_objfile));
+ }
+ return true;
}
\f
macho_symfile_read_all_oso at the end of this function. */
gdb::def_vector<asymbol *> symbol_table;
+ dwarf2_initialize_objfile (objfile);
+
/* Get symbols from the symbol table only if the file is an executable.
The symbol table of object files is not relocated and is expected to
be in the executable. */
}
/* Try to read .eh_frame / .debug_frame. */
- /* First, locate these sections. We ignore the result status
- as it only checks for debug info. */
- dwarf2_has_info (objfile, NULL);
dwarf2_build_frame_info (objfile);
/* Check for DSYM file. */
}
}
- if (dwarf2_has_info (objfile, NULL))
- {
- /* DWARF 2 sections */
- dwarf2_initialize_objfile (objfile);
- }
-
/* Then the oso. */
if (!oso_vector.empty ())
macho_symfile_read_all_oso (&oso_vector, objfile, symfile_flags);