mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-03 04:12:10 +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
201 lines
7.3 KiB
C++
201 lines
7.3 KiB
C++
/* Shared library declarations for GDB, the GNU Debugger.
|
|
Copyright (C) 1990-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 SOLIST_H
|
|
#define SOLIST_H
|
|
|
|
#define SO_NAME_MAX_PATH_SIZE 512 /* FIXME: Should be dynamic */
|
|
/* For domain_enum domain. */
|
|
#include "symtab.h"
|
|
#include "gdb_bfd.h"
|
|
#include "target-section.h"
|
|
|
|
/* Base class for target-specific link map information. */
|
|
|
|
struct lm_info_base
|
|
{
|
|
};
|
|
|
|
struct so_list
|
|
{
|
|
/* The following fields of the structure come directly from the
|
|
dynamic linker's tables in the inferior, and are initialized by
|
|
current_sos. */
|
|
|
|
struct so_list *next; /* next structure in linked list */
|
|
|
|
/* A pointer to target specific link map information. Often this
|
|
will be a copy of struct link_map from the user process, but
|
|
it need not be; it can be any collection of data needed to
|
|
traverse the dynamic linker's data structures. */
|
|
lm_info_base *lm_info;
|
|
|
|
/* Shared object file name, exactly as it appears in the
|
|
inferior's link map. This may be a relative path, or something
|
|
which needs to be looked up in LD_LIBRARY_PATH, etc. We use it
|
|
to tell which entries in the inferior's dynamic linker's link
|
|
map we've already loaded. */
|
|
char so_original_name[SO_NAME_MAX_PATH_SIZE];
|
|
|
|
/* Shared object file name, expanded to something GDB can open. */
|
|
char so_name[SO_NAME_MAX_PATH_SIZE];
|
|
|
|
/* Program space this shared library belongs to. */
|
|
struct program_space *pspace;
|
|
|
|
/* The following fields of the structure are built from
|
|
information gathered from the shared object file itself, and
|
|
are set when we actually add it to our symbol tables.
|
|
|
|
current_sos must initialize these fields to 0. */
|
|
|
|
bfd *abfd;
|
|
char symbols_loaded; /* flag: symbols read in yet? */
|
|
|
|
/* objfile with symbols for a loaded library. Target memory is read from
|
|
ABFD. OBJFILE may be NULL either before symbols have been loaded, if
|
|
the file cannot be found or after the command "nosharedlibrary". */
|
|
struct objfile *objfile;
|
|
|
|
target_section_table *sections;
|
|
|
|
/* Record the range of addresses belonging to this shared library.
|
|
There may not be just one (e.g. if two segments are relocated
|
|
differently). This is used for "info sharedlibrary" and
|
|
the MI command "-file-list-shared-libraries". The latter has a format
|
|
that supports outputting multiple segments once the related code
|
|
supports them. */
|
|
CORE_ADDR addr_low, addr_high;
|
|
};
|
|
|
|
struct target_so_ops
|
|
{
|
|
/* Adjust the section binding addresses by the base address at
|
|
which the object was actually mapped. */
|
|
void (*relocate_section_addresses) (struct so_list *so,
|
|
struct target_section *);
|
|
|
|
/* Free the link map info and any other private data structures
|
|
associated with a so_list entry. */
|
|
void (*free_so) (struct so_list *so);
|
|
|
|
/* Reset private data structures associated with SO.
|
|
This is called when SO is about to be reloaded.
|
|
It is also called before free_so when SO is about to be freed. */
|
|
void (*clear_so) (struct so_list *so);
|
|
|
|
/* Reset or free private data structures not associated with
|
|
so_list entries. */
|
|
void (*clear_solib) (void);
|
|
|
|
/* Target dependent code to run after child process fork. */
|
|
void (*solib_create_inferior_hook) (int from_tty);
|
|
|
|
/* Construct a list of the currently loaded shared objects. This
|
|
list does not include an entry for the main executable file.
|
|
|
|
Note that we only gather information directly available from the
|
|
inferior --- we don't examine any of the shared library files
|
|
themselves. The declaration of `struct so_list' says which fields
|
|
we provide values for. */
|
|
struct so_list *(*current_sos) (void);
|
|
|
|
/* Find, open, and read the symbols for the main executable. If
|
|
FROM_TTY is non-zero, allow messages to be printed. */
|
|
int (*open_symbol_file_object) (int from_ttyp);
|
|
|
|
/* Determine if PC lies in the dynamic symbol resolution code of
|
|
the run time loader. */
|
|
int (*in_dynsym_resolve_code) (CORE_ADDR pc);
|
|
|
|
/* Find and open shared library binary file. */
|
|
gdb_bfd_ref_ptr (*bfd_open) (const char *pathname);
|
|
|
|
/* Optional extra hook for finding and opening a solib.
|
|
If TEMP_PATHNAME is non-NULL: If the file is successfully opened a
|
|
pointer to a malloc'd and realpath'd copy of SONAME is stored there,
|
|
otherwise NULL is stored there. */
|
|
int (*find_and_open_solib) (const char *soname,
|
|
unsigned o_flags,
|
|
gdb::unique_xmalloc_ptr<char> *temp_pathname);
|
|
|
|
/* Given two so_list objects, one from the GDB thread list
|
|
and another from the list returned by current_sos, return 1
|
|
if they represent the same library.
|
|
Falls back to using strcmp on so_original_name field when set
|
|
to NULL. */
|
|
int (*same) (struct so_list *gdb, struct so_list *inferior);
|
|
|
|
/* Return whether a region of memory must be kept in a core file
|
|
for shared libraries loaded before "gcore" is used to be
|
|
handled correctly when the core file is loaded. This only
|
|
applies when the section would otherwise not be kept in the
|
|
core file (in particular, for readonly sections). */
|
|
int (*keep_data_in_core) (CORE_ADDR vaddr,
|
|
unsigned long size);
|
|
|
|
/* Enable or disable optional solib event breakpoints as
|
|
appropriate. This should be called whenever
|
|
stop_on_solib_events is changed. This pointer can be
|
|
NULL, in which case no enabling or disabling is necessary
|
|
for this target. */
|
|
void (*update_breakpoints) (void);
|
|
|
|
/* Target-specific processing of solib events that will be
|
|
performed before solib_add is called. This pointer can be
|
|
NULL, in which case no specific preprocessing is necessary
|
|
for this target. */
|
|
void (*handle_event) (void);
|
|
};
|
|
|
|
using so_list_range = next_range<so_list>;
|
|
|
|
/* Free the memory associated with a (so_list *). */
|
|
void free_so (struct so_list *so);
|
|
|
|
/* A deleter that calls free_so. */
|
|
struct so_deleter
|
|
{
|
|
void operator() (struct so_list *so) const
|
|
{
|
|
free_so (so);
|
|
}
|
|
};
|
|
|
|
/* A unique pointer to a so_list. */
|
|
typedef std::unique_ptr<so_list, so_deleter> so_list_up;
|
|
|
|
/* Find main executable binary file. */
|
|
extern gdb::unique_xmalloc_ptr<char> exec_file_find (const char *in_pathname,
|
|
int *fd);
|
|
|
|
/* Find shared library binary file. */
|
|
extern gdb::unique_xmalloc_ptr<char> solib_find (const char *in_pathname,
|
|
int *fd);
|
|
|
|
/* Open BFD for shared library file. */
|
|
extern gdb_bfd_ref_ptr solib_bfd_fopen (const char *pathname, int fd);
|
|
|
|
/* Find solib binary file and open it. */
|
|
extern gdb_bfd_ref_ptr solib_bfd_open (const char *in_pathname);
|
|
|
|
/* FIXME: gdbarch needs to control this variable. */
|
|
extern struct target_so_ops *current_target_so_ops;
|
|
|
|
#endif
|