diff options
author | Tom Tromey <tom@tromey.com> | 2018-11-24 11:54:26 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-01-09 18:28:15 -0700 |
commit | 3b9d3ac236dcc418619785e0660fc0063e6489b8 (patch) | |
tree | cf889e1bf17b40f716551bb173c9189a45a33a99 /gdb/gcore.c | |
parent | 8b31193aa9752ba60d63cedaba943370d76ce543 (diff) | |
download | fsf-binutils-gdb-3b9d3ac236dcc418619785e0660fc0063e6489b8.zip fsf-binutils-gdb-3b9d3ac236dcc418619785e0660fc0063e6489b8.tar.gz fsf-binutils-gdb-3b9d3ac236dcc418619785e0660fc0063e6489b8.tar.bz2 |
Remove ALL_OBJSECTIONS
This removes the ALL_OBJSECTIONS macro, replacing its uses with ranged
for loops.
The special code in this macro for noticing a "break" from the inner
loop was only needed in a single place; so rather than try to
replicate this, I've simply replaced that use with a "goto".
gdb/ChangeLog
2019-01-09 Tom Tromey <tom@tromey.com>
* symfile.c (overlay_invalidate_all, find_pc_overlay)
(find_pc_mapped_section, list_overlays_command)
(map_overlay_command, unmap_overlay_command)
(simple_overlay_update): Use all_objfiles.
* spu-tdep.c (spu_overlay_update): Use all_objfiles.
* printcmd.c (info_symbol_command): Use all_objfiles.
* objfiles.h (ALL_OBJSECTIONS): Remove.
* maint.c (maintenance_translate_address): Use all_objfiles.
* gcore.c (gcore_create_callback): Use all_objfiles.
(objfile_find_memory_regions): Likewise.
Diffstat (limited to 'gdb/gcore.c')
-rw-r--r-- | gdb/gcore.c | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/gdb/gcore.c b/gdb/gcore.c index fc1be23..1a2ed0c 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -424,34 +424,34 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read, { /* See if this region of memory lies inside a known file on disk. If so, we can avoid copying its contents by clearing SEC_LOAD. */ - struct objfile *objfile; struct obj_section *objsec; - ALL_OBJSECTIONS (objfile, objsec) - { - bfd *abfd = objfile->obfd; - asection *asec = objsec->the_bfd_section; - bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd, - asec); - bfd_vma start = obj_section_addr (objsec) & -align; - bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align; - - /* Match if either the entire memory region lies inside the - section (i.e. a mapping covering some pages of a large - segment) or the entire section lies inside the memory region - (i.e. a mapping covering multiple small sections). - - This BFD was synthesized from reading target memory, - we don't want to omit that. */ - if (objfile->separate_debug_objfile_backlink == NULL - && ((vaddr >= start && vaddr + size <= end) - || (start >= vaddr && end <= vaddr + size)) - && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY)) - { - flags &= ~(SEC_LOAD | SEC_HAS_CONTENTS); - goto keep; /* Break out of two nested for loops. */ - } - } + for (objfile *objfile : all_objfiles (current_program_space)) + ALL_OBJFILE_OSECTIONS (objfile, objsec) + { + bfd *abfd = objfile->obfd; + asection *asec = objsec->the_bfd_section; + bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd, + asec); + bfd_vma start = obj_section_addr (objsec) & -align; + bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align; + + /* Match if either the entire memory region lies inside the + section (i.e. a mapping covering some pages of a large + segment) or the entire section lies inside the memory region + (i.e. a mapping covering multiple small sections). + + This BFD was synthesized from reading target memory, + we don't want to omit that. */ + if (objfile->separate_debug_objfile_backlink == NULL + && ((vaddr >= start && vaddr + size <= end) + || (start >= vaddr && end <= vaddr + size)) + && !(bfd_get_file_flags (abfd) & BFD_IN_MEMORY)) + { + flags &= ~(SEC_LOAD | SEC_HAS_CONTENTS); + goto keep; /* Break out of two nested for loops. */ + } + } keep:; } @@ -489,36 +489,36 @@ objfile_find_memory_regions (struct target_ops *self, find_memory_region_ftype func, void *obfd) { /* Use objfile data to create memory sections. */ - struct objfile *objfile; struct obj_section *objsec; bfd_vma temp_bottom, temp_top; /* Call callback function for each objfile section. */ - ALL_OBJSECTIONS (objfile, objsec) - { - bfd *ibfd = objfile->obfd; - asection *isec = objsec->the_bfd_section; - flagword flags = bfd_get_section_flags (ibfd, isec); - - /* Separate debug info files are irrelevant for gcore. */ - if (objfile->separate_debug_objfile_backlink != NULL) - continue; - - if ((flags & SEC_ALLOC) || (flags & SEC_LOAD)) - { - int size = bfd_section_size (ibfd, isec); - int ret; - - ret = (*func) (obj_section_addr (objsec), size, - 1, /* All sections will be readable. */ - (flags & SEC_READONLY) == 0, /* Writable. */ - (flags & SEC_CODE) != 0, /* Executable. */ - 1, /* MODIFIED is unknown, pass it as true. */ - obfd); - if (ret != 0) - return ret; - } - } + for (objfile *objfile : all_objfiles (current_program_space)) + ALL_OBJFILE_OSECTIONS (objfile, objsec) + { + bfd *ibfd = objfile->obfd; + asection *isec = objsec->the_bfd_section; + flagword flags = bfd_get_section_flags (ibfd, isec); + + /* Separate debug info files are irrelevant for gcore. */ + if (objfile->separate_debug_objfile_backlink != NULL) + continue; + + if ((flags & SEC_ALLOC) || (flags & SEC_LOAD)) + { + int size = bfd_section_size (ibfd, isec); + int ret; + + ret = (*func) (obj_section_addr (objsec), size, + 1, /* All sections will be readable. */ + (flags & SEC_READONLY) == 0, /* Writable. */ + (flags & SEC_CODE) != 0, /* Executable. */ + 1, /* MODIFIED is unknown, pass it as true. */ + obfd); + if (ret != 0) + return ret; + } + } /* Make a stack segment. */ if (derive_stack_segment (&temp_bottom, &temp_top)) |