mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
9be259865c
I was always a bit confused by next_adapter, because it kind of mixes the element type and the iterator type. In reality, it is not much more than a class that wraps two iterators (begin and end). However, it assumes that: - you can construct the begin iterator by passing a pointer to the first element of the iterable - you can default-construct iterator to make the end iterator I think that by generalizing it a little bit, we can re-use it at more places. Rename it to "iterator_range". I think it describes a bit better: it's a range made by wrapping a begin and end iterator. Move it to its own file, since it's not related to next_iterator anymore. iterator_range has two constructors. The variadic one, where arguments are forwarded to construct the underlying begin iterator. The end iterator is constructed through default construction. This is a generalization of what we have today. There is another constructor which receives already constructed begin and end iterators, useful if the end iterator can't be obtained by default-construction. Or, if you wanted to make a range that does not end at the end of the container, you could pass any iterator as the "end". This generalization allows removing some "range" classes, like all_inferiors_range. These classes existed only to pass some arguments when constructing the begin iterator. With iterator_range, those same arguments are passed to the iterator_range constructed and then forwarded to the constructed begin iterator. There is a small functional difference in how iterator_range works compared to next_adapter. next_adapter stored the pointer it received as argument and constructeur an iterator in the `begin` method. iterator_range constructs the begin iterator and stores it as a member. Its `begin` method returns a copy of that iterator. With just iterator_range, uses of next_adapter<foo> would be replaced with: using foo_iterator = next_iterator<foo>; using foo_range = iterator_range<foo_iterator>; However, I added a `next_range` wrapper as a direct replacement for next_adapter<foo>. IMO, next_range is a slightly better name than next_adapter. The rest of the changes are applications of this new class. gdbsupport/ChangeLog: * next-iterator.h (class next_adapter): Remove. * iterator-range.h: New. gdb/ChangeLog: * breakpoint.h (bp_locations_range): Remove. (bp_location_range): New. (struct breakpoint) <locations>: Adjust type. (breakpoint_range): Use iterator_range. (tracepoint_range): Use iterator_range. * breakpoint.c (breakpoint::locations): Adjust return type. * gdb_bfd.h (gdb_bfd_section_range): Use iterator_range. * gdbthread.h (all_threads_safe): Pass argument to all_threads_safe_range. * inferior-iter.h (all_inferiors_range): Use iterator_range. (all_inferiors_safe_range): Use iterator_range. (all_non_exited_inferiors_range): Use iterator_range. * inferior.h (all_inferiors, all_non_exited_inferiors): Pass inferior_list as argument. * objfiles.h (struct objfile) <compunits_range>: Remove. <compunits>: Return compunit_symtab_range. * progspace.h (unwrapping_objfile_iterator) <unwrapping_objfile_iterator>: Take parameter by value. (unwrapping_objfile_range): Use iterator_range. (struct program_space) <objfiles_range>: Define with "using". <objfiles>: Adjust. <objfiles_safe_range>: Define with "using". <objfiles_safe>: Adjust. <solibs>: Return so_list_range, define here. * progspace.c (program_space::solibs): Remove. * psymtab.h (class psymtab_storage) <partial_symtab_iterator>: New. <partial_symtab_range>: Use iterator_range. * solist.h (so_list_range): New. * symtab.h (compunit_symtab_range): New. (symtab_range): New. (compunit_filetabs): Change to a function. * thread-iter.h (inf_threads_range, inf_non_exited_threads_range, safe_inf_threads_range, all_threads_safe_range): Use iterator_range. * top.h (ui_range): New. (all_uis): Use ui_range. Change-Id: Ib7a9d2a3547f45f01aa1c6b24536ba159db9b854
149 lines
4.8 KiB
C++
149 lines
4.8 KiB
C++
/* Public partial symbol table definitions.
|
|
|
|
Copyright (C) 2009-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef PSYMTAB_H
|
|
#define PSYMTAB_H
|
|
|
|
#include "gdb_obstack.h"
|
|
#include "symfile.h"
|
|
#include "gdbsupport/next-iterator.h"
|
|
#include "bcache.h"
|
|
|
|
struct partial_symbol;
|
|
|
|
/* Specialization of bcache to store partial symbols. */
|
|
|
|
struct psymbol_bcache : public gdb::bcache
|
|
{
|
|
/* Calculate a hash code for the given partial symbol. The hash is
|
|
calculated using the symbol's value, language, domain, class
|
|
and name. These are the values which are set by
|
|
add_psymbol_to_bcache. */
|
|
unsigned long hash (const void *addr, int length) override;
|
|
|
|
/* Returns true if the symbol LEFT equals the symbol RIGHT.
|
|
For the comparison this function uses a symbols value,
|
|
language, domain, class and name. */
|
|
int compare (const void *left, const void *right, int length) override;
|
|
};
|
|
|
|
/* An instance of this class manages the partial symbol tables and
|
|
partial symbols for a given objfile.
|
|
|
|
The core psymtab functions -- those in psymtab.c -- arrange for
|
|
nearly all psymtab- and psymbol-related allocations to happen
|
|
either in the psymtab_storage object (either on its obstack or in
|
|
other memory managed by this class), or on the per-BFD object. The
|
|
only link from the psymtab storage object back to the objfile (or
|
|
objfile_obstack) that is made by the core psymtab code is the
|
|
compunit_symtab member in the standard_psymtab -- and a given
|
|
symbol reader can avoid this by implementing its own subclasses of
|
|
partial_symtab.
|
|
|
|
However, it is up to each symbol reader to maintain this invariant
|
|
in other ways, if it wants to reuse psymtabs across multiple
|
|
objfiles. The main issue here is ensuring that read_symtab_private
|
|
does not point into objfile_obstack. */
|
|
|
|
class psymtab_storage
|
|
{
|
|
public:
|
|
psymtab_storage () = default;
|
|
~psymtab_storage ();
|
|
|
|
DISABLE_COPY_AND_ASSIGN (psymtab_storage);
|
|
|
|
/* Discard all partial symbol tables starting with "psymtabs" and
|
|
proceeding until "to" has been discarded. */
|
|
|
|
void discard_psymtabs_to (struct partial_symtab *to)
|
|
{
|
|
while (psymtabs != to)
|
|
discard_psymtab (psymtabs);
|
|
}
|
|
|
|
/* Discard the partial symbol table. */
|
|
|
|
void discard_psymtab (struct partial_symtab *pst);
|
|
|
|
/* Return the obstack that is used for storage by this object. */
|
|
|
|
struct obstack *obstack ()
|
|
{
|
|
if (!m_obstack.has_value ())
|
|
m_obstack.emplace ();
|
|
return &*m_obstack;
|
|
}
|
|
|
|
/* Allocate storage for the "dependencies" field of a psymtab.
|
|
NUMBER says how many dependencies there are. */
|
|
|
|
struct partial_symtab **allocate_dependencies (int number)
|
|
{
|
|
return OBSTACK_CALLOC (obstack (), number, struct partial_symtab *);
|
|
}
|
|
|
|
/* Install a psymtab on the psymtab list. This transfers ownership
|
|
of PST to this object. */
|
|
|
|
void install_psymtab (partial_symtab *pst);
|
|
|
|
using partial_symtab_range = next_range<partial_symtab>;
|
|
|
|
/* A range adapter that makes it possible to iterate over all
|
|
psymtabs in one objfile. */
|
|
|
|
partial_symtab_range range ()
|
|
{
|
|
return partial_symtab_range (psymtabs);
|
|
}
|
|
|
|
|
|
/* Each objfile points to a linked list of partial symtabs derived from
|
|
this file, one partial symtab structure for each compilation unit
|
|
(source file). */
|
|
|
|
struct partial_symtab *psymtabs = nullptr;
|
|
|
|
/* Map addresses to the entries of PSYMTABS. It would be more efficient to
|
|
have a map per the whole process but ADDRMAP cannot selectively remove
|
|
its items during FREE_OBJFILE. This mapping is already present even for
|
|
PARTIAL_SYMTABs which still have no corresponding full SYMTABs read.
|
|
|
|
The DWARF parser reuses this addrmap to store things other than
|
|
psymtabs in the cases where debug information is being read from, for
|
|
example, the .debug-names section. */
|
|
|
|
struct addrmap *psymtabs_addrmap = nullptr;
|
|
|
|
/* A byte cache where we can stash arbitrary "chunks" of bytes that
|
|
will not change. */
|
|
|
|
psymbol_bcache psymbol_cache;
|
|
|
|
private:
|
|
|
|
/* The obstack where allocations are made. This is lazily allocated
|
|
so that we don't waste memory when there are no psymtabs. */
|
|
|
|
gdb::optional<auto_obstack> m_obstack;
|
|
};
|
|
|
|
#endif /* PSYMTAB_H */
|