Store objfiles on a std::list
This removes objfile::next and changes objfiles to be stored in a std::list. gdb/ChangeLog 2019-12-12 Tom Tromey <tom@tromey.com> * progspace.c (program_space::add_objfile) (program_space::remove_objfile): Update. (program_space::multi_objfile_p): Remove. * objfiles.h (struct objfile) <next>: Remove. * objfiles.c (objfile::objfile): Update. (put_objfile_before): Update. (unlink_objfile): Update. * progspace.h (object_files): Remove. (struct program_space) <objfiles_head>: Remove. <objfiles_list>: New member. <objfiles_range, objfiles_safe_range>: Change type. (objfiles): Change return type. (objfiles_safe): Update. (multi_objfile_p): Rewrite and inline. (object_files): Remove macro. Change-Id: Ib4430e3db6f9a390399924379a5c10426c514853
This commit is contained in:
Tom Tromey
parent
13bff72615
commit
d0801dd8f2
|
|
@ -1,3 +1,21 @@
|
|||
2019-12-12 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* progspace.c (program_space::add_objfile)
|
||||
(program_space::remove_objfile): Update.
|
||||
(program_space::multi_objfile_p): Remove.
|
||||
* objfiles.h (struct objfile) <next>: Remove.
|
||||
* objfiles.c (objfile::objfile): Update.
|
||||
(put_objfile_before): Update.
|
||||
(unlink_objfile): Update.
|
||||
* progspace.h (object_files): Remove.
|
||||
(struct program_space) <objfiles_head>: Remove.
|
||||
<objfiles_list>: New member.
|
||||
<objfiles_range, objfiles_safe_range>: Change type.
|
||||
(objfiles): Change return type.
|
||||
(objfiles_safe): Update.
|
||||
(multi_objfile_p): Rewrite and inline.
|
||||
(object_files): Remove macro.
|
||||
|
||||
2019-12-12 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* gdbsupport/safe-iterator.h (basic_safe_iterator): Simplify. Add
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@
|
|||
#include "btrace.h"
|
||||
#include "gdbsupport/pathstuff.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
/* Keep a registry of per-objfile data-pointers required by other GDB
|
||||
|
|
|
|||
|
|
@ -486,12 +486,6 @@ public:
|
|||
}
|
||||
|
||||
|
||||
/* All struct objfile's are chained together by their next pointers.
|
||||
The program space field "objfiles" (frequently referenced via
|
||||
the macro "object_files") points to the first link in this chain. */
|
||||
|
||||
struct objfile *next = nullptr;
|
||||
|
||||
/* The object file's original name as specified by the user,
|
||||
made absolute, and tilde-expanded. However, it is not canonicalized
|
||||
(i.e., it has not been passed through gdb_realpath).
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include "solib.h"
|
||||
#include "gdbthread.h"
|
||||
#include "inferior.h"
|
||||
#include <algorithm>
|
||||
|
||||
/* The last program space number assigned. */
|
||||
int last_program_space_num = 0;
|
||||
|
|
@ -158,21 +159,15 @@ program_space::~program_space ()
|
|||
void
|
||||
program_space::add_objfile (struct objfile *objfile, struct objfile *before)
|
||||
{
|
||||
for (struct objfile **objp = &objfiles_head;
|
||||
*objp != NULL;
|
||||
objp = &((*objp)->next))
|
||||
if (before == nullptr)
|
||||
objfiles_list.push_back (objfile);
|
||||
else
|
||||
{
|
||||
if (*objp == before)
|
||||
{
|
||||
objfile->next = *objp;
|
||||
*objp = objfile;
|
||||
return;
|
||||
}
|
||||
auto iter = std::find (objfiles_list.begin (), objfiles_list.end (),
|
||||
before);
|
||||
gdb_assert (iter != objfiles_list.end ());
|
||||
objfiles_list.insert (iter, objfile);
|
||||
}
|
||||
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("put_objfile_before: before objfile not in list"));
|
||||
|
||||
}
|
||||
|
||||
/* See progspace.h. */
|
||||
|
|
@ -180,32 +175,13 @@ program_space::add_objfile (struct objfile *objfile, struct objfile *before)
|
|||
void
|
||||
program_space::remove_objfile (struct objfile *objfile)
|
||||
{
|
||||
struct objfile **objpp;
|
||||
auto iter = std::find (objfiles_list.begin (), objfiles_list.end (),
|
||||
objfile);
|
||||
gdb_assert (iter != objfiles_list.end ());
|
||||
objfiles_list.erase (iter);
|
||||
|
||||
for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
|
||||
{
|
||||
if (*objpp == objfile)
|
||||
{
|
||||
*objpp = (*objpp)->next;
|
||||
objfile->next = NULL;
|
||||
|
||||
if (objfile == symfile_object_file)
|
||||
symfile_object_file = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("remove_objfile: objfile already unlinked"));
|
||||
}
|
||||
|
||||
/* See progspace.h. */
|
||||
|
||||
bool
|
||||
program_space::multi_objfile_p () const
|
||||
{
|
||||
return objfiles_head != nullptr && objfiles_head->next != nullptr;
|
||||
if (objfile == symfile_object_file)
|
||||
symfile_object_file = NULL;
|
||||
}
|
||||
|
||||
/* Copies program space SRC to DEST. Copies the main executable file,
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include "registry.h"
|
||||
#include "gdbsupport/next-iterator.h"
|
||||
#include "gdbsupport/safe-iterator.h"
|
||||
#include <list>
|
||||
|
||||
struct target_ops;
|
||||
struct bfd;
|
||||
|
|
@ -138,20 +139,18 @@ struct program_space
|
|||
program_space (address_space *aspace_);
|
||||
~program_space ();
|
||||
|
||||
typedef next_adapter<struct objfile> objfiles_range;
|
||||
typedef std::list<struct objfile *> objfiles_range;
|
||||
|
||||
/* Return an iterable object that can be used to iterate over all
|
||||
objfiles. The basic use is in a foreach, like:
|
||||
|
||||
for (objfile *objf : pspace->objfiles ()) { ... } */
|
||||
objfiles_range objfiles ()
|
||||
objfiles_range &objfiles ()
|
||||
{
|
||||
return objfiles_range (objfiles_head);
|
||||
return objfiles_list;
|
||||
}
|
||||
|
||||
typedef next_adapter<struct objfile,
|
||||
basic_safe_iterator<next_iterator<objfile>>>
|
||||
objfiles_safe_range;
|
||||
typedef basic_safe_range<objfiles_range> objfiles_safe_range;
|
||||
|
||||
/* An iterable object that can be used to iterate over all objfiles.
|
||||
The basic use is in a foreach, like:
|
||||
|
|
@ -162,7 +161,7 @@ struct program_space
|
|||
deleted during iteration. */
|
||||
objfiles_safe_range objfiles_safe ()
|
||||
{
|
||||
return objfiles_safe_range (objfiles_head);
|
||||
return objfiles_safe_range (objfiles_list);
|
||||
}
|
||||
|
||||
/* Add OBJFILE to the list of objfiles, putting it just before
|
||||
|
|
@ -175,7 +174,10 @@ struct program_space
|
|||
|
||||
/* Return true if there is more than one object file loaded; false
|
||||
otherwise. */
|
||||
bool multi_objfile_p () const;
|
||||
bool multi_objfile_p () const
|
||||
{
|
||||
return objfiles_list.size () > 1;
|
||||
}
|
||||
|
||||
|
||||
/* Pointer to next in linked list. */
|
||||
|
|
@ -228,9 +230,8 @@ struct program_space
|
|||
(e.g. the argument to the "symbol-file" or "file" command). */
|
||||
struct objfile *symfile_object_file = NULL;
|
||||
|
||||
/* All known objfiles are kept in a linked list. This points to
|
||||
the head of this list. */
|
||||
struct objfile *objfiles_head = NULL;
|
||||
/* All known objfiles are kept in a linked list. */
|
||||
std::list<struct objfile *> objfiles_list;
|
||||
|
||||
/* The set of target sections matching the sections mapped into
|
||||
this program space. Managed by both exec_ops and solib.c. */
|
||||
|
|
@ -271,10 +272,6 @@ struct address_space
|
|||
|
||||
#define symfile_objfile current_program_space->symfile_object_file
|
||||
|
||||
/* All known objfiles are kept in a linked list. This points to the
|
||||
root of this list. */
|
||||
#define object_files current_program_space->objfiles_head
|
||||
|
||||
/* The set of target sections matching the sections mapped into the
|
||||
current program space. */
|
||||
#define current_target_sections (¤t_program_space->target_sections)
|
||||
|
|
|
|||
Loading…
Reference in New Issue