From: Tom Tromey Date: Fri, 15 Jun 2018 05:12:16 +0000 (-0700) Subject: Introduce all_objfiles and next_iterator X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=217083254a26b9e1dc42c43f573054740988c2cf;p=binutils-gdb.git Introduce all_objfiles and next_iterator This introduces an iterable object which can be used to iterate over objfiles. It also introduces a generic "next_iterator", which can be used to iterate over types that have a "next" field. gdb/ChangeLog 2019-01-09 Tom Tromey * common/next-iterator.h: New file. * objfiles.h (class all_objfiles): New. (struct objfile_iterator): New. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2e9c2f2e5a6..62338d76ca3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-01-09 Tom Tromey + + * common/next-iterator.h: New file. + * objfiles.h (class all_objfiles): New. + (struct objfile_iterator): New. + 2019-01-09 Philippe Waroquiers * NEWS: Move the description of the changed "frame", "select-frame", diff --git a/gdb/common/next-iterator.h b/gdb/common/next-iterator.h new file mode 100644 index 00000000000..588ebfd9d1f --- /dev/null +++ b/gdb/common/next-iterator.h @@ -0,0 +1,102 @@ +/* A "next" iterator for GDB, the GNU debugger. + Copyright (C) 2019 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 . */ + +#ifndef COMMON_NEXT_ITERATOR_H +#define COMMON_NEXT_ITERATOR_H + +/* An iterator that uses the 'next' field of a type to iterate. This + can be used with various GDB types that are stored as linked + lists. */ + +template +struct next_iterator +{ + typedef next_iterator self_type; + typedef T *value_type; + typedef T *&reference; + typedef T **pointer; + typedef std::forward_iterator_tag iterator_category; + typedef int difference_type; + + explicit next_iterator (T *item) + : m_item (item) + { + } + + /* Create a one-past-the-end iterator. */ + next_iterator () + : m_item (nullptr) + { + } + + value_type operator* () const + { + return m_item; + } + + bool operator== (const self_type &other) const + { + return m_item == other.m_item; + } + + bool operator!= (const self_type &other) const + { + return m_item != other.m_item; + } + + self_type &operator++ () + { + m_item = m_item->next; + return *this; + } + +private: + + T *m_item; +}; + +/* A range adapter that allows iterating over a linked list. */ + +template +class next_adapter +{ +public: + + explicit next_adapter (T *item) + : m_item (item) + { + } + + using iterator = next_iterator; + + iterator begin () const + { + return iterator (m_item); + } + + iterator end () const + { + return iterator (); + } + +private: + + T *m_item; +}; + +#endif /* COMMON_NEXT_ITERATOR_H */ diff --git a/gdb/objfiles.h b/gdb/objfiles.h index b3ceb8c6c70..8d7a3c35e11 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -28,6 +28,7 @@ #include "registry.h" #include "gdb_bfd.h" #include +#include "common/next-iterator.h" struct bcache; struct htab; @@ -565,6 +566,22 @@ extern void default_iterate_over_objfiles_in_search_order void *cb_data, struct objfile *current_objfile); +/* An iterarable object that can be used to iterate over all + objfiles. The basic use is in a foreach, like: + + for (objfile *objf : all_objfiles (pspace)) { ... } */ + +class all_objfiles : public next_adapter +{ +public: + + explicit all_objfiles (struct program_space *pspace) + : next_adapter (pspace->objfiles) + { + } +}; + + /* Traverse all object files in the current program space. ALL_OBJFILES_SAFE works even if you delete the objfile during the traversal. */